diff --git a/include/functypes/funcptr_020EC57C.h b/include/functypes/funcptr_020EC57C.h
index d4e90030f7..7962888a14 100644
--- 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
diff --git a/include/functypes/funcptr_020EF718.h b/include/functypes/funcptr_020EF718.h
index b509dfa7b2..f72b02c948 100644
--- 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
diff --git a/include/functypes/funcptr_020EF744.h b/include/functypes/funcptr_020EF744.h
index 3175a139f0..bc4492b8c3 100644
--- 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
diff --git a/include/functypes/funcptr_020EF770.h b/include/functypes/funcptr_020EF770.h
index 5d147aed6a..eebefd0b75 100644
--- 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
diff --git a/include/inlines.h b/include/inlines.h
index 4fde0f5617..16802aceeb 100644
--- 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;
diff --git a/include/overlay005/ov5_021D0D80.h b/include/overlay005/ov5_021D0D80.h
index 0eec716971..b2bf4249cd 100644
--- 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
diff --git a/include/overlay005/ov5_021D1A94.h b/include/overlay005/ov5_021D1A94.h
index 1f0615164c..56d4be050f 100644
--- 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);
diff --git a/include/overlay005/ov5_021D1C30.h b/include/overlay005/ov5_021D1C30.h
index 013f3a9963..08add3aed2 100644
--- 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
diff --git a/include/overlay005/ov5_021D431C.h b/include/overlay005/ov5_021D431C.h
index 23db72304b..36aa8381ae 100644
--- 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);
diff --git a/include/overlay005/ov5_021D5B40.h b/include/overlay005/ov5_021D5B40.h
index a4e843244a..237d1a6be9 100644
--- 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
diff --git a/include/overlay005/ov5_021D5BC0.h b/include/overlay005/ov5_021D5BC0.h
index c59a7a69bd..87db2cf2f4 100644
--- 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
diff --git a/include/overlay005/ov5_021D5EB8.h b/include/overlay005/ov5_021D5EB8.h
index 0f8a08e62c..c8ac7421a3 100644
--- 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);
diff --git a/include/overlay005/ov5_021DB888.h b/include/overlay005/ov5_021DB888.h
index 107bfe36de..3c22a34652 100644
--- 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
diff --git a/include/overlay005/ov5_021DC018.h b/include/overlay005/ov5_021DC018.h
index 003ea7d342..3ab643037a 100644
--- 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);
diff --git a/include/overlay005/ov5_021DD6FC.h b/include/overlay005/ov5_021DD6FC.h
index 30270793fa..1dce20ff78 100644
--- 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
diff --git a/include/overlay005/ov5_021DDBE8.h b/include/overlay005/ov5_021DDBE8.h
index 7f880769b0..02adb3c10a 100644
--- 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);
diff --git a/include/overlay005/ov5_021DF440.h b/include/overlay005/ov5_021DF440.h
index 70e7fe66e5..e294c92f0e 100644
--- 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);
diff --git a/include/overlay005/ov5_021DFB54.h b/include/overlay005/ov5_021DFB54.h
index 4301d89534..14cf77698f 100644
--- 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
diff --git a/include/overlay005/ov5_021E1154.h b/include/overlay005/ov5_021E1154.h
index d00bb8cf31..c969254208 100644
--- 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
diff --git a/include/overlay005/ov5_021E135C.h b/include/overlay005/ov5_021E135C.h
index 1e450a099e..268e66a88a 100644
--- 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
diff --git a/include/overlay005/ov5_021E1B08.h b/include/overlay005/ov5_021E1B08.h
index 11f9a3401b..1f67c77dc8 100644
--- 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
diff --git a/include/overlay005/ov5_021E1D20.h b/include/overlay005/ov5_021E1D20.h
index f992ab9df7..74b53f2d39 100644
--- 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
diff --git a/include/overlay005/ov5_021E622C.h b/include/overlay005/ov5_021E622C.h
index 2d783ee296..bfffb210af 100644
--- 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);
diff --git a/include/overlay005/ov5_021E779C.h b/include/overlay005/ov5_021E779C.h
index cb07cfdf29..43faccbb50 100644
--- 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);
diff --git a/include/overlay005/ov5_021EA714.h b/include/overlay005/ov5_021EA714.h
index 5b15d6deb9..6a49e25efd 100644
--- 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
diff --git a/include/overlay005/ov5_021EA874.h b/include/overlay005/ov5_021EA874.h
index bd0da78beb..0695f07aa1 100644
--- 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
diff --git a/include/overlay005/ov5_021EE75C.h b/include/overlay005/ov5_021EE75C.h
index 7c3c7806f5..4f8f756d22 100644
--- 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
diff --git a/include/overlay005/ov5_021EE7D4.h b/include/overlay005/ov5_021EE7D4.h
index 13eea1db1f..a6cbf75788 100644
--- 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
diff --git a/include/overlay005/ov5_021EFB0C.h b/include/overlay005/ov5_021EFB0C.h
index c402a4f2ad..fa7ad07aff 100644
--- 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
diff --git a/include/overlay005/ov5_021F007C.h b/include/overlay005/ov5_021F007C.h
index f350c9cb2a..3b15f29e56 100644
--- 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);
diff --git a/include/overlay005/ov5_021F0824.h b/include/overlay005/ov5_021F0824.h
index e8d22837a3..83daf430c7 100644
--- 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
diff --git a/include/overlay005/ov5_021F08CC.h b/include/overlay005/ov5_021F08CC.h
index 848599f62b..8982d16bef 100644
--- 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);
diff --git a/include/overlay005/ov5_021F0EB0.h b/include/overlay005/ov5_021F0EB0.h
index 77b6857114..dc2f7aff84 100644
--- 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);
diff --git a/include/overlay005/ov5_021F2D20.h b/include/overlay005/ov5_021F2D20.h
index d2ab8fa8be..1f655bf863 100644
--- 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
diff --git a/include/overlay005/ov5_021F4018.h b/include/overlay005/ov5_021F4018.h
index 2f91b2b75e..0fbc18c3f7 100644
--- 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
diff --git a/include/overlay005/ov5_021F428C.h b/include/overlay005/ov5_021F428C.h
index 5c685c3cea..6370a87548 100644
--- 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);
diff --git a/include/overlay005/ov5_021F4E08.h b/include/overlay005/ov5_021F4E08.h
index 8ebd7129c5..786c6ba86b 100644
--- 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
diff --git a/include/overlay005/ov5_021F55CC.h b/include/overlay005/ov5_021F55CC.h
index b63bca9243..566f6eabd6 100644
--- 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
diff --git a/include/overlay005/ov5_021F575C.h b/include/overlay005/ov5_021F575C.h
index 9e62f91699..16c6c379ce 100644
--- 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
diff --git a/include/overlay005/ov5_021F5A10.h b/include/overlay005/ov5_021F5A10.h
index c5b57206ba..87f0bdeedd 100644
--- 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);
diff --git a/include/overlay005/ov5_021F8370.h b/include/overlay005/ov5_021F8370.h
index a6a2e2c228..f53c3cff86 100644
--- 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
diff --git a/include/overlay005/struct_ov5_021DDC28.h b/include/overlay005/struct_ov5_021DDC28.h
index 1f9dbb278c..12fd3f8879 100644
--- 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;
diff --git a/include/overlay006/funcptr_ov6_0223E6EC.h b/include/overlay006/funcptr_ov6_0223E6EC.h
index 5d4aad65af..54b5ee88ea 100644
--- 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
diff --git a/include/overlay006/ov6_0223E140.h b/include/overlay006/ov6_0223E140.h
index 6ccdc3ca67..8ebf6748a2 100644
--- 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);
diff --git a/include/overlay006/ov6_02240C9C.h b/include/overlay006/ov6_02240C9C.h
index 0dd3c00d70..64aa1a91ea 100644
--- 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
diff --git a/include/overlay006/ov6_02242984.h b/include/overlay006/ov6_02242984.h
index 31ef94019d..1ac6b7793a 100644
--- 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);
diff --git a/include/overlay006/ov6_02242AF0.h b/include/overlay006/ov6_02242AF0.h
index 574d05da53..192aea71a9 100644
--- 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
diff --git a/include/overlay006/ov6_02243004.h b/include/overlay006/ov6_02243004.h
index a40ee3e302..13d1a380f7 100644
--- 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
diff --git a/include/overlay006/ov6_022430C4.h b/include/overlay006/ov6_022430C4.h
index 4518b01b0e..e84791368b 100644
--- 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
diff --git a/include/overlay006/ov6_02243258.h b/include/overlay006/ov6_02243258.h
index 1a78de4b8c..747b282f22 100644
--- 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);
 
diff --git a/include/overlay006/ov6_02246034.h b/include/overlay006/ov6_02246034.h
index a13e0020ff..c9445f0cb8 100644
--- 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
diff --git a/include/overlay006/ov6_02246184.h b/include/overlay006/ov6_02246184.h
index 6892e250ef..424aee0e61 100644
--- 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
diff --git a/include/overlay006/ov6_02246444.h b/include/overlay006/ov6_02246444.h
index 24e5863e27..4c70afa8ad 100644
--- 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
diff --git a/include/overlay006/ov6_022465FC.h b/include/overlay006/ov6_022465FC.h
index 0c0b5056cf..15aba1379e 100644
--- 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
diff --git a/include/overlay006/ov6_02246A30.h b/include/overlay006/ov6_02246A30.h
index 4345c9d9aa..80811f0a3f 100644
--- 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
diff --git a/include/overlay006/ov6_02246BF4.h b/include/overlay006/ov6_02246BF4.h
index 007d1679dd..a35b706ac6 100644
--- 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
diff --git a/include/overlay006/ov6_02246C24.h b/include/overlay006/ov6_02246C24.h
index d99c10344b..f72be426af 100644
--- 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
diff --git a/include/overlay006/ov6_02246F00.h b/include/overlay006/ov6_02246F00.h
index c653d77212..4dd080bb3f 100644
--- 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
diff --git a/include/overlay006/ov6_02247078.h b/include/overlay006/ov6_02247078.h
index 930bfd5a79..8bf916dac3 100644
--- 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
diff --git a/include/overlay006/ov6_02247100.h b/include/overlay006/ov6_02247100.h
index bb98b8cb07..bb0e9d0082 100644
--- 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
diff --git a/include/overlay006/ov6_02247660.h b/include/overlay006/ov6_02247660.h
index 2ea66ad42d..c9419759a5 100644
--- 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);
 
diff --git a/include/overlay006/ov6_02247D30.h b/include/overlay006/ov6_02247D30.h
index 37db709935..c78544251b 100644
--- 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
diff --git a/include/overlay006/ov6_02247F5C.h b/include/overlay006/ov6_02247F5C.h
index 5d6b1a3272..8e49ef904a 100644
--- 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
diff --git a/include/overlay006/ov6_02248050.h b/include/overlay006/ov6_02248050.h
index f21570b4e0..8fe0fe8a98 100644
--- 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
diff --git a/include/overlay006/ov6_02248948.h b/include/overlay006/ov6_02248948.h
index 412e750cde..c982f76176 100644
--- 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
diff --git a/include/overlay007/ov7_02249960.h b/include/overlay007/ov7_02249960.h
index 6c64cf6cab..c56a3baa7b 100644
--- 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);
diff --git a/include/overlay007/ov7_0224CD28.h b/include/overlay007/ov7_0224CD28.h
index b65090493d..8c77dd0ee9 100644
--- 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
diff --git a/include/overlay008/ov8_02249960.h b/include/overlay008/ov8_02249960.h
index 6f1f56307e..17007280e0 100644
--- 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
diff --git a/include/overlay009/ov9_02249960.h b/include/overlay009/ov9_02249960.h
index cce6ee265d..deee0899ac 100644
--- 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
diff --git a/include/overlay023/ov23_0223E140.h b/include/overlay023/ov23_0223E140.h
index 47492968ec..739dfc0a9f 100644
--- 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);
diff --git a/include/overlay023/ov23_022416A8.h b/include/overlay023/ov23_022416A8.h
index 6d94914a5a..9ee242b5db 100644
--- 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);
diff --git a/include/overlay023/ov23_02241F74.h b/include/overlay023/ov23_02241F74.h
index 205d63439f..5763dd147c 100644
--- 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);
diff --git a/include/overlay023/ov23_0224340C.h b/include/overlay023/ov23_0224340C.h
index 47bd43ace6..94445c562d 100644
--- 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
diff --git a/include/overlay023/ov23_02248F1C.h b/include/overlay023/ov23_02248F1C.h
index 8a2fb0469d..3ac89bc4df 100644
--- 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
diff --git a/include/overlay023/ov23_022499E4.h b/include/overlay023/ov23_022499E4.h
index b561b44f17..638605ff6d 100644
--- 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);
diff --git a/include/overlay023/ov23_0224B05C.h b/include/overlay023/ov23_0224B05C.h
index dd49118050..75dde696dc 100644
--- 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);
diff --git a/include/overlay023/ov23_0224DC40.h b/include/overlay023/ov23_0224DC40.h
index 025487b2f2..053c34ab5e 100644
--- 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);
diff --git a/include/overlay023/ov23_0224F294.h b/include/overlay023/ov23_0224F294.h
index 6eee5d9192..6c8e1293b6 100644
--- 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);
 
diff --git a/include/overlay023/ov23_022521F0.h b/include/overlay023/ov23_022521F0.h
index ce7f04b3b4..f0a03a43fe 100644
--- 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
diff --git a/include/overlay023/ov23_022542CC.h b/include/overlay023/ov23_022542CC.h
index e5aa7b6ac7..eb4cdf7cc0 100644
--- 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);
diff --git a/include/overlay023/ov23_02254A14.h b/include/overlay023/ov23_02254A14.h
index 73abee50fb..95124fb5eb 100644
--- 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
diff --git a/include/overlay023/struct_ov23_0224A294.h b/include/overlay023/struct_ov23_0224A294.h
index 4df7253f69..a03735b6a5 100644
--- 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];
diff --git a/include/overlay023/struct_ov23_02250CD4.h b/include/overlay023/struct_ov23_02250CD4.h
index 58aef81163..9cb4bee3da 100644
--- 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;
diff --git a/include/overlay025/ov25_02253CE0.h b/include/overlay025/ov25_02253CE0.h
index 891e256672..06985cb828 100644
--- 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);
diff --git a/include/overlay056/ov56_022561C0.h b/include/overlay056/ov56_022561C0.h
index 0dadb4a12e..97cb69d3d8 100644
--- 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
diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h
index a957df7868..eb1f90614f 100644
--- 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;
diff --git a/include/overlay104/struct_ov104_02230BE4.h b/include/overlay104/struct_ov104_02230BE4.h
index 85ce3889a3..b2a7a28a89 100644
--- 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
diff --git a/include/pokeradar.h b/include/pokeradar.h
index 64f7a1030b..22126b9190 100644
--- 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
diff --git a/include/struct_decls/struct_0203CDB0_decl.h b/include/struct_decls/struct_0203CDB0_decl.h
index 62b4939b01..1c9486a67e 100644
--- 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
diff --git a/include/struct_defs/struct_0203CDB0.h b/include/struct_defs/struct_0203CDB0.h
index 67b32dd0e1..a397acff18 100644
--- 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
diff --git a/include/struct_defs/struct_0203E6C0.h b/include/struct_defs/struct_0203E6C0.h
index 4311579750..ab58ff5ec5 100644
--- 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;
diff --git a/include/struct_defs/struct_0203E724_t.h b/include/struct_defs/struct_0203E724_t.h
index 74e34df47a..e38f68a795 100644
--- 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
diff --git a/include/struct_defs/struct_0205964C.h b/include/struct_defs/struct_0205964C.h
index 34c907f9e9..9e54cee6c8 100644
--- 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;
diff --git a/include/struct_defs/struct_0205C22C.h b/include/struct_defs/struct_0205C22C.h
index e1d6f57508..1d416db3a4 100644
--- 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;
diff --git a/include/struct_defs/struct_020684D0.h b/include/struct_defs/struct_020684D0.h
index b7b31bf0e4..f616a6a8a4 100644
--- 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
diff --git a/include/struct_defs/struct_02070950.h b/include/struct_defs/struct_02070950.h
index fb073e0a45..c6c32f13a7 100644
--- 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;
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index bc9a9d702f..698a38d0b9 100644
--- 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;
diff --git a/include/struct_defs/struct_0209BBA4.h b/include/struct_defs/struct_0209BBA4.h
index 217b4c1f6b..f1bb2c869f 100644
--- 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;
diff --git a/include/struct_defs/struct_0209C194_1.h b/include/struct_defs/struct_0209C194_1.h
index c502c3464a..83e63979e2 100644
--- 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
diff --git a/include/unk_0203A378.h b/include/unk_0203A378.h
index 8652ee8fe0..6a70d5284c 100644
--- 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
diff --git a/include/unk_0203A6DC.h b/include/unk_0203A6DC.h
index 6f482def75..b5fc373d39 100644
--- a/include/unk_0203A6DC.h
+++ b/include/unk_0203A6DC.h
@@ -33,7 +33,7 @@ u16 * sub_0203A788(UnkStruct_0203A790 * param0);
 u16 * sub_0203A78C(UnkStruct_0203A790 * param0);
 UnkStruct_0203A790 * sub_0203A790(SaveData * param0);
 UnkStruct_0203A79C * sub_0203A79C(SaveData * param0);
-void sub_0203A7A8(UnkStruct_0203CDB0 * param0);
-void sub_0203A7C0(UnkStruct_0203CDB0 * param0);
+void sub_0203A7A8(FieldSystem * param0);
+void sub_0203A7C0(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_0203A6DC_H
diff --git a/include/unk_0203A7D8.h b/include/unk_0203A7D8.h
index 58bdb79b21..b0e3d701fb 100644
--- a/include/unk_0203A7D8.h
+++ b/include/unk_0203A7D8.h
@@ -10,7 +10,7 @@ void sub_0203A824(int param0, UnkStruct_02049FA8 * param1);
 int sub_0203A858(int param0);
 int sub_0203A87C(int param0);
 int sub_0203A8A0(int param0, int param1, int param2);
-void sub_0203A8E8(UnkStruct_0203CDB0 * param0, int param1);
-BOOL sub_0203A920(UnkStruct_0203CDB0 * param0, int param1);
+void sub_0203A8E8(FieldSystem * param0, int param1);
+BOOL sub_0203A920(FieldSystem * param0, int param1);
 
 #endif // POKEPLATINUM_UNK_0203A7D8_H
diff --git a/include/unk_0203A944.h b/include/unk_0203A944.h
index 6d90e2f3ab..eb44a38105 100644
--- a/include/unk_0203A944.h
+++ b/include/unk_0203A944.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-int sub_0203A944(UnkStruct_0203CDB0 * param0, int param1);
+int sub_0203A944(FieldSystem * param0, int param1);
 
 #endif // POKEPLATINUM_UNK_0203A944_H
diff --git a/include/unk_0203A9C8.h b/include/unk_0203A9C8.h
index bc478fee37..a5ff588912 100644
--- a/include/unk_0203A9C8.h
+++ b/include/unk_0203A9C8.h
@@ -5,11 +5,11 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_defs/struct_020708E0.h"
 
-BOOL sub_0203A9C8(UnkStruct_0203CDB0 * param0);
+BOOL sub_0203A9C8(FieldSystem * param0);
 void sub_0203A9E0(struct UnkStruct_0203CDB0_t * param0);
 void sub_0203AA78(struct UnkStruct_0203CDB0_t * param0);
-void sub_0203AABC(UnkStruct_0203CDB0 * param0);
-void sub_0203AB00(UnkStruct_0203CDB0 * param0);
+void sub_0203AABC(FieldSystem * param0);
+void sub_0203AB00(FieldSystem * param0);
 void sub_0203B674(UnkStruct_020708E0 * param0, void * param1);
 BOOL sub_0203B7C0(UnkStruct_020508D4 * param0);
 BOOL sub_0203C3F4(UnkStruct_020508D4 * param0);
diff --git a/include/unk_0203C954.h b/include/unk_0203C954.h
index d4d6bf3ab3..44651f6223 100644
--- a/include/unk_0203C954.h
+++ b/include/unk_0203C954.h
@@ -4,11 +4,11 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 
-void sub_0203C9D4(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1);
-u8 sub_0203CA40(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1);
-u16 sub_0203CA6C(UnkStruct_0203CDB0 * param0, void * param1, int param2);
-u16 sub_0203CB80(UnkStruct_0203CDB0 * param0, void * param1, int param2);
-u8 sub_0203CBE0(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1);
-u16 sub_0203CC14(UnkStruct_0203CDB0 * param0, void * param1, int param2);
+void sub_0203C9D4(FieldSystem * param0, UnkStruct_02061AB4 ** param1);
+u8 sub_0203CA40(FieldSystem * param0, UnkStruct_02061AB4 ** param1);
+u16 sub_0203CA6C(FieldSystem * param0, void * param1, int param2);
+u16 sub_0203CB80(FieldSystem * param0, void * param1, int param2);
+u8 sub_0203CBE0(FieldSystem * param0, UnkStruct_02061AB4 ** param1);
+u16 sub_0203CC14(FieldSystem * param0, void * param1, int param2);
 
 #endif // POKEPLATINUM_UNK_0203C954_H
diff --git a/include/unk_0203CC84.h b/include/unk_0203CC84.h
index 20fe1cbfa3..e7855db588 100644
--- a/include/unk_0203CC84.h
+++ b/include/unk_0203CC84.h
@@ -7,12 +7,12 @@
 #include "savedata.h"
 #include "overlay025/struct_ov25_02253CE0_decl.h"
 
-void sub_0203CD00(UnkStruct_0203CDB0 * param0);
-void sub_0203CD44(UnkStruct_0203CDB0 * param0);
-BOOL sub_0203CD4C(UnkStruct_0203CDB0 * param0);
-BOOL sub_0203CD5C(UnkStruct_0203CDB0 * param0);
-BOOL sub_0203CD74(UnkStruct_0203CDB0 * param0);
-void sub_0203CD84(UnkStruct_0203CDB0 * param0, const UnkStruct_0208BE5C * param1, void * param2);
+void sub_0203CD00(FieldSystem * param0);
+void sub_0203CD44(FieldSystem * param0);
+BOOL sub_0203CD4C(FieldSystem * param0);
+BOOL sub_0203CD5C(FieldSystem * param0);
+BOOL sub_0203CD74(FieldSystem * param0);
+void sub_0203CD84(FieldSystem * param0, const UnkStruct_0208BE5C * param1, void * param2);
 void sub_0203D128(void);
 void sub_0203D140(void);
 UnkStruct_ov25_02253CE0 * sub_0203D158(void);
diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h
index 64a048e23b..7c17698f71 100644
--- a/include/unk_0203D1B8.h
+++ b/include/unk_0203D1B8.h
@@ -23,73 +23,73 @@
 #include "overlay006/battle_params.h"
 #include "overlay090/struct_ov90_021D0D80.h"
 
-void sub_0203D1D4(UnkStruct_0203CDB0 * param0, BattleParams * param1);
-void sub_0203D1E4(UnkStruct_0203CDB0 * param0, void * param1);
-void * sub_0203D20C(UnkStruct_0203CDB0 * param0, UnkStruct_020684D0 * param1);
-void * sub_0203D264(UnkStruct_0203CDB0 * param0, int param1);
+void sub_0203D1D4(FieldSystem * param0, BattleParams * param1);
+void sub_0203D1E4(FieldSystem * param0, void * param1);
+void * sub_0203D20C(FieldSystem * param0, UnkStruct_020684D0 * param1);
+void * sub_0203D264(FieldSystem * param0, int param1);
 u16 sub_0203D2C4(void * param0);
-void sub_0203D2E4(UnkStruct_0203CDB0 * param0, void * param1);
-void sub_0203D30C(UnkStruct_0203CDB0 * param0, void * param1);
-void sub_0203D334(UnkStruct_0203CDB0 * param0, void * param1);
-void * sub_0203D390(UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1, u8 param2);
-void * sub_0203D3C0(int param0, UnkStruct_0203CDB0 * param1);
-void * sub_0203D3E4(int param0, UnkStruct_0203CDB0 * param1);
+void sub_0203D2E4(FieldSystem * param0, void * param1);
+void sub_0203D30C(FieldSystem * param0, void * param1);
+void sub_0203D334(FieldSystem * param0, void * param1);
+void * sub_0203D390(FieldSystem * param0, UnkStruct_02070950 * param1, u8 param2);
+void * sub_0203D3C0(int param0, FieldSystem * param1);
+void * sub_0203D3E4(int param0, FieldSystem * param1);
 int sub_0203D408(void * param0);
-void * sub_0203D410(int param0, UnkStruct_0203CDB0 * param1, int param2);
+void * sub_0203D410(int param0, FieldSystem * param1, int param2);
 int sub_0203D438(void * param0);
 int sub_0203D440(void * param0);
 void * sub_0203D50C(UnkStruct_020508D4 * param0, int param1);
-void * sub_0203D578(int param0, UnkStruct_0203CDB0 * param1, int param2, int param3, int param4, int param5);
-void * sub_0203D5C8(int param0, UnkStruct_0203CDB0 * param1, int param2);
-void * sub_0203D644(UnkStruct_0203CDB0 * param0, int param1);
-PokemonSummary * sub_0203D670(UnkStruct_0203CDB0 * param0, int param1, int param2);
-void * sub_0203D6E4(int param0, UnkStruct_0203CDB0 * param1, u8 param2);
+void * sub_0203D578(int param0, FieldSystem * param1, int param2, int param3, int param4, int param5);
+void * sub_0203D5C8(int param0, FieldSystem * param1, int param2);
+void * sub_0203D644(FieldSystem * param0, int param1);
+PokemonSummary * sub_0203D670(FieldSystem * param0, int param1, int param2);
+void * sub_0203D6E4(int param0, FieldSystem * param1, u8 param2);
 int sub_0203D750(void * param0);
-void sub_0203D754(UnkStruct_0203CDB0 * param0, UnkStruct_02042434 * param1);
+void sub_0203D754(FieldSystem * param0, UnkStruct_02042434 * param1);
 void sub_0203D80C(UnkStruct_020508D4 * param0, u16 * param1, u16 * param2, u16 * param3);
-void sub_0203D874(UnkStruct_0203CDB0 * param0, UnkStruct_0209747C * param1);
-void sub_0203D884(UnkStruct_0203CDB0 * param0, UnkStruct_0203D8AC * param1);
-void * sub_0203D8AC(UnkStruct_0203CDB0 * param0);
-void * sub_0203D8EC(UnkStruct_0203CDB0 * param0);
-UnkStruct_02097728 * sub_0203D920(UnkStruct_0203CDB0 * param0, int param1, u8 param2, u8 param3, int param4);
-UnkStruct_02097728 * sub_0203D94C(UnkStruct_0203CDB0 * param0, int param1, u8 param2, int param3);
-UnkStruct_02097728 * sub_0203D984(UnkStruct_0203CDB0 * param0, Pokemon * param1, int param2);
-UnkStruct_0203D9B8 * sub_0203D9B8(UnkStruct_0203CDB0 * param0, int param1);
-void sub_0203D9D8(UnkStruct_0203CDB0 * param0, UnkStruct_ov90_021D0D80 * param1);
+void sub_0203D874(FieldSystem * param0, UnkStruct_0209747C * param1);
+void sub_0203D884(FieldSystem * param0, UnkStruct_0203D8AC * param1);
+void * sub_0203D8AC(FieldSystem * param0);
+void * sub_0203D8EC(FieldSystem * param0);
+UnkStruct_02097728 * sub_0203D920(FieldSystem * param0, int param1, u8 param2, u8 param3, int param4);
+UnkStruct_02097728 * sub_0203D94C(FieldSystem * param0, int param1, u8 param2, int param3);
+UnkStruct_02097728 * sub_0203D984(FieldSystem * param0, Pokemon * param1, int param2);
+UnkStruct_0203D9B8 * sub_0203D9B8(FieldSystem * param0, int param1);
+void sub_0203D9D8(FieldSystem * param0, UnkStruct_ov90_021D0D80 * param1);
 void sub_0203DAC0(UnkStruct_020508D4 * param0, u16 * param1, SaveData * param2, u16 param3, u16 param4);
-BOOL sub_0203DB10(UnkStruct_0203CDB0 * param0, void * param1);
-BOOL sub_0203DB24(UnkStruct_0203CDB0 * param0, void * param1);
+BOOL sub_0203DB10(FieldSystem * param0, void * param1);
+BOOL sub_0203DB24(FieldSystem * param0, void * param1);
 BOOL sub_0203DBF0(UnkStruct_020508D4 * param0);
 void sub_0203DDDC(UnkStruct_020508D4 * param0);
-void sub_0203DDFC(UnkStruct_0203CDB0 * param0);
-void * sub_0203DE34(UnkStruct_0203CDB0 * param0);
-void sub_0203DE78(UnkStruct_0203CDB0 * param0, SaveData * param1);
-void sub_0203DE88(UnkStruct_0203CDB0 * param0, SaveData * param1);
+void sub_0203DDFC(FieldSystem * param0);
+void * sub_0203DE34(FieldSystem * param0);
+void sub_0203DE78(FieldSystem * param0, SaveData * param1);
+void sub_0203DE88(FieldSystem * param0, SaveData * param1);
 void sub_0203DFE8(UnkStruct_020508D4 * param0, int param1, int param2, int param3, int param4, const u16 * param5, u16 * param6);
-void sub_0203E09C(UnkStruct_0203CDB0 * param0, UnkStruct_02072014 * param1);
-BOOL sub_0203E0AC(UnkStruct_0203CDB0 * param0, void * param1);
-void sub_0203E0C0(UnkStruct_0203CDB0 * param0, UnkStruct_020425E0 * param1);
-void sub_0203E0D0(UnkStruct_0203CDB0 * param0);
-void sub_0203E0FC(UnkStruct_0203CDB0 * param0, int param1);
-void * sub_0203E1AC(UnkStruct_0203CDB0 * param0, int param1, int param2);
-void sub_0203E224(UnkStruct_0203CDB0 * param0);
-void sub_0203E234(UnkStruct_0203CDB0 * param0, UnkStruct_0203E234 * param1);
-void * sub_0203E244(UnkStruct_0203CDB0 * param0);
-void sub_0203E274(UnkStruct_0203CDB0 * param0, UnkStruct_0203E274 * param1);
-void sub_0203E284(UnkStruct_0203CDB0 * param0, UnkStruct_020997B8 * param1);
-void sub_0203E2AC(UnkStruct_0203CDB0 * param0, void * param1);
-void sub_0203E2D4(UnkStruct_0203CDB0 * param0, void * param1);
-void sub_0203E2FC(UnkStruct_0203CDB0 * param0);
-BOOL sub_0203E348(UnkStruct_0203CDB0 * param0, UnkStruct_0203E348 * param1);
+void sub_0203E09C(FieldSystem * param0, UnkStruct_02072014 * param1);
+BOOL sub_0203E0AC(FieldSystem * param0, void * param1);
+void sub_0203E0C0(FieldSystem * param0, UnkStruct_020425E0 * param1);
+void sub_0203E0D0(FieldSystem * param0);
+void sub_0203E0FC(FieldSystem * param0, int param1);
+void * sub_0203E1AC(FieldSystem * param0, int param1, int param2);
+void sub_0203E224(FieldSystem * param0);
+void sub_0203E234(FieldSystem * param0, UnkStruct_0203E234 * param1);
+void * sub_0203E244(FieldSystem * param0);
+void sub_0203E274(FieldSystem * param0, UnkStruct_0203E274 * param1);
+void sub_0203E284(FieldSystem * param0, UnkStruct_020997B8 * param1);
+void sub_0203E2AC(FieldSystem * param0, void * param1);
+void sub_0203E2D4(FieldSystem * param0, void * param1);
+void sub_0203E2FC(FieldSystem * param0);
+BOOL sub_0203E348(FieldSystem * param0, UnkStruct_0203E348 * param1);
 void sub_0203E414(UnkStruct_020508D4 * param0, int param1);
 void sub_0203E518(UnkStruct_020508D4 * param0);
-void * sub_0203E53C(UnkStruct_0203CDB0 * param0, int param1, int param2);
-void * sub_0203E564(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3, int param4);
-PartyManagementData * sub_0203E598(UnkStruct_0203CDB0 * param0, int param1, int param2);
-void * sub_0203E608(UnkStruct_0203CDB0 * param0, int param1);
-void * sub_0203E63C(int param0, UnkStruct_0203CDB0 * param1, u16 param2, u16 param3);
-void sub_0203E6C0(UnkStruct_0203CDB0 * param0, int param1, int param2);
-void sub_0203E704(UnkStruct_0203CDB0 * param0);
-void sub_0203E714(UnkStruct_0203CDB0 * param0);
+void * sub_0203E53C(FieldSystem * param0, int param1, int param2);
+void * sub_0203E564(FieldSystem * param0, u8 param1, u8 param2, u16 param3, int param4);
+PartyManagementData * sub_0203E598(FieldSystem * param0, int param1, int param2);
+void * sub_0203E608(FieldSystem * param0, int param1);
+void * sub_0203E63C(int param0, FieldSystem * param1, u16 param2, u16 param3);
+void sub_0203E6C0(FieldSystem * param0, int param1, int param2);
+void sub_0203E704(FieldSystem * param0);
+void sub_0203E714(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_0203D1B8_H
diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h
index b0dd1d81c1..4a755cf4df 100644
--- a/include/unk_0203E880.h
+++ b/include/unk_0203E880.h
@@ -8,36 +8,36 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 
-void sub_0203E880(UnkStruct_0203CDB0 * param0, u16 param1, UnkStruct_02061AB4 * param2);
-void sub_0203E8B0(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, int param2, int param3, int param4, int param5, int param6, int param7);
+void sub_0203E880(FieldSystem * param0, u16 param1, UnkStruct_02061AB4 * param2);
+void sub_0203E8B0(FieldSystem * param0, UnkStruct_02061AB4 * param1, int param2, int param3, int param4, int param5, int param6, int param7);
 void sub_0203E8E0(UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2, void * param3);
 void sub_0203E918(UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2);
-UnkStruct_0203E724 * sub_0203EAB8(UnkStruct_0203CDB0 * param0, u16 param1);
+UnkStruct_0203E724 * sub_0203EAB8(FieldSystem * param0, u16 param1);
 void * sub_0203EF60(UnkStruct_0203EF60 * param0, u32 param1);
-void * sub_0203F098(UnkStruct_0203CDB0 * param0, u32 param1);
-void sub_0203F0C0(UnkStruct_0203CDB0 * param0);
-u16 * sub_0203F118(UnkStruct_0203CDB0 * param0, u16 param1);
-u16 sub_0203F150(UnkStruct_0203CDB0 * param0, u16 param1);
-u16 sub_0203F164(UnkStruct_0203CDB0 * param0, u16 param1);
-BOOL sub_0203F188(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F19C(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F1B0(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F1C4(UnkStruct_0203CDB0 * param0);
-void sub_0203F1FC(UnkStruct_0203CDB0 * param0);
-void sub_0203F21C(UnkStruct_0203CDB0 * param0, u16 param1, u16 param2, u16 param3, u16 param4);
+void * sub_0203F098(FieldSystem * param0, u32 param1);
+void sub_0203F0C0(FieldSystem * param0);
+u16 * sub_0203F118(FieldSystem * param0, u16 param1);
+u16 sub_0203F150(FieldSystem * param0, u16 param1);
+u16 sub_0203F164(FieldSystem * param0, u16 param1);
+BOOL sub_0203F188(FieldSystem * param0, u16 param1);
+void sub_0203F19C(FieldSystem * param0, u16 param1);
+void sub_0203F1B0(FieldSystem * param0, u16 param1);
+void sub_0203F1C4(FieldSystem * param0);
+void sub_0203F1FC(FieldSystem * param0);
+void sub_0203F21C(FieldSystem * param0, u16 param1, u16 param2, u16 param3, u16 param4);
 u16 sub_0203F254(u16 param0);
 BOOL sub_0203F278(u16 param0);
 BOOL sub_0203F28C(u16 param0);
-BOOL sub_0203F2A0(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F2BC(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F2D8(UnkStruct_0203CDB0 * param0, u16 param1);
+BOOL sub_0203F2A0(FieldSystem * param0, u16 param1);
+void sub_0203F2BC(FieldSystem * param0, u16 param1);
+void sub_0203F2D8(FieldSystem * param0, u16 param1);
 u16 sub_0203F2F4(u16 param0);
 u16 sub_0203F304(u16 param0);
-void sub_0203F310(UnkStruct_0203CDB0 * param0);
+void sub_0203F310(FieldSystem * param0);
 u8 sub_0203F3C8(u16 param0);
-UnkStruct_0203F478 * sub_0203F478(UnkStruct_0203CDB0 * param0, int param1);
-void sub_0203F598(UnkStruct_0203CDB0 * param0);
-void sub_0203F5A4(UnkStruct_0203CDB0 * param0, u16 param1);
-BOOL sub_0203F5C0(UnkStruct_0203CDB0 * param0, u8 param1);
+UnkStruct_0203F478 * sub_0203F478(FieldSystem * param0, int param1);
+void sub_0203F598(FieldSystem * param0);
+void sub_0203F5A4(FieldSystem * param0, u16 param1);
+BOOL sub_0203F5C0(FieldSystem * param0, u8 param1);
 
 #endif // POKEPLATINUM_UNK_0203E880_H
diff --git a/include/unk_02049D08.h b/include/unk_02049D08.h
index 2178cd84e1..c1db1965dc 100644
--- a/include/unk_02049D08.h
+++ b/include/unk_02049D08.h
@@ -13,8 +13,8 @@ BOOL sub_02049EC4(u16 param0, SaveData * param1, u8 param2);
 void sub_02049F8C(void);
 void sub_02049F98(UnkStruct_0202D060 * param0);
 BOOL sub_02049FA0(UnkStruct_0202D060 * param0);
-void sub_02049FA8(UnkStruct_0203CDB0 * param0);
-void sub_02049FE8(UnkStruct_0203CDB0 * param0);
+void sub_02049FA8(FieldSystem * param0);
+void sub_02049FE8(FieldSystem * param0);
 u16 sub_02049FF8(SaveData * param0, u16 param1);
 void sub_0204A030(SaveData * param0, u8 param1);
 u16 sub_0204A050(SaveData * param0);
diff --git a/include/unk_0204AEE8.h b/include/unk_0204AEE8.h
index daec81da56..885ca44849 100644
--- a/include/unk_0204AEE8.h
+++ b/include/unk_0204AEE8.h
@@ -10,9 +10,9 @@
 
 StringFormatter * sub_0204AEE8(SaveData * param0, u16 param1, u16 param2, u8 param3, u8 * param4);
 u16 sub_0204AF9C(u8 param0);
-u16 sub_0204AFC4(UnkStruct_0203CDB0 * param0, const u16 * param1);
-u16 sub_0204B020(UnkStruct_0203CDB0 * param0, const u16 * param1);
-u16 sub_0204B044(UnkStruct_0203CDB0 * param0, const u16 * param1);
+u16 sub_0204AFC4(FieldSystem * param0, const u16 * param1);
+u16 sub_0204B020(FieldSystem * param0, const u16 * param1);
+u16 sub_0204B044(FieldSystem * param0, const u16 * param1);
 void sub_0204B060(UnkStruct_0204AFC4 * param0, SaveData * param1);
 void sub_0204B0BC(UnkStruct_0204AFC4 * param0);
 void sub_0204B0D4(UnkStruct_0204AFC4 * param0, u16 param1);
diff --git a/include/unk_02050568.h b/include/unk_02050568.h
index f3ac95f965..8b12b12031 100644
--- a/include/unk_02050568.h
+++ b/include/unk_02050568.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-void sub_02050568(UnkStruct_0203CDB0 * param0);
+void sub_02050568(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_02050568_H
diff --git a/include/unk_020508D4.h b/include/unk_020508D4.h
index ccae55b13d..66e881ea01 100644
--- a/include/unk_020508D4.h
+++ b/include/unk_020508D4.h
@@ -6,16 +6,16 @@
 #include "functypes/funcptr_02050904.h"
 #include "struct_defs/struct_0208BE5C.h"
 
-UnkStruct_020508D4 * sub_02050904(UnkStruct_0203CDB0 * param0, UnkFuncPtr_02050904 param1, void * param2);
+UnkStruct_020508D4 * sub_02050904(FieldSystem * param0, UnkFuncPtr_02050904 param1, void * param2);
 void sub_02050924(UnkStruct_020508D4 * param0, UnkFuncPtr_02050904 param1, void * param2);
 UnkStruct_020508D4 * sub_02050944(UnkStruct_020508D4 * param0, UnkFuncPtr_02050904 param1, void * param2);
-BOOL sub_02050958(UnkStruct_0203CDB0 * param0);
-BOOL sub_020509A4(UnkStruct_0203CDB0 * param0);
-BOOL sub_020509B4(UnkStruct_0203CDB0 * param0);
-void sub_020509D4(UnkStruct_0203CDB0 * param0);
-BOOL sub_020509DC(UnkStruct_0203CDB0 * param0);
+BOOL sub_02050958(FieldSystem * param0);
+BOOL sub_020509A4(FieldSystem * param0);
+BOOL sub_020509B4(FieldSystem * param0);
+void sub_020509D4(FieldSystem * param0);
+BOOL sub_020509DC(FieldSystem * param0);
 void sub_02050A38(UnkStruct_020508D4 * param0, const UnkStruct_0208BE5C * param1, void * param2);
-UnkStruct_0203CDB0 * sub_02050A60(UnkStruct_020508D4 * param0);
+FieldSystem * sub_02050A60(UnkStruct_020508D4 * param0);
 void * sub_02050A64(UnkStruct_020508D4 * param0);
 int * sub_02050A68(UnkStruct_020508D4 * param0);
 u32 sub_02050A6C(UnkStruct_020508D4 * param0);
diff --git a/include/unk_02050A74.h b/include/unk_02050A74.h
index 89960047f0..75899f0f21 100644
--- a/include/unk_02050A74.h
+++ b/include/unk_02050A74.h
@@ -7,19 +7,19 @@
 #include "overlay006/battle_params.h"
 
 void sub_02050ABC(UnkStruct_020508D4 * param0, BattleParams * param1);
-void sub_02050E10(UnkStruct_0203CDB0 * param0, BattleParams * param1);
-void sub_02050E78(UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1, BattleParams * param2);
+void sub_02050E10(FieldSystem * param0, BattleParams * param1);
+void sub_02050E78(FieldSystem * param0, UnkStruct_020508D4 * param1, BattleParams * param2);
 void sub_0205120C(UnkStruct_020508D4 * param0, int * param1);
 void sub_02051270(UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * param3, BOOL param4);
 void sub_020512E4(UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * param3, BOOL param4);
-void sub_02051450(UnkStruct_0203CDB0 * param0, BattleParams * param1);
+void sub_02051450(FieldSystem * param0, BattleParams * param1);
 void sub_02051480(UnkStruct_020508D4 * param0, int param1, int param2, int * param3);
 void sub_02051590(UnkStruct_020508D4 * param0);
 void sub_020515CC(UnkStruct_020508D4 * param0, int param1, int param2, int param3, int param4, int * param5);
 void sub_0205167C(UnkStruct_020508D4 * param0, const u8 * param1, int param2);
 void sub_020516F4(UnkStruct_020508D4 * param0, int param1, int param2, int param3);
-void sub_020517E8(UnkStruct_0203CDB0 * param0, const u8 * param1, int param2);
-void sub_0205184C(UnkStruct_0203CDB0 * param0, const Party * param1, int param2);
+void sub_020517E8(FieldSystem * param0, const u8 * param1, int param2);
+void sub_0205184C(FieldSystem * param0, const Party * param1, int param2);
 void sub_02051ABC(UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * param3, BOOL param4);
 
 #endif // POKEPLATINUM_UNK_02050A74_H
diff --git a/include/unk_02051D8C.h b/include/unk_02051D8C.h
index cf96c82dd8..6727fef06b 100644
--- a/include/unk_02051D8C.h
+++ b/include/unk_02051D8C.h
@@ -15,19 +15,19 @@
 BattleParams * sub_02051D8C(int param0, u32 param1);
 BattleParams * sub_02051F24(int param0, int param1);
 BattleParams * sub_02051F38(int param0, int param1);
-BattleParams * sub_02051F4C(int param0, const UnkStruct_0203CDB0 * param1);
+BattleParams * sub_02051F4C(int param0, const FieldSystem * param1);
 void sub_020520A4(BattleParams * param0);
 void sub_0205213C(BattleParams * param0, Pokemon * param1, int param2);
 void sub_02052164(BattleParams * param0, const Party * param1, int param2);
 void sub_02052184(BattleParams * param0, const TrainerInfo * param1, int param2);
 void sub_020521A4(BattleParams * param0, const ChatotCry * param1, int param2);
-void sub_020521B8(BattleParams * param0, const UnkStruct_0203CDB0 * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6);
-void sub_02052314(BattleParams * param0, const UnkStruct_0203CDB0 * param1);
-void sub_02052348(BattleParams * param0, const UnkStruct_0203CDB0 * param1, int param2);
-void sub_020524E4(BattleParams * param0, const UnkStruct_0203CDB0 * param1, const Party * param2, const u8 * param3);
-void sub_020526CC(BattleParams * param0, const UnkStruct_0203CDB0 * param1, const u8 * param2);
-void sub_020526E8(const BattleParams * param0, UnkStruct_0203CDB0 * param1);
-void sub_02052754(const BattleParams * param0, UnkStruct_0203CDB0 * param1);
+void sub_020521B8(BattleParams * param0, const FieldSystem * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6);
+void sub_02052314(BattleParams * param0, const FieldSystem * param1);
+void sub_02052348(BattleParams * param0, const FieldSystem * param1, int param2);
+void sub_020524E4(BattleParams * param0, const FieldSystem * param1, const Party * param2, const u8 * param3);
+void sub_020526CC(BattleParams * param0, const FieldSystem * param1, const u8 * param2);
+void sub_020526E8(const BattleParams * param0, FieldSystem * param1);
+void sub_02052754(const BattleParams * param0, FieldSystem * param1);
 void sub_0205285C(BattleParams * param0);
 BOOL sub_02052868(u32 param0);
 BOOL sub_02052878(u32 param0);
diff --git a/include/unk_020530C8.h b/include/unk_020530C8.h
index c813f53759..b1f196d4fe 100644
--- a/include/unk_020530C8.h
+++ b/include/unk_020530C8.h
@@ -6,28 +6,28 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "functypes/funcptr_02050904.h"
 
-void sub_020531A0(UnkStruct_0203CDB0 * param0);
-void sub_020531C0(UnkStruct_0203CDB0 * param0, BOOL param1);
-void sub_020532A8(UnkStruct_0203CDB0 * param0, BOOL param1);
-void sub_02053494(UnkStruct_0203CDB0 * param0);
-void sub_020535CC(UnkStruct_0203CDB0 * param0);
-void sub_02053704(UnkStruct_0203CDB0 * param0);
-void sub_02053808(UnkStruct_0203CDB0 * param0);
+void sub_020531A0(FieldSystem * param0);
+void sub_020531C0(FieldSystem * param0, BOOL param1);
+void sub_020532A8(FieldSystem * param0, BOOL param1);
+void sub_02053494(FieldSystem * param0);
+void sub_020535CC(FieldSystem * param0);
+void sub_02053704(FieldSystem * param0);
+void sub_02053808(FieldSystem * param0);
 void sub_02053900(UnkStruct_020508D4 * param0, const UnkStruct_02049FA8 * param1);
 void sub_020539A0(UnkStruct_020508D4 * param0, const UnkStruct_02049FA8 * param1);
 void sub_020539E8(UnkStruct_020508D4 * param0, int param1, int param2, int param3, int param4, int param5);
 void sub_02053A80(UnkStruct_020508D4 * param0, int param1, int param2, int param3, int param4, int param5);
-void sub_02053AB4(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, int param5);
+void sub_02053AB4(FieldSystem * param0, int param1, int param2, int param3, int param4, int param5);
 void sub_02053AFC(UnkStruct_020508D4 * param0, int param1, int param2, int param3, int param4, int param5);
 void sub_02053CD4(UnkStruct_020508D4 * param0, const UnkStruct_02049FA8 * param1, u32 param2);
-void sub_02053F58(UnkStruct_0203CDB0 * param0, int param1, int param2);
-void * sub_02053FAC(UnkStruct_0203CDB0 * param0);
-void sub_02054064(UnkStruct_0203CDB0 * param0);
+void sub_02053F58(FieldSystem * param0, int param1, int param2);
+void * sub_02053FAC(FieldSystem * param0);
+void sub_02054064(FieldSystem * param0);
 BOOL sub_02054084(UnkStruct_020508D4 * param0);
 BOOL sub_0205430C(UnkStruct_020508D4 * param0);
-UnkFuncPtr_02050904 sub_02054428(const UnkStruct_0203CDB0 * param0);
+UnkFuncPtr_02050904 sub_02054428(const FieldSystem * param0);
 void sub_020544F0(UnkStruct_020508D4 * param0, const UnkStruct_02049FA8 * param1);
-void sub_020545EC(UnkStruct_0203CDB0 * param0);
+void sub_020545EC(FieldSystem * param0);
 void sub_02054708(UnkStruct_020508D4 * param0);
 void sub_02054800(UnkStruct_020508D4 * param0, int param1, int param2, int param3, int param4, int param5);
 void sub_02054864(UnkStruct_020508D4 * param0);
diff --git a/include/unk_02054BD0.h b/include/unk_02054BD0.h
index 61d266f452..cabdf79fd0 100644
--- a/include/unk_02054BD0.h
+++ b/include/unk_02054BD0.h
@@ -4,8 +4,8 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_02054C18_decl.h"
 
-void sub_02054BD0(UnkStruct_0203CDB0 * param0, const u8 param1);
-void sub_02054BF8(UnkStruct_0203CDB0 * param0);
+void sub_02054BD0(FieldSystem * param0, const u8 param1);
+void sub_02054BF8(FieldSystem * param0);
 u16 const * sub_02054C0C(const u32 param0, const UnkStruct_02054C18 * param1);
 
 #endif // POKEPLATINUM_UNK_02054BD0_H
diff --git a/include/unk_02054D00.h b/include/unk_02054D00.h
index 9bca9600ed..126b60a302 100644
--- a/include/unk_02054D00.h
+++ b/include/unk_02054D00.h
@@ -9,17 +9,17 @@
 #include <nitro/fx/fx.h>
 
 void sub_02054F44(const UnkStruct_02054F44 ** param0, int param1);
-BOOL sub_02054F68(const UnkStruct_0203CDB0 * param0, const int param1, const int param2);
-u8 sub_02054F94(const UnkStruct_0203CDB0 * param0, const int param1, const int param2);
-const fx32 sub_02054FBC(const UnkStruct_0203CDB0 * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4);
-BOOL sub_02055024(const UnkStruct_0203CDB0 * param0, const VecFx32 * param1, const int param2, const int param3, s8 * param4);
-BOOL sub_0205507C(UnkStruct_0203CDB0 * param0, const VecFx32 * param1, const int param2, const int param3, s8 * param4);
+BOOL sub_02054F68(const FieldSystem * param0, const int param1, const int param2);
+u8 sub_02054F94(const FieldSystem * param0, const int param1, const int param2);
+const fx32 sub_02054FBC(const FieldSystem * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4);
+BOOL sub_02055024(const FieldSystem * param0, const VecFx32 * param1, const int param2, const int param3, s8 * param4);
+BOOL sub_0205507C(FieldSystem * param0, const VecFx32 * param1, const int param2, const int param3, s8 * param4);
 void sub_020550F4(const int param0, const int param1, const int param2, const int param3, const u32 param4, const u32 param5, UnkStruct_02055130 * param6);
 BOOL sub_02055130(const UnkStruct_ov5_021E1890 * param0, const UnkStruct_02055130 * param1, const VecFx32 * param2);
-BOOL sub_02055178(const UnkStruct_0203CDB0 * param0, const int param1, const UnkStruct_02055130 * param2, UnkStruct_ov5_021E1890 ** param3);
-BOOL sub_02055208(const UnkStruct_0203CDB0 * param0, const int * param1, const u8 param2, const UnkStruct_02055130 * param3, UnkStruct_ov5_021E1890 ** param4, int * param5);
-BOOL sub_020552B4(const UnkStruct_0203CDB0 * param0, const int param1, UnkStruct_ov5_021E1890 ** param2, int * param3);
-BOOL sub_02055324(const UnkStruct_0203CDB0 * param0, const int * param1, const u8 param2, UnkStruct_ov5_021E1890 ** param3, int * param4);
+BOOL sub_02055178(const FieldSystem * param0, const int param1, const UnkStruct_02055130 * param2, UnkStruct_ov5_021E1890 ** param3);
+BOOL sub_02055208(const FieldSystem * param0, const int * param1, const u8 param2, const UnkStruct_02055130 * param3, UnkStruct_ov5_021E1890 ** param4, int * param5);
+BOOL sub_020552B4(const FieldSystem * param0, const int param1, UnkStruct_ov5_021E1890 ** param2, int * param3);
+BOOL sub_02055324(const FieldSystem * param0, const int * param1, const u8 param2, UnkStruct_ov5_021E1890 ** param3, int * param4);
 void sub_020553A4(const int param0, const int param1, VecFx32 * param2);
 
 #endif // POKEPLATINUM_UNK_02054D00_H
diff --git a/include/unk_020553DC.h b/include/unk_020553DC.h
index b0363a3a28..a8d2906a95 100644
--- a/include/unk_020553DC.h
+++ b/include/unk_020553DC.h
@@ -4,15 +4,15 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 
 void sub_020553DC(void);
-void sub_020553F0(UnkStruct_0203CDB0 * param0, u16 param1);
-u16 sub_02055404(UnkStruct_0203CDB0 * param0);
-void sub_02055414(UnkStruct_0203CDB0 * param0);
-u16 sub_02055428(UnkStruct_0203CDB0 * param0, int param1);
-u16 sub_020554A4(UnkStruct_0203CDB0 * param0, int param1);
-BOOL sub_02055554(UnkStruct_0203CDB0 * param0, u16 param1, int param2);
+void sub_020553F0(FieldSystem * param0, u16 param1);
+u16 sub_02055404(FieldSystem * param0);
+void sub_02055414(FieldSystem * param0);
+u16 sub_02055428(FieldSystem * param0, int param1);
+u16 sub_020554A4(FieldSystem * param0, int param1);
+BOOL sub_02055554(FieldSystem * param0, u16 param1, int param2);
 u16 sub_0205560C(int param0);
-void sub_02055644(UnkStruct_0203CDB0 * param0, int param1);
-void sub_02055670(UnkStruct_0203CDB0 * param0, int param1);
-void sub_020556A0(UnkStruct_0203CDB0 * param0, int param1);
+void sub_02055644(FieldSystem * param0, int param1);
+void sub_02055670(FieldSystem * param0, int param1);
+void sub_020556A0(FieldSystem * param0, int param1);
 
 #endif // POKEPLATINUM_UNK_020553DC_H
diff --git a/include/unk_020559DC.h b/include/unk_020559DC.h
index da00afb606..865572556a 100644
--- a/include/unk_020559DC.h
+++ b/include/unk_020559DC.h
@@ -5,16 +5,16 @@
 
 #include <nitro/rtc.h>
 
-void sub_020559DC(UnkStruct_0203CDB0 * param0);
-int sub_02055BA8(const UnkStruct_0203CDB0 * param0);
-int sub_02055BB8(const UnkStruct_0203CDB0 * param0);
-int sub_02055BC4(const UnkStruct_0203CDB0 * param0);
-int sub_02055BD0(const UnkStruct_0203CDB0 * param0);
-int sub_02055BDC(const UnkStruct_0203CDB0 * param0);
-int sub_02055BE8(const UnkStruct_0203CDB0 * param0);
-void sub_02055BF4(const UnkStruct_0203CDB0 * param0, RTCDate * param1, RTCTime * param2);
-void sub_02055C10(const UnkStruct_0203CDB0 * param0, RTCDate * param1, RTCTime * param2);
-void sub_02055C2C(const UnkStruct_0203CDB0 * param0);
-BOOL sub_02055C40(UnkStruct_0203CDB0 * param0);
+void sub_020559DC(FieldSystem * param0);
+int sub_02055BA8(const FieldSystem * param0);
+int sub_02055BB8(const FieldSystem * param0);
+int sub_02055BC4(const FieldSystem * param0);
+int sub_02055BD0(const FieldSystem * param0);
+int sub_02055BDC(const FieldSystem * param0);
+int sub_02055BE8(const FieldSystem * param0);
+void sub_02055BF4(const FieldSystem * param0, RTCDate * param1, RTCTime * param2);
+void sub_02055C10(const FieldSystem * param0, RTCDate * param1, RTCTime * param2);
+void sub_02055C2C(const FieldSystem * param0);
+BOOL sub_02055C40(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_020559DC_H
diff --git a/include/unk_02055C50.h b/include/unk_02055C50.h
index 598a7252bf..45e9f88df9 100644
--- a/include/unk_02055C50.h
+++ b/include/unk_02055C50.h
@@ -5,22 +5,22 @@
 #include "struct_decls/struct_02055CBC_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 
-UnkStruct_02055CBC * sub_02055C8C(UnkStruct_0203CDB0 * param0, int param1);
+UnkStruct_02055CBC * sub_02055C8C(FieldSystem * param0, int param1);
 void sub_02055CBC(UnkStruct_02055CBC * param0);
-void sub_02055CD4(UnkStruct_0203CDB0 * param0, int param1);
-void sub_02055D94(UnkStruct_0203CDB0 * param0);
-BOOL sub_02055E00(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1);
-void sub_02055E80(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16 param2);
-void sub_02055EAC(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16 param2);
-void sub_02055EE0(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1);
-int sub_02055F00(const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1);
-int sub_02055F20(const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1);
-u16 sub_02055F40(const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1);
-u16 sub_02055F64(const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1);
-int sub_02055F88(const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1);
-int sub_02055FA8(const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1);
-u32 sub_02055FC8(const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1);
-void sub_020562AC(UnkStruct_0203CDB0 * param0);
-void sub_020562D8(UnkStruct_0203CDB0 * param0);
+void sub_02055CD4(FieldSystem * param0, int param1);
+void sub_02055D94(FieldSystem * param0);
+BOOL sub_02055E00(FieldSystem * param0, UnkStruct_02061AB4 * param1);
+void sub_02055E80(FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2);
+void sub_02055EAC(FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2);
+void sub_02055EE0(FieldSystem * param0, UnkStruct_02061AB4 * param1);
+int sub_02055F00(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
+int sub_02055F20(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
+u16 sub_02055F40(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
+u16 sub_02055F64(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
+int sub_02055F88(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
+int sub_02055FA8(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
+u32 sub_02055FC8(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
+void sub_020562AC(FieldSystem * param0);
+void sub_020562D8(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_02055C50_H
diff --git a/include/unk_020562F8.h b/include/unk_020562F8.h
index f719a2e756..079e774b8d 100644
--- a/include/unk_020562F8.h
+++ b/include/unk_020562F8.h
@@ -4,14 +4,14 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay006/battle_params.h"
 
-void sub_020562F8(UnkStruct_0203CDB0 * param0);
-void sub_02056328(UnkStruct_0203CDB0 * param0);
-BOOL sub_02056374(UnkStruct_0203CDB0 * param0, int param1, int param2);
-BattleParams * sub_0205639C(UnkStruct_0203CDB0 * param0);
-void sub_020563AC(UnkStruct_0203CDB0 * param0, BattleParams * param1);
-int sub_020563BC(UnkStruct_0203CDB0 * param0);
-int sub_020563D0(UnkStruct_0203CDB0 * param0);
-int sub_020563E0(UnkStruct_0203CDB0 * param0);
-int sub_020563F0(UnkStruct_0203CDB0 * param0);
+void sub_020562F8(FieldSystem * param0);
+void sub_02056328(FieldSystem * param0);
+BOOL sub_02056374(FieldSystem * param0, int param1, int param2);
+BattleParams * sub_0205639C(FieldSystem * param0);
+void sub_020563AC(FieldSystem * param0, BattleParams * param1);
+int sub_020563BC(FieldSystem * param0);
+int sub_020563D0(FieldSystem * param0);
+int sub_020563E0(FieldSystem * param0);
+int sub_020563F0(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_020562F8_H
diff --git a/include/unk_02056B30.h b/include/unk_02056B30.h
index c51b6c105a..edc29c0a30 100644
--- a/include/unk_02056B30.h
+++ b/include/unk_02056B30.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_020508D4_decl.h"
 
 void sub_02056B30(UnkStruct_020508D4 * param0, int param1, int param2, int param3, u16 param4, int param5, int param6, int param7);
-void sub_02056BDC(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6);
-void sub_02056C18(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const int param3, const int param4, const int param5);
+void sub_02056BDC(FieldSystem * param0, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6);
+void sub_02056C18(FieldSystem * param0, const int param1, const int param2, const int param3, const int param4, const int param5);
 
 #endif // POKEPLATINUM_UNK_02056B30_H
diff --git a/include/unk_02057518.h b/include/unk_02057518.h
index 7623fee4b1..476caceffa 100644
--- a/include/unk_02057518.h
+++ b/include/unk_02057518.h
@@ -5,7 +5,7 @@
 #include "overlay023/struct_ov23_0224A294.h"
 
 UnkStruct_ov23_0224A294 * sub_02057518(void);
-BOOL sub_02057524(void * param0, UnkStruct_0203CDB0 * param1, BOOL param2);
+BOOL sub_02057524(void * param0, FieldSystem * param1, BOOL param2);
 void sub_0205764C(void);
 void sub_020576A0(void);
 void sub_020576CC(BOOL param0);
@@ -21,7 +21,7 @@ void sub_02057DB8(u8 param0, BOOL param1, BOOL param2);
 BOOL sub_02057FAC(void);
 void sub_02057FC4(BOOL param0);
 void sub_02058018(int param0, int param1, void * param2, void * param3);
-void sub_0205805C(UnkStruct_0203CDB0 * param0, BOOL param1);
+void sub_0205805C(FieldSystem * param0, BOOL param1);
 BOOL sub_02058108(int param0, int param1);
 void sub_02058488(int param0, int param1, void * param2, void * param3);
 void sub_0205853C(int param0, int param1, void * param2, void * param3);
diff --git a/include/unk_0205964C.h b/include/unk_0205964C.h
index 4340d046e1..5f946e4742 100644
--- a/include/unk_0205964C.h
+++ b/include/unk_0205964C.h
@@ -7,13 +7,13 @@
 #include "savedata.h"
 
 UnkStruct_0205964C * sub_0205964C(void);
-void sub_0205965C(UnkStruct_0203CDB0 * param0);
+void sub_0205965C(FieldSystem * param0);
 void sub_020596BC(void);
-void sub_02059708(UnkStruct_0203CDB0 * param0, int param1, int param2);
-void sub_02059748(UnkStruct_0203CDB0 * param0, int param1, int param2);
+void sub_02059708(FieldSystem * param0, int param1, int param2);
+void sub_02059748(FieldSystem * param0, int param1, int param2);
 void sub_02059788(int param0);
 void sub_020597A4(void);
-void sub_020597B4(UnkStruct_0203CDB0 * param0);
+void sub_020597B4(FieldSystem * param0);
 void sub_0205987C(void);
 void sub_020598A0(void);
 void sub_02059D0C(int param0, int param1, void * param2, void * param3);
diff --git a/include/unk_0205A0D8.h b/include/unk_0205A0D8.h
index fe9e243796..628cb17d66 100644
--- a/include/unk_0205A0D8.h
+++ b/include/unk_0205A0D8.h
@@ -4,11 +4,11 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "functypes/funcptr_0205AB10.h"
 
-void sub_0205AB10(UnkStruct_0203CDB0 * param0, UnkFuncPtr_0205AB10 * param1);
+void sub_0205AB10(FieldSystem * param0, UnkFuncPtr_0205AB10 * param1);
 void sub_0205B0C0(int param0, int param1, void * param2, void * param3);
 int sub_0205B0E4(void);
 u8 * sub_0205B0F4(int param0, void * param1, int param2);
 void sub_0205B110(int param0, int param1, void * param2, void * param3);
-void sub_0205B2D4(UnkStruct_0203CDB0 * param0);
+void sub_0205B2D4(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_0205A0D8_H
diff --git a/include/unk_0205B33C.h b/include/unk_0205B33C.h
index 05239f9ff2..a58824211d 100644
--- a/include/unk_0205B33C.h
+++ b/include/unk_0205B33C.h
@@ -11,10 +11,10 @@
 
 #include <nitro/wm.h>
 
-UnkStruct_0205B43C * sub_0205B33C(UnkStruct_0203CDB0 * param0);
-void sub_0205B388(UnkStruct_0203CDB0 * param0);
+UnkStruct_0205B43C * sub_0205B33C(FieldSystem * param0);
+void sub_0205B388(FieldSystem * param0);
 void sub_0205B5BC(SysTask * param0, void * param1);
-UnkStruct_0203CDB0 * sub_0205B770(UnkStruct_0205B43C * param0);
+FieldSystem * sub_0205B770(UnkStruct_0205B43C * param0);
 WMBssDesc * sub_0205B774(UnkStruct_0205B43C * param0, int param1);
 int sub_0205B780(UnkStruct_0205B43C * param0, int param1);
 int sub_0205B804(UnkStruct_0205B43C * param0, int param1, u16 param2);
diff --git a/include/unk_0205CA94.h b/include/unk_0205CA94.h
index 53c00ce4b4..55805bc3bd 100644
--- a/include/unk_0205CA94.h
+++ b/include/unk_0205CA94.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-void sub_0205CFDC(UnkStruct_0203CDB0 * param0, int param1, BOOL * param2);
+void sub_0205CFDC(FieldSystem * param0, int param1, BOOL * param2);
 
 #endif // POKEPLATINUM_UNK_0205CA94_H
diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h
index d392ad41ee..503a31be8a 100644
--- a/include/unk_0205E7D0.h
+++ b/include/unk_0205E7D0.h
@@ -75,7 +75,7 @@ void sub_0205ED2C(UnkStruct_0205E884 * param0, int param1);
 void sub_0205ED48(UnkStruct_0205E884 * param0, int param1);
 int sub_0205ED6C(int param0, int param1);
 u32 sub_0205EED8(int param0);
-UnkStruct_0205E884 * sub_0205EF3C(UnkStruct_0203CDB0 * param0);
+UnkStruct_0205E884 * sub_0205EF3C(FieldSystem * param0);
 void sub_0205EF40(UnkStruct_0205E884 * param0, int param1);
 int sub_0205EF58(UnkStruct_0205E884 * param0);
 void sub_0205EF6C(UnkStruct_0205E884 * param0, int param1);
diff --git a/include/unk_02061804.h b/include/unk_02061804.h
index 54df71b9c9..850ce56999 100644
--- a/include/unk_02061804.h
+++ b/include/unk_02061804.h
@@ -20,7 +20,7 @@
 
 #include <nitro/fx/fx.h>
 
-UnkStruct_02061830 * sub_02061804(UnkStruct_0203CDB0 * param0, int param1, int param2);
+UnkStruct_02061830 * sub_02061804(FieldSystem * param0, int param1, int param2);
 void sub_02061830(UnkStruct_02061830 * param0);
 void sub_0206184C(UnkStruct_02061830 * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4);
 UnkStruct_02061AB4 * sub_02061918(const UnkStruct_02061830 * param0, const UnkStruct_020619DC * param1, int param2);
@@ -34,7 +34,7 @@ void sub_02061B48(UnkStruct_02061AB4 * param0);
 void sub_02061BBC(UnkStruct_02061830 * param0);
 void sub_02061BF0(UnkStruct_02061830 * param0);
 void sub_02061C48(UnkStruct_02061830 * param0);
-void sub_02061CA8(UnkStruct_0203CDB0 * param0, const UnkStruct_02061830 * param1, UnkStruct_02061D3C * param2, int param3);
+void sub_02061CA8(FieldSystem * param0, const UnkStruct_02061830 * param1, UnkStruct_02061D3C * param2, int param3);
 void sub_02061D04(const UnkStruct_02061830 * param0, UnkStruct_02061D3C * param1, int param2);
 void sub_02062068(const UnkStruct_02061830 * param0, int param1, int param2, const UnkStruct_020619DC * param3);
 UnkStruct_02061AB4 * sub_0206251C(const UnkStruct_02061830 * param0, int param1);
@@ -56,8 +56,8 @@ void sub_02062860(UnkStruct_02061830 * param0, UnkStruct_02061AB4 * param1);
 const UnkStruct_02061AB4 * sub_02062868(const UnkStruct_02061830 * param0);
 UnkStruct_02061AB4 * sub_02062878(const UnkStruct_02061830 * param0);
 void sub_02062880(const UnkStruct_02061AB4 ** param0);
-void sub_0206288C(UnkStruct_02061830 * param0, UnkStruct_0203CDB0 * param1);
-UnkStruct_0203CDB0 * sub_02062894(const UnkStruct_02061830 * param0);
+void sub_0206288C(UnkStruct_02061830 * param0, FieldSystem * param1);
+FieldSystem * sub_02062894(const UnkStruct_02061830 * param0);
 void sub_0206289C(UnkStruct_02061830 * param0, NARC * param1);
 NARC * sub_020628A0(const UnkStruct_02061830 * param0);
 void sub_020628B4(UnkStruct_02061AB4 * param0, u32 param1);
@@ -142,7 +142,7 @@ void sub_02062BE0(UnkStruct_02061AB4 * param0, u32 param1);
 u32 sub_02062BE8(const UnkStruct_02061AB4 * param0);
 void sub_02062BF0(UnkStruct_02061AB4 * param0, u32 param1);
 u32 sub_02062BF8(const UnkStruct_02061AB4 * param0);
-UnkStruct_0203CDB0 * sub_02062C00(const UnkStruct_02061AB4 * param0);
+FieldSystem * sub_02062C00(const UnkStruct_02061AB4 * param0);
 int sub_02062C0C(const UnkStruct_02061AB4 * param0);
 int sub_02062C18(const UnkStruct_02061AB4 * param0);
 void sub_02062C30(UnkStruct_02061830 * param0);
diff --git a/include/unk_02063400.h b/include/unk_02063400.h
index cbf29b571e..fbe370b139 100644
--- a/include/unk_02063400.h
+++ b/include/unk_02063400.h
@@ -35,7 +35,7 @@ void sub_02064450(int param0, int param1, VecFx32 * param2);
 void sub_02064464(UnkStruct_02061AB4 * param0);
 int sub_0206447C(int param0);
 int sub_02064488(int param0, int param1, int param2, int param3);
-int sub_020644A4(UnkStruct_0203CDB0 * param0, VecFx32 * param1);
-int sub_020644D0(UnkStruct_0203CDB0 * param0, VecFx32 * param1, int param2);
+int sub_020644A4(FieldSystem * param0, VecFx32 * param1);
+int sub_020644D0(FieldSystem * param0, VecFx32 * param1, int param2);
 
 #endif // POKEPLATINUM_UNK_02063400_H
diff --git a/include/unk_02067A84.h b/include/unk_02067A84.h
index 1c8eb55903..d53d1169bc 100644
--- a/include/unk_02067A84.h
+++ b/include/unk_02067A84.h
@@ -6,11 +6,11 @@
 #include "struct_decls/struct_0205E884_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 
-int sub_02067A84(UnkStruct_0203CDB0 * param0, BOOL param1);
+int sub_02067A84(FieldSystem * param0, BOOL param1);
 int sub_02067D58(const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 * param1, int param2, int param3);
 int sub_02067F24(UnkStruct_02061AB4 * param0);
-int sub_02067F88(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1);
-SysTask * sub_02067FB8(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7);
+int sub_02067F88(FieldSystem * param0, UnkStruct_02061AB4 * param1);
+SysTask * sub_02067FB8(FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7);
 int sub_02067FD4(SysTask * param0);
 void sub_02067FE8(SysTask * param0);
 
diff --git a/include/unk_02068344.h b/include/unk_02068344.h
index b385ec2b4a..50d00f4424 100644
--- a/include/unk_02068344.h
+++ b/include/unk_02068344.h
@@ -3,9 +3,9 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-void sub_02068344(UnkStruct_0203CDB0 * param0);
-void sub_02068368(UnkStruct_0203CDB0 * param0);
-BOOL sub_02068390(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
-BOOL sub_020683D8(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, int param4);
+void sub_02068344(FieldSystem * param0);
+void sub_02068368(FieldSystem * param0);
+BOOL sub_02068390(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
+BOOL sub_020683D8(FieldSystem * param0, const int param1, const int param2, const fx32 param3, int param4);
 
 #endif // POKEPLATINUM_UNK_02068344_H
diff --git a/include/unk_020683F4.h b/include/unk_020683F4.h
index 0722d0dc6f..35009ddd3b 100644
--- a/include/unk_020683F4.h
+++ b/include/unk_020683F4.h
@@ -5,8 +5,8 @@
 #include "struct_defs/struct_020684D0.h"
 
 u32 sub_020683F4(u16 param0, u16 param1);
-void sub_0206842C(UnkStruct_0203CDB0 * param0, UnkStruct_020684D0 * param1);
+void sub_0206842C(FieldSystem * param0, UnkStruct_020684D0 * param1);
 BOOL sub_02068B50(const UnkStruct_020684D0 * param0);
-BOOL sub_02069238(UnkStruct_0203CDB0 * param0);
+BOOL sub_02069238(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_020683F4_H
diff --git a/include/unk_0206B70C.h b/include/unk_0206B70C.h
index ba89f3ca27..8728cb5015 100644
--- a/include/unk_0206B70C.h
+++ b/include/unk_0206B70C.h
@@ -4,6 +4,6 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_0203D8AC.h"
 
-void sub_0206B70C(UnkStruct_0203CDB0 * param0, UnkStruct_0203D8AC * param1, int param2);
+void sub_0206B70C(FieldSystem * param0, UnkStruct_0203D8AC * param1, int param2);
 
 #endif // POKEPLATINUM_UNK_0206B70C_H
diff --git a/include/unk_0206B9D8.h b/include/unk_0206B9D8.h
index f9996c105d..3983450e91 100644
--- a/include/unk_0206B9D8.h
+++ b/include/unk_0206B9D8.h
@@ -15,6 +15,6 @@ u32 sub_0206BFFC(u32 param0);
 u32 sub_0206C008(SaveData * param0);
 u32 sub_0206C02C(SaveData * param0);
 u32 sub_0206C068(SaveData * param0);
-BOOL sub_0206C0D0(UnkStruct_0203CDB0 * param0);
+BOOL sub_0206C0D0(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_0206B9D8_H
diff --git a/include/unk_0206C0E8.h b/include/unk_0206C0E8.h
index 524666761e..2e2ade5de8 100644
--- a/include/unk_0206C0E8.h
+++ b/include/unk_0206C0E8.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-void sub_0206C0E8(UnkStruct_0203CDB0 * param0);
+void sub_0206C0E8(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_0206C0E8_H
diff --git a/include/unk_0206C784.h b/include/unk_0206C784.h
index c4ba043d35..84d7759f9a 100644
--- a/include/unk_0206C784.h
+++ b/include/unk_0206C784.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-void sub_0206C784(UnkStruct_0203CDB0 * param0, const u8 param1, const u8 param2, const int param3, const int param4, const int param5);
+void sub_0206C784(FieldSystem * param0, const u8 param1, const u8 param2, const int param3, const int param4, const int param5);
 
 #endif // POKEPLATINUM_UNK_0206C784_H
diff --git a/include/unk_0206CCB0.h b/include/unk_0206CCB0.h
index 9bc3a083f1..80c910d855 100644
--- a/include/unk_0206CCB0.h
+++ b/include/unk_0206CCB0.h
@@ -10,8 +10,8 @@
 #include "savedata.h"
 #include "overlay006/struct_ov6_022465F4_decl.h"
 
-int sub_0206CD00(int param0, UnkStruct_0203CDB0 * param1, StringFormatter * param2, UnkStruct_ov6_022465F4 * param3, u16 * param4);
-BOOL sub_0206CD2C(int param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_022465F4 * param2);
+int sub_0206CD00(int param0, FieldSystem * param1, StringFormatter * param2, UnkStruct_ov6_022465F4 * param3, u16 * param4);
+BOOL sub_0206CD2C(int param0, FieldSystem * param1, UnkStruct_ov6_022465F4 * param2);
 void sub_0206CF14(TVBroadcast * param0, Pokemon * param1, int param2, int param3, int param4);
 void sub_0206CF48(TVBroadcast * param0, Pokemon * param1, int param2);
 void sub_0206CF9C(TVBroadcast * param0, int param1);
@@ -29,46 +29,46 @@ void sub_0206D12C(TVBroadcast * param0);
 UnkStruct_0206D140 * sub_0206D140(int param0);
 void sub_0206D158(UnkStruct_0206D140 * param0);
 void sub_0206D160(UnkStruct_0206D140 * param0, Pokemon * param1, int param2, int param3, u32 param4);
-void sub_0206D1B8(UnkStruct_0203CDB0 * param0, const UnkStruct_0206D140 * param1, int param2);
-void sub_0206D340(UnkStruct_0203CDB0 * param0, BOOL param1, u16 param2, Pokemon * param3);
-void sub_0206D424(UnkStruct_0203CDB0 * param0);
-void sub_0206D430(UnkStruct_0203CDB0 * param0);
-void sub_0206D4AC(UnkStruct_0203CDB0 * param0, u16 param1);
+void sub_0206D1B8(FieldSystem * param0, const UnkStruct_0206D140 * param1, int param2);
+void sub_0206D340(FieldSystem * param0, BOOL param1, u16 param2, Pokemon * param3);
+void sub_0206D424(FieldSystem * param0);
+void sub_0206D430(FieldSystem * param0);
+void sub_0206D4AC(FieldSystem * param0, u16 param1);
 void sub_0206D504(SaveData * param0, u16 param1, u8 param2);
-void sub_0206D578(UnkStruct_0203CDB0 * param0, Pokemon * param1);
-void sub_0206D60C(UnkStruct_0203CDB0 * param0, Pokemon * param1);
-void sub_0206D6C8(UnkStruct_0203CDB0 * param0, int param1, int param2);
-void sub_0206D720(UnkStruct_0203CDB0 * param0);
-void sub_0206D7C4(UnkStruct_0203CDB0 * param0);
+void sub_0206D578(FieldSystem * param0, Pokemon * param1);
+void sub_0206D60C(FieldSystem * param0, Pokemon * param1);
+void sub_0206D6C8(FieldSystem * param0, int param1, int param2);
+void sub_0206D720(FieldSystem * param0);
+void sub_0206D7C4(FieldSystem * param0);
 void sub_0206D90C(TVBroadcast * param0, Pokemon * param1, u16 param2);
-void sub_0206D914(UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, u16 param3);
+void sub_0206D914(FieldSystem * param0, u16 param1, u8 param2, u16 param3);
 void sub_0206D9B4(TVBroadcast * param0, Pokemon * param1, u8 param2);
-void sub_0206DAB8(UnkStruct_0203CDB0 * param0, const TrainerInfo * param1);
-void sub_0206DAD4(UnkStruct_0203CDB0 * param0, const TrainerInfo * param1);
-void sub_0206DB20(UnkStruct_0203CDB0 * param0);
-void sub_0206DB5C(UnkStruct_0203CDB0 * param0, u8 param1);
+void sub_0206DAB8(FieldSystem * param0, const TrainerInfo * param1);
+void sub_0206DAD4(FieldSystem * param0, const TrainerInfo * param1);
+void sub_0206DB20(FieldSystem * param0);
+void sub_0206DB5C(FieldSystem * param0, u8 param1);
 void sub_0206DBB0(SaveData * param0, u32 param1, Pokemon * param2, BOOL param3);
-void sub_0206DC6C(UnkStruct_0203CDB0 * param0, u32 param1, Pokemon * param2);
-void sub_0206DD38(UnkStruct_0203CDB0 * param0, u32 param1, u32 param2, u32 param3);
+void sub_0206DC6C(FieldSystem * param0, u32 param1, Pokemon * param2);
+void sub_0206DD38(FieldSystem * param0, u32 param1, u32 param2, u32 param3);
 void sub_0206DDB8(SaveData * param0, Pokemon * param1, u32 param2);
-void sub_0206DEEC(UnkStruct_0203CDB0 * param0, u16 param1, u16 param2);
-void sub_0206DF60(UnkStruct_0203CDB0 * param0, u16 param1);
+void sub_0206DEEC(FieldSystem * param0, u16 param1, u16 param2);
+void sub_0206DF60(FieldSystem * param0, u16 param1);
 void sub_0206DFE0(SaveData * param0);
 void sub_0206E060(SaveData * param0);
-void sub_0206E0E0(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E174(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E264(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E2BC(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E398(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E414(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E448(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E4DC(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E5A0(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E668(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E6A8(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E6E8(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E728(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0206E768(UnkStruct_0203CDB0 * param0, u16 param1);
+void sub_0206E0E0(FieldSystem * param0, u16 param1);
+void sub_0206E174(FieldSystem * param0, u16 param1);
+void sub_0206E264(FieldSystem * param0, u16 param1);
+void sub_0206E2BC(FieldSystem * param0, u16 param1);
+void sub_0206E398(FieldSystem * param0, u16 param1);
+void sub_0206E414(FieldSystem * param0, u16 param1);
+void sub_0206E448(FieldSystem * param0, u16 param1);
+void sub_0206E4DC(FieldSystem * param0, u16 param1);
+void sub_0206E5A0(FieldSystem * param0, u16 param1);
+void sub_0206E668(FieldSystem * param0, u16 param1);
+void sub_0206E6A8(FieldSystem * param0, u16 param1);
+void sub_0206E6E8(FieldSystem * param0, u16 param1);
+void sub_0206E728(FieldSystem * param0, u16 param1);
+void sub_0206E768(FieldSystem * param0, u16 param1);
 void sub_0206F2F0(SaveData * param0);
 
 #endif // POKEPLATINUM_UNK_0206CCB0_H
diff --git a/include/unk_02070428.h b/include/unk_02070428.h
index f53c8714f3..6666bd5ea3 100644
--- a/include/unk_02070428.h
+++ b/include/unk_02070428.h
@@ -3,13 +3,13 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-void sub_02070428(UnkStruct_0203CDB0 * param0, BOOL param1);
-void sub_02070430(UnkStruct_0203CDB0 * param0);
-void sub_02070494(UnkStruct_0203CDB0 * param0);
-void sub_0207056C(UnkStruct_0203CDB0 * param0);
-void sub_02070588(UnkStruct_0203CDB0 * param0);
-void sub_020705A4(UnkStruct_0203CDB0 * param0);
-void sub_020705B4(UnkStruct_0203CDB0 * param0);
-void sub_020705CC(UnkStruct_0203CDB0 * param0);
+void sub_02070428(FieldSystem * param0, BOOL param1);
+void sub_02070430(FieldSystem * param0);
+void sub_02070494(FieldSystem * param0);
+void sub_0207056C(FieldSystem * param0);
+void sub_02070588(FieldSystem * param0);
+void sub_020705A4(FieldSystem * param0);
+void sub_020705B4(FieldSystem * param0);
+void sub_020705CC(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_02070428_H
diff --git a/include/unk_0207064C.h b/include/unk_0207064C.h
index ecb4dd2b29..476f5ccf81 100644
--- a/include/unk_0207064C.h
+++ b/include/unk_0207064C.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "pokemon.h"
 
-void * sub_0207064C(u32 param0, UnkStruct_0203CDB0 * param1, Pokemon * param2, u16 param3, s16 param4, s16 param5);
+void * sub_0207064C(u32 param0, FieldSystem * param1, Pokemon * param2, u16 param3, s16 param4, s16 param5);
 BOOL sub_02070680(UnkStruct_020508D4 * param0);
 
 #endif // POKEPLATINUM_UNK_0207064C_H
diff --git a/include/unk_0207070C.h b/include/unk_0207070C.h
index ee51bb18ae..c4e76506cf 100644
--- a/include/unk_0207070C.h
+++ b/include/unk_0207070C.h
@@ -5,6 +5,6 @@
 #include "struct_decls/struct_02070950_decl.h"
 
 u32 sub_0207070C(u16 param0, u16 param1);
-void sub_02070728(UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1);
+void sub_02070728(FieldSystem * param0, UnkStruct_02070950 * param1);
 
 #endif // POKEPLATINUM_UNK_0207070C_H
diff --git a/include/unk_0207160C.h b/include/unk_0207160C.h
index c5546cb371..7982c828ee 100644
--- a/include/unk_0207160C.h
+++ b/include/unk_0207160C.h
@@ -3,9 +3,9 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-void sub_0207160C(UnkStruct_0203CDB0 * param0);
-void sub_020716D4(UnkStruct_0203CDB0 * param0);
-u8 sub_02071818(UnkStruct_0203CDB0 * param0);
-void sub_0207183C(UnkStruct_0203CDB0 * param0);
+void sub_0207160C(FieldSystem * param0);
+void sub_020716D4(FieldSystem * param0);
+u8 sub_02071818(FieldSystem * param0);
+void sub_0207183C(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_0207160C_H
diff --git a/include/unk_02071B10.h b/include/unk_02071B10.h
index c3fb9b6090..0a44f5158a 100644
--- a/include/unk_02071B10.h
+++ b/include/unk_02071B10.h
@@ -3,14 +3,14 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-void sub_02071B10(UnkStruct_0203CDB0 * param0);
-void sub_02071B30(UnkStruct_0203CDB0 * param0);
-void sub_02071B6C(UnkStruct_0203CDB0 * param0, const u8 param1);
-void sub_02071BD0(UnkStruct_0203CDB0 * param0);
-void sub_02071BF8(UnkStruct_0203CDB0 * param0);
-void sub_02071C18(UnkStruct_0203CDB0 * param0);
-void sub_02071C34(UnkStruct_0203CDB0 * param0);
-void sub_02071C5C(UnkStruct_0203CDB0 * param0);
-BOOL sub_02071CB4(UnkStruct_0203CDB0 * param0, int param1);
+void sub_02071B10(FieldSystem * param0);
+void sub_02071B30(FieldSystem * param0);
+void sub_02071B6C(FieldSystem * param0, const u8 param1);
+void sub_02071BD0(FieldSystem * param0);
+void sub_02071BF8(FieldSystem * param0);
+void sub_02071C18(FieldSystem * param0);
+void sub_02071C34(FieldSystem * param0);
+void sub_02071C5C(FieldSystem * param0);
+BOOL sub_02071CB4(FieldSystem * param0, int param1);
 
 #endif // POKEPLATINUM_UNK_02071B10_H
diff --git a/include/unk_02071CD0.h b/include/unk_02071CD0.h
index c56a1f76dd..b2288fc0e6 100644
--- a/include/unk_02071CD0.h
+++ b/include/unk_02071CD0.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 
-void sub_02071CD0(UnkStruct_0203CDB0 * param0);
+void sub_02071CD0(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_02071CD0_H
diff --git a/include/unk_02071D40.h b/include/unk_02071D40.h
index a9cc9a65bc..05caecd62c 100644
--- a/include/unk_02071D40.h
+++ b/include/unk_02071D40.h
@@ -4,11 +4,11 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_02072014.h"
 
-void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 param3, UnkStruct_0203CDB0 * param4, UnkStruct_02072014 * param5);
+void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 param3, FieldSystem * param4, UnkStruct_02072014 * param5);
 UnkStruct_02072014 * sub_02071F04(const u16 param0);
 void sub_02071F20(UnkStruct_02072014 * param0);
-u8 sub_02071F28(UnkStruct_0203CDB0 * param0);
-void sub_020721D4(UnkStruct_0203CDB0 * param0, const UnkStruct_02072014 * param1);
-void sub_02072204(UnkStruct_0203CDB0 * param0);
+u8 sub_02071F28(FieldSystem * param0);
+void sub_020721D4(FieldSystem * param0, const UnkStruct_02072014 * param1);
+void sub_02072204(FieldSystem * param0);
 
 #endif // POKEPLATINUM_UNK_02071D40_H
diff --git a/include/unk_02095CD4.h b/include/unk_02095CD4.h
index 747ff10e88..cc8e831a92 100644
--- a/include/unk_02095CD4.h
+++ b/include/unk_02095CD4.h
@@ -13,6 +13,6 @@ void sub_02095DA8(int param0, int param1, void * param2, void * param3);
 void sub_02095DAC(int param0, int param1, void * param2, void * param3);
 void sub_02095DB8(int param0, int param1, void * param2, void * param3);
 void sub_02095DFC(int param0, int param1, void * param2, void * param3);
-void sub_02095E60(UnkStruct_0203CDB0 * param0, UnkStruct_02095E80 * param1);
+void sub_02095E60(FieldSystem * param0, UnkStruct_02095E80 * param1);
 
 #endif // POKEPLATINUM_UNK_02095CD4_H
diff --git a/include/unk_02099604.h b/include/unk_02099604.h
index d334e1e8ec..66244dda68 100644
--- a/include/unk_02099604.h
+++ b/include/unk_02099604.h
@@ -6,7 +6,7 @@
 #include "overlay082/struct_ov82_0223B164.h"
 
 UnkStruct_ov82_0223B164 * sub_02099604(int param0, SaveData * param1, int param2);
-UnkStruct_ov82_0223B164 * sub_02099674(UnkStruct_0203CDB0 * param0, int param1, int param2);
-UnkStruct_ov82_0223B164 * sub_020996A0(UnkStruct_0203CDB0 * param0, int param1, BOOL param2);
+UnkStruct_ov82_0223B164 * sub_02099674(FieldSystem * param0, int param1, int param2);
+UnkStruct_ov82_0223B164 * sub_020996A0(FieldSystem * param0, int param1, BOOL param2);
 
 #endif // POKEPLATINUM_UNK_02099604_H
diff --git a/include/unk_0209BA18.h b/include/unk_0209BA18.h
index 78b1133307..ed0afc2698 100644
--- a/include/unk_0209BA18.h
+++ b/include/unk_0209BA18.h
@@ -4,6 +4,6 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay104/struct_ov104_02230BE4.h"
 
-UnkStruct_ov104_02230BE4 * sub_0209BA18(UnkStruct_0203CDB0 * param0, void * param1);
+UnkStruct_ov104_02230BE4 * sub_0209BA18(FieldSystem * param0, void * param1);
 
 #endif // POKEPLATINUM_UNK_0209BA18_H
diff --git a/include/unk_0209C194.h b/include/unk_0209C194.h
index 19747fdeb1..53b92270d7 100644
--- a/include/unk_0209C194.h
+++ b/include/unk_0209C194.h
@@ -8,7 +8,7 @@
 UnkStruct_0209C194 * sub_0209C194(UnkStruct_0209C194_1 * param0, u32 param1);
 void sub_0209C1D0(UnkStruct_0209C194 * param0);
 BOOL sub_0209C1E8(UnkStruct_0209C194 * param0);
-void * sub_0209C1EC(UnkStruct_0203CDB0 * param0);
+void * sub_0209C1EC(FieldSystem * param0);
 BOOL sub_0209C238(void * param0);
 
 #endif // POKEPLATINUM_UNK_0209C194_H
diff --git a/src/overlay005/ov5_021D0D80.c b/src/overlay005/ov5_021D0D80.c
index 704d93e048..0af0e96479 100644
--- a/src/overlay005/ov5_021D0D80.c
+++ b/src/overlay005/ov5_021D0D80.c
@@ -109,32 +109,32 @@ static void ov5_021D1524(BGL * param0);
 static void ov5_021D154C(void);
 static void ov5_021D1570(void);
 static void ov5_021D1578(UnkStruct_ov5_021D5894 * param0);
-static void ov5_021D15F4(UnkStruct_0203CDB0 * param0);
-static void ov5_021D173C(UnkStruct_0203CDB0 * param0);
+static void ov5_021D15F4(FieldSystem * param0);
+static void ov5_021D173C(FieldSystem * param0);
 static void ov5_021D1414(void);
 static void ov5_021D15B4(void);
 static void ov5_021D15E8(void);
-static void ov5_021D1790(UnkStruct_0203CDB0 * param0);
-static void ov5_021D17EC(UnkStruct_0203CDB0 * param0);
-static void ov5_021D1878(UnkStruct_0203CDB0 * param0);
-static void ov5_021D1968(UnkStruct_0203CDB0 * param0);
+static void ov5_021D1790(FieldSystem * param0);
+static void ov5_021D17EC(FieldSystem * param0);
+static void ov5_021D1878(FieldSystem * param0);
+static void ov5_021D1968(FieldSystem * param0);
 static int ov5_021D0DA4(UnkStruct_020067E8 * param0, int * param1);
 static int ov5_021D0F68(UnkStruct_020067E8 * param0, int * param1);
 static int ov5_021D0FB4(UnkStruct_020067E8 * param0, int * param1);
-static BOOL ov5_021D11CC(UnkStruct_0203CDB0 * param0);
-static void ov5_021D134C(UnkStruct_0203CDB0 * param0, u8 param1);
-static BOOL ov5_021D119C(UnkStruct_0203CDB0 * param0);
+static BOOL ov5_021D11CC(FieldSystem * param0);
+static void ov5_021D134C(FieldSystem * param0, u8 param1);
+static BOOL ov5_021D119C(FieldSystem * param0);
 static void ov5_021D0D80(void * param0);
-static void ov5_021D13B4(UnkStruct_0203CDB0 * param0);
-static int ov5_021D1178(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D1A78(UnkStruct_0203CDB0 * param0);
+static void ov5_021D13B4(FieldSystem * param0);
+static int ov5_021D1178(FieldSystem * param0);
+static BOOL ov5_021D1A78(FieldSystem * param0);
 static UnkStruct_ov5_021D1A68 * ov5_021D1A14(int param0, int param1);
 static const int * ov5_021D1A68(const UnkStruct_ov5_021D1A68 * param0);
 static const int ov5_021D1A6C(const UnkStruct_ov5_021D1A68 * param0);
 static void ov5_021D1A70(UnkStruct_ov5_021D1A68 * param0);
 
 
-static inline void inline_ov5_021D0D80 (UnkStruct_0203CDB0 * param0)
+static inline void inline_ov5_021D0D80 (FieldSystem * param0)
 {
     UnkStruct_ov5_021ED0A4 * v0 = sub_0206285C(param0->unk_38);
     UnkStruct_02020C44 * v1 = ov5_021EDC8C(v0);
@@ -144,7 +144,7 @@ static inline void inline_ov5_021D0D80 (UnkStruct_0203CDB0 * param0)
 
 static void ov5_021D0D80 (void * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0;
+    FieldSystem * v0 = param0;
 
     sub_0201C2B8(v0->unk_08);
     sub_0201DCAC();
@@ -156,7 +156,7 @@ static void ov5_021D0D80 (void * param0)
 static int ov5_021D0DA4 (UnkStruct_020067E8 * param0, int * param1)
 {
     u16 v0;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
     int v2 = 0;
 
     v1 = sub_02006840(param0);
@@ -252,7 +252,7 @@ static int ov5_021D0DA4 (UnkStruct_020067E8 * param0, int * param1)
 
 static int ov5_021D0F68 (UnkStruct_020067E8 * param0, int * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
 
     v0 = sub_02006840(param0);
 
@@ -277,7 +277,7 @@ static int ov5_021D0F68 (UnkStruct_020067E8 * param0, int * param1)
 
 static int ov5_021D0FB4 (UnkStruct_020067E8 * param0, int * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
 
     v0 = sub_02006840(param0);
     ov5_021E8188(v0, v0->unk_28);
@@ -380,7 +380,7 @@ const UnkStruct_0208BE5C Unk_ov5_021F89B0 = {
     0xffffffff
 };
 
-static int ov5_021D1178 (UnkStruct_0203CDB0 * param0)
+static int ov5_021D1178 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0 = sub_02027860(sub_0203D174(param0));
     int v1 = sub_02027F80(v0);
@@ -396,7 +396,7 @@ static int ov5_021D1178 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static BOOL ov5_021D119C (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D119C (FieldSystem * param0)
 {
     int v0, v1;
 
@@ -412,7 +412,7 @@ static BOOL ov5_021D119C (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static BOOL ov5_021D11CC (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D11CC (FieldSystem * param0)
 {
     u32 v0;
     u32 v1;
@@ -478,7 +478,7 @@ static BOOL ov5_021D11CC (UnkStruct_0203CDB0 * param0)
     return 1;
 }
 
-void ov5_021D12D0 (UnkStruct_0203CDB0 * param0, u32 param1)
+void ov5_021D12D0 (FieldSystem * param0, u32 param1)
 {
     u32 v0;
     UnkStruct_0203A790 * v1;
@@ -510,7 +510,7 @@ void ov5_021D12D0 (UnkStruct_0203CDB0 * param0, u32 param1)
     }
 }
 
-static void ov5_021D134C (UnkStruct_0203CDB0 * param0, u8 param1)
+static void ov5_021D134C (FieldSystem * param0, u8 param1)
 {
     if (sub_020509A4(param0) == 0) {
         sub_020559DC(param0);
@@ -544,7 +544,7 @@ static void ov5_021D134C (UnkStruct_0203CDB0 * param0, u8 param1)
     }
 }
 
-static void ov5_021D13B4 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D13B4 (FieldSystem * param0)
 {
     UnkStruct_020556C4 * v0;
     int v1, v2, v3;
@@ -724,7 +724,7 @@ void ov5_021D15E8 (void)
     sub_0201F8B4();
 }
 
-static void ov5_021D15F4 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D15F4 (FieldSystem * param0)
 {
     MtxFx44 v0, v1;
 
@@ -777,7 +777,7 @@ static void ov5_021D15F4 (UnkStruct_0203CDB0 * param0)
     sub_020241BC(GX_SORTMODE_AUTO, Unk_02100844);
 }
 
-void ov5_021D16F4 (UnkStruct_0203CDB0 * param0, BOOL param1)
+void ov5_021D16F4 (FieldSystem * param0, BOOL param1)
 {
     if (param1 == 1) {
         param0->unk_C0 |= 4;
@@ -786,7 +786,7 @@ void ov5_021D16F4 (UnkStruct_0203CDB0 * param0, BOOL param1)
     }
 }
 
-void ov5_021D1718 (UnkStruct_0203CDB0 * param0, BOOL param1)
+void ov5_021D1718 (FieldSystem * param0, BOOL param1)
 {
     if (param1 == 1) {
         param0->unk_C0 |= 1;
@@ -795,7 +795,7 @@ void ov5_021D1718 (UnkStruct_0203CDB0 * param0, BOOL param1)
     }
 }
 
-static void ov5_021D173C (UnkStruct_0203CDB0 * param0)
+static void ov5_021D173C (FieldSystem * param0)
 {
     param0->unk_C0 = (8 | 1 | 2 | 4);
 }
@@ -813,7 +813,7 @@ void ov5_021D1744 (const u8 param0)
     }
 }
 
-static void ov5_021D1790 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D1790 (FieldSystem * param0)
 {
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     G3_SwapBuffers(GX_SORTMODE_AUTO, Unk_02100844);
@@ -834,7 +834,7 @@ static void ov5_021D1790 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static void ov5_021D17EC (UnkStruct_0203CDB0 * param0)
+static void ov5_021D17EC (FieldSystem * param0)
 {
     param0->unk_28 = ov5_021E9084(param0->unk_2C, param0->unk_30, param0->unk_50, param0->unk_60);
 
@@ -857,7 +857,7 @@ static void ov5_021D17EC (UnkStruct_0203CDB0 * param0)
     ov5_021E9150(param0->unk_28, param0->unk_1C->unk_08, param0->unk_1C->unk_0C);
 }
 
-static void ov5_021D1878 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D1878 (FieldSystem * param0)
 {
     param0->unk_40 = ov5_021DF440(param0, 34, 4);
 
@@ -920,7 +920,7 @@ static void ov5_021D1878 (UnkStruct_0203CDB0 * param0)
     param0->unk_04->unk_18 = sub_02055C8C(param0, 4);
 }
 
-static void ov5_021D1968 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D1968 (FieldSystem * param0)
 {
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
     GXLayers_TurnBothDispOn();
@@ -992,7 +992,7 @@ static void ov5_021D1A70 (UnkStruct_ov5_021D1A68 * param0)
     Heap_FreeToHeap(param0);
 }
 
-static BOOL ov5_021D1A78 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D1A78 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0 = sub_02027860(sub_0203D174(param0));
     int v1 = sub_02027F80(v0);
diff --git a/src/overlay005/ov5_021D1A94.c b/src/overlay005/ov5_021D1A94.c
index 91c0c6192a..b9933946be 100644
--- a/src/overlay005/ov5_021D1A94.c
+++ b/src/overlay005/ov5_021D1A94.c
@@ -17,7 +17,7 @@
 #include "overlay005/ov5_021D1A94.h"
 
 struct UnkStruct_ov5_021D1A94_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     int unk_04;
     int unk_08;
     UnkStruct_ov5_021D1BEC * unk_0C;
@@ -32,7 +32,7 @@ struct UnkStruct_ov5_021D1BEC_t {
     void * unk_10;
 };
 
-UnkStruct_ov5_021D1A94 * ov5_021D1A94 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+UnkStruct_ov5_021D1A94 * ov5_021D1A94 (FieldSystem * param0, int param1, int param2)
 {
     UnkStruct_ov5_021D1A94 * v0;
     u32 v1;
diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c
index 149c3188db..17d0a0574a 100644
--- a/src/overlay005/ov5_021D1C30.c
+++ b/src/overlay005/ov5_021D1C30.c
@@ -72,29 +72,29 @@
 #include "overlay009/ov9_02249960.h"
 #include "overlay023/ov23_02241F74.h"
 
-static BOOL ov5_021D2504(UnkStruct_0203CDB0 * param0, const UnkStruct_ov5_021D1CAC * param1);
-static u16 ov5_021D271C(UnkStruct_0203CDB0 * param0, u8 param1);
-static BOOL ov5_021D249C(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D2884(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D29A0(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D29D8(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const u8 param3);
-static BOOL ov5_021D2ABC(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D2B94(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D2C14(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D2B08(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D2B14(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D20DC(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D2B20(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D2B2C(UnkStruct_0203CDB0 * param0);
-static void ov5_021D2B54(UnkStruct_0203CDB0 * param0);
-static void ov5_021D2C7C(const UnkStruct_0203CDB0 * param0, int * param1, int * param2);
-static void ov5_021D2C98(const UnkStruct_0203CDB0 * param0, int * param1, int * param2);
-static void ov5_021D2CB4(const UnkStruct_0203CDB0 * param0, int param1, int * param2, int * param3);
-static u8 ov5_021D2CFC(const UnkStruct_0203CDB0 * param0);
-static u8 ov5_021D2D18(const UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D2D34(const UnkStruct_0203CDB0 * param0, int param1, int param2, UnkStruct_02049FA8 * param3);
-static void ov5_021D2E14(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D2EA4(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1);
+static BOOL ov5_021D2504(FieldSystem * param0, const UnkStruct_ov5_021D1CAC * param1);
+static u16 ov5_021D271C(FieldSystem * param0, u8 param1);
+static BOOL ov5_021D249C(FieldSystem * param0);
+static BOOL ov5_021D2884(FieldSystem * param0);
+static BOOL ov5_021D29A0(FieldSystem * param0);
+static BOOL ov5_021D29D8(FieldSystem * param0, const int param1, const int param2, const u8 param3);
+static BOOL ov5_021D2ABC(FieldSystem * param0);
+static BOOL ov5_021D2B94(FieldSystem * param0);
+static BOOL ov5_021D2C14(FieldSystem * param0);
+static BOOL ov5_021D2B08(FieldSystem * param0);
+static BOOL ov5_021D2B14(FieldSystem * param0);
+static BOOL ov5_021D20DC(FieldSystem * param0);
+static BOOL ov5_021D2B20(FieldSystem * param0);
+static BOOL ov5_021D2B2C(FieldSystem * param0);
+static void ov5_021D2B54(FieldSystem * param0);
+static void ov5_021D2C7C(const FieldSystem * param0, int * param1, int * param2);
+static void ov5_021D2C98(const FieldSystem * param0, int * param1, int * param2);
+static void ov5_021D2CB4(const FieldSystem * param0, int param1, int * param2, int * param3);
+static u8 ov5_021D2CFC(const FieldSystem * param0);
+static u8 ov5_021D2D18(const FieldSystem * param0);
+static BOOL ov5_021D2D34(const FieldSystem * param0, int param1, int param2, UnkStruct_02049FA8 * param3);
+static void ov5_021D2E14(FieldSystem * param0);
+static BOOL ov5_021D2EA4(FieldSystem * param0, UnkStruct_02061AB4 ** param1);
 static int ov5_021D2274(void);
 
 static void ov5_021D1C30 (UnkStruct_ov5_021D1CAC * param0)
@@ -115,7 +115,7 @@ static void ov5_021D1C30 (UnkStruct_ov5_021D1CAC * param0)
     param0->unk_03 = -1;
 }
 
-void ov5_021D1CAC (UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1, u16 param2, u16 param3)
+void ov5_021D1CAC (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1, u16 param2, u16 param3)
 {
     int v0;
     int v1;
@@ -173,7 +173,7 @@ void ov5_021D1CAC (UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1,
     param0->unk_02 = sub_02061308(param1->unk_3C, param2, param3);
 }
 
-int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1)
+int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 {
     if ((param0->unk_00_11 == 0) && (sub_0203F5C0(param1, 1) == 1)) {
         return 1;
@@ -359,7 +359,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * pa
     return 0;
 }
 
-static BOOL ov5_021D20DC (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D20DC (FieldSystem * param0)
 {
     UnkStruct_02061AB4 * v0;
     int v1;
@@ -379,7 +379,7 @@ static BOOL ov5_021D20DC (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-BOOL ov5_021D213C (UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1)
+BOOL ov5_021D213C (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 {
     u8 v0 = 0;
 
@@ -410,7 +410,7 @@ BOOL ov5_021D213C (UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1)
     return 0;
 }
 
-BOOL ov5_021D219C (UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1)
+BOOL ov5_021D219C (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 {
     if (param0->unk_00_5) {
         if ((param0->unk_03 == 1) && sub_0205DB1C(ov5_021D2CFC(param1))) {
@@ -474,7 +474,7 @@ static int ov5_021D2274 (void)
     return v1 >= 1;
 }
 
-BOOL ov5_021D2298 (const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1)
+BOOL ov5_021D2298 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 {
     if (sub_020318EC() & 0xfe) {
         if (ov5_021D2274() && (sub_02035E18() > 1)) {
@@ -521,7 +521,7 @@ BOOL ov5_021D2298 (const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * p
     return 0;
 }
 
-int ov5_021D2368 (const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1)
+int ov5_021D2368 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 {
     if ((param0->unk_00_11 == 0) && (sub_0203F5C0(param1, 1) == 1)) {
         return 1;
@@ -593,7 +593,7 @@ int ov5_021D2368 (const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * pa
     return 0;
 }
 
-static BOOL ov5_021D249C (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D249C (FieldSystem * param0)
 {
     int v0, v1;
 
@@ -615,7 +615,7 @@ static BOOL ov5_021D249C (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static BOOL ov5_021D2504 (UnkStruct_0203CDB0 * param0, const UnkStruct_ov5_021D1CAC * param1)
+static BOOL ov5_021D2504 (FieldSystem * param0, const UnkStruct_ov5_021D1CAC * param1)
 {
     int v0;
     int v1;
@@ -708,7 +708,7 @@ static BOOL ov5_021D2504 (UnkStruct_0203CDB0 * param0, const UnkStruct_ov5_021D1
     return 1;
 }
 
-u16 ov5_021D271C (UnkStruct_0203CDB0 * param0, u8 param1)
+u16 ov5_021D271C (FieldSystem * param0, u8 param1)
 {
     int v0 = sub_0205EA78(param0->unk_3C);
 
@@ -760,7 +760,7 @@ u16 ov5_021D271C (UnkStruct_0203CDB0 * param0, u8 param1)
     return 0xffff;
 }
 
-static BOOL ov5_021D2884 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D2884 (FieldSystem * param0)
 {
     u8 v0;
     int v1, v2;
@@ -833,7 +833,7 @@ static BOOL ov5_021D2884 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static BOOL ov5_021D29A0 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D29A0 (FieldSystem * param0)
 {
     u16 v0;
 
@@ -847,7 +847,7 @@ static BOOL ov5_021D29A0 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static BOOL ov5_021D29D8 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const u8 param3)
+static BOOL ov5_021D29D8 (FieldSystem * param0, const int param1, const int param2, const u8 param3)
 {
     UnkStruct_02049FA8 v0;
 
@@ -894,7 +894,7 @@ static BOOL ov5_021D29D8 (UnkStruct_0203CDB0 * param0, const int param1, const i
     return 0;
 }
 
-static BOOL ov5_021D2ABC (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D2ABC (FieldSystem * param0)
 {
     Party * v0 = Party_GetFromSavedata(param0->unk_0C);
     UnkStruct_02026310 * v1 = sub_02026310(param0->unk_0C);
@@ -912,24 +912,24 @@ static BOOL ov5_021D2ABC (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static BOOL ov5_021D2B08 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D2B08 (FieldSystem * param0)
 {
     ov5_021DBB94(param0);
     return 0;
 }
 
-static BOOL ov5_021D2B14 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D2B14 (FieldSystem * param0)
 {
     RadarChargeStep(param0);
     return 0;
 }
 
-static BOOL ov5_021D2B20 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D2B20 (FieldSystem * param0)
 {
     return ov6_02246BF4(param0->unk_0C, param0);
 }
 
-static BOOL ov5_021D2B2C (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D2B2C (FieldSystem * param0)
 {
     u16 v0;
     UnkStruct_020507E4 * v1;
@@ -950,7 +950,7 @@ static BOOL ov5_021D2B2C (UnkStruct_0203CDB0 * param0)
     return v2;
 }
 
-static void ov5_021D2B54 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D2B54 (FieldSystem * param0)
 {
     int v0, v1;
     Pokemon * v2;
@@ -965,7 +965,7 @@ static void ov5_021D2B54 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static BOOL ov5_021D2B94 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D2B94 (FieldSystem * param0)
 {
     Party * v0 = Party_GetFromSavedata(param0->unk_0C);
     u16 * v1 = sub_0203A78C(sub_0203A790(param0->unk_0C));
@@ -992,7 +992,7 @@ static BOOL ov5_021D2B94 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static BOOL ov5_021D2C14 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D2C14 (FieldSystem * param0)
 {
     u16 * v0;
     u16 * v1;
@@ -1019,13 +1019,13 @@ static BOOL ov5_021D2C14 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static void ov5_021D2C7C (const UnkStruct_0203CDB0 * param0, int * param1, int * param2)
+static void ov5_021D2C7C (const FieldSystem * param0, int * param1, int * param2)
 {
     *param1 = sub_0205EABC(param0->unk_3C);
     *param2 = sub_0205EAC8(param0->unk_3C);
 }
 
-static void ov5_021D2C98 (const UnkStruct_0203CDB0 * param0, int * param1, int * param2)
+static void ov5_021D2C98 (const FieldSystem * param0, int * param1, int * param2)
 {
     int v0;
 
@@ -1033,7 +1033,7 @@ static void ov5_021D2C98 (const UnkStruct_0203CDB0 * param0, int * param1, int *
     ov5_021D2CB4(param0, v0, param1, param2);
 }
 
-static void ov5_021D2CB4 (const UnkStruct_0203CDB0 * param0, int param1, int * param2, int * param3)
+static void ov5_021D2CB4 (const FieldSystem * param0, int param1, int * param2, int * param3)
 {
     ov5_021D2C7C(param0, param2, param3);
 
@@ -1055,7 +1055,7 @@ static void ov5_021D2CB4 (const UnkStruct_0203CDB0 * param0, int param1, int * p
     }
 }
 
-static u8 ov5_021D2CFC (const UnkStruct_0203CDB0 * param0)
+static u8 ov5_021D2CFC (const FieldSystem * param0)
 {
     int v0, v1;
 
@@ -1063,7 +1063,7 @@ static u8 ov5_021D2CFC (const UnkStruct_0203CDB0 * param0)
     return sub_02054F94(param0, v0, v1);
 }
 
-static u8 ov5_021D2D18 (const UnkStruct_0203CDB0 * param0)
+static u8 ov5_021D2D18 (const FieldSystem * param0)
 {
     int v0, v1;
 
@@ -1071,7 +1071,7 @@ static u8 ov5_021D2D18 (const UnkStruct_0203CDB0 * param0)
     return sub_02054F94(param0, v0, v1);
 }
 
-static BOOL ov5_021D2D34 (const UnkStruct_0203CDB0 * param0, int param1, int param2, UnkStruct_02049FA8 * param3)
+static BOOL ov5_021D2D34 (const FieldSystem * param0, int param1, int param2, UnkStruct_02049FA8 * param3)
 {
     const UnkStruct_0203A55C * v0;
     int v1;
@@ -1103,7 +1103,7 @@ static BOOL ov5_021D2D34 (const UnkStruct_0203CDB0 * param0, int param1, int par
     return 1;
 }
 
-static void ov5_021D2DCC (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const int param3)
+static void ov5_021D2DCC (FieldSystem * param0, const int param1, const int param2, const int param3)
 {
     UnkStruct_0203A790 * v0 = sub_0203A790(param0->unk_0C);
     UnkStruct_02049FA8 * v1 = sub_0203A72C(v0);
@@ -1121,7 +1121,7 @@ static void ov5_021D2DCC (UnkStruct_0203CDB0 * param0, const int param1, const i
     v1->unk_04 = -1;
 }
 
-static void ov5_021D2E14 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D2E14 (FieldSystem * param0)
 {
     int v0, v1;
     UnkStruct_02049FA8 v2;
@@ -1143,7 +1143,7 @@ static void ov5_021D2E14 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static BOOL ov5_021D2EA4 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1)
+static BOOL ov5_021D2EA4 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
 {
     int v0 = 0;
     int v1, v2, v3, v4, v5, v6;
diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c
index 5343b776ea..21ec458fa4 100644
--- a/src/overlay005/ov5_021D431C.c
+++ b/src/overlay005/ov5_021D431C.c
@@ -70,7 +70,7 @@ void ov5_021D4334 (const int param0, const int param1, UnkStruct_ov5_021D432C *
     param2->unk_18 = param1;
 }
 
-BOOL ov5_021D433C (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1)
+BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -236,7 +236,7 @@ BOOL ov5_021D433C (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1)
     return 0;
 }
 
-BOOL ov5_021D453C (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1)
+BOOL ov5_021D453C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -491,7 +491,7 @@ static u8 ov5_021D481C (const int param0)
     return 0;
 }
 
-BOOL ov5_021D4858 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1, const u8 param2)
+BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const u8 param2)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -607,7 +607,7 @@ BOOL ov5_021D4858 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1,
     return 0;
 }
 
-BOOL ov5_021D4A24 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1, const u8 param2)
+BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const u8 param2)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -711,7 +711,7 @@ BOOL ov5_021D4A24 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1,
 static BOOL ov5_021D4BC8 (UnkStruct_020508D4 * param0)
 {
     BOOL v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     u8 * v2 = sub_02050A64(param0);
 
     v0 = ov5_021D42F0(v1->unk_54, *v2);
@@ -724,7 +724,7 @@ static BOOL ov5_021D4BC8 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void ov5_021D4BF4 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const u8 param3)
+void ov5_021D4BF4 (FieldSystem * param0, const int param1, const int param2, const u8 param3)
 {
     BOOL v0;
     UnkStruct_ov5_021E1890 * v1;
@@ -770,7 +770,7 @@ void ov5_021D4BF4 (UnkStruct_0203CDB0 * param0, const int param1, const int para
     }
 }
 
-void ov5_021D4C88 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov5_021D4C88 (FieldSystem * param0, const u8 param1)
 {
     int v0;
     int v1;
@@ -800,7 +800,7 @@ void ov5_021D4C88 (UnkStruct_0203CDB0 * param0, const u8 param1)
     ov5_021D4278(param0->unk_54, param1, v2, v1);
 }
 
-void ov5_021D4CEC (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov5_021D4CEC (FieldSystem * param0, const u8 param1)
 {
     int v0;
     int v1;
@@ -830,7 +830,7 @@ void ov5_021D4CEC (UnkStruct_0203CDB0 * param0, const u8 param1)
     ov5_021D4278(param0->unk_54, param1, v2, v1);
 }
 
-void ov5_021D4D48 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov5_021D4D48 (FieldSystem * param0, const u8 param1)
 {
     u8 * v0 = Heap_AllocFromHeapAtEnd(4, sizeof(u8));
 
@@ -838,12 +838,12 @@ void ov5_021D4D48 (UnkStruct_0203CDB0 * param0, const u8 param1)
     sub_02050944(param0->unk_10, ov5_021D4BC8, v0);
 }
 
-void ov5_021D4D68 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov5_021D4D68 (FieldSystem * param0, const u8 param1)
 {
     ov5_021D42B0(param0->unk_50, param0->unk_54, param1);
 }
 
-void ov5_021D4D78 (const int param0, const int param1, const int param2, UnkStruct_0203CDB0 * param3)
+void ov5_021D4D78 (const int param0, const int param1, const int param2, FieldSystem * param3)
 {
     BOOL v0;
     UnkStruct_ov5_021E1890 * v1;
@@ -887,7 +887,7 @@ UnkStruct_ov5_021D4E00 * ov5_021D4E00 (void)
 BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov5_021D4E00 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -944,7 +944,7 @@ BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
 
 BOOL ov5_021D4F14 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov5_021D4E00 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -983,7 +983,7 @@ BOOL ov5_021D4F14 (UnkStruct_020508D4 * param0)
 
 BOOL ov5_021D4FA0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov5_021D4E00 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -1017,7 +1017,7 @@ BOOL ov5_021D4FA0 (UnkStruct_020508D4 * param0)
 BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov5_021D4E00 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -1098,7 +1098,7 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
 BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov5_021D4E00 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
diff --git a/src/overlay005/ov5_021D5B40.c b/src/overlay005/ov5_021D5B40.c
index 05efcf60fb..bc8c7a601a 100644
--- a/src/overlay005/ov5_021D5B40.c
+++ b/src/overlay005/ov5_021D5B40.c
@@ -201,7 +201,7 @@ static const UnkStruct_ov5_021F8AE4 Unk_ov5_021F8AE4[] = {
     },
 };
 
-void ov5_021D5B40 (const VecFx32 * param0, UnkStruct_0203CDB0 * param1, const int param2, const BOOL param3)
+void ov5_021D5B40 (const VecFx32 * param0, FieldSystem * param1, const int param2, const BOOL param3)
 {
     const VecFx32 * v0 = param0;
     const UnkStruct_ov5_021F8AE4 * v1 = &Unk_ov5_021F8AE4[param2];
@@ -219,7 +219,7 @@ void ov5_021D5B40 (const VecFx32 * param0, UnkStruct_0203CDB0 * param1, const in
     }
 }
 
-void ov5_021D5BA8 (UnkStruct_0203CDB0 * param0)
+void ov5_021D5BA8 (FieldSystem * param0)
 {
     sub_020203E0();
     sub_02020390(param0->unk_24);
diff --git a/src/overlay005/ov5_021D5BC0.c b/src/overlay005/ov5_021D5BC0.c
index 34aa3f89ba..e0fbe5a502 100644
--- a/src/overlay005/ov5_021D5BC0.c
+++ b/src/overlay005/ov5_021D5BC0.c
@@ -12,22 +12,22 @@
 FS_EXTERN_OVERLAY(overlay56);
 
 typedef struct {
-    void (* unk_00)(UnkStruct_0203CDB0 *);
-    BOOL (* unk_04)(UnkStruct_0203CDB0 *);
-    void (* unk_08)(UnkStruct_0203CDB0 *);
-    BOOL (* unk_0C)(UnkStruct_0203CDB0 *);
+    void (* unk_00)(FieldSystem *);
+    BOOL (* unk_04)(FieldSystem *);
+    void (* unk_08)(FieldSystem *);
+    BOOL (* unk_0C)(FieldSystem *);
 } UnkStruct_ov5_021F8C7C;
 
 
-static void ov5_021D5C4C(UnkStruct_0203CDB0 * param0);
-static void ov5_021D5C54(UnkStruct_0203CDB0 * param0);
-static void ov5_021D5C5C(UnkStruct_0203CDB0 * param0);
-static void ov5_021D5C78(UnkStruct_0203CDB0 * param0);
-static void ov5_021D5C80(UnkStruct_0203CDB0 * param0);
-static void ov5_021D5C88(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D5CA0(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D5CAC(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021D5CA8(UnkStruct_0203CDB0 * param0);
+static void ov5_021D5C4C(FieldSystem * param0);
+static void ov5_021D5C54(FieldSystem * param0);
+static void ov5_021D5C5C(FieldSystem * param0);
+static void ov5_021D5C78(FieldSystem * param0);
+static void ov5_021D5C80(FieldSystem * param0);
+static void ov5_021D5C88(FieldSystem * param0);
+static BOOL ov5_021D5CA0(FieldSystem * param0);
+static BOOL ov5_021D5CAC(FieldSystem * param0);
+static BOOL ov5_021D5CA8(FieldSystem * param0);
 
 static const UnkStruct_ov5_021F8C7C Unk_ov5_021F8C7C[] = {
     {ov5_021D5C4C, NULL, ov5_021D5C78, ov5_021D5CA0},
@@ -36,7 +36,7 @@ static const UnkStruct_ov5_021F8C7C Unk_ov5_021F8C7C[] = {
     {ov5_021EA830, NULL, ov5_021EA848, ov5_021EA854}
 };
 
-static int ov5_021D5BC0 (UnkStruct_0203CDB0 * param0)
+static int ov5_021D5BC0 (FieldSystem * param0)
 {
     int v0 = param0->unk_18;
 
@@ -46,14 +46,14 @@ static int ov5_021D5BC0 (UnkStruct_0203CDB0 * param0)
     return v0 - 1;
 }
 
-void ov5_021D5BD8 (UnkStruct_0203CDB0 * param0)
+void ov5_021D5BD8 (FieldSystem * param0)
 {
     Unk_ov5_021F8C7C[ov5_021D5BC0(param0)].unk_00(param0);
 }
 
-BOOL ov5_021D5BF4 (UnkStruct_0203CDB0 * param0)
+BOOL ov5_021D5BF4 (FieldSystem * param0)
 {
-    BOOL (* v0)(UnkStruct_0203CDB0 *);
+    BOOL (* v0)(FieldSystem *);
     v0 = Unk_ov5_021F8C7C[ov5_021D5BC0(param0)].unk_04;
 
     if (v0 == NULL) {
@@ -63,59 +63,59 @@ BOOL ov5_021D5BF4 (UnkStruct_0203CDB0 * param0)
     return v0(param0);
 }
 
-void ov5_021D5C14 (UnkStruct_0203CDB0 * param0)
+void ov5_021D5C14 (FieldSystem * param0)
 {
     Unk_ov5_021F8C7C[ov5_021D5BC0(param0)].unk_08(param0);
 }
 
-BOOL ov5_021D5C30 (UnkStruct_0203CDB0 * param0)
+BOOL ov5_021D5C30 (FieldSystem * param0)
 {
     return Unk_ov5_021F8C7C[ov5_021D5BC0(param0)].unk_0C(param0);
 }
 
-static void ov5_021D5C4C (UnkStruct_0203CDB0 * param0)
+static void ov5_021D5C4C (FieldSystem * param0)
 {
     ov5_021EA728(param0);
 }
 
-static void ov5_021D5C54 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D5C54 (FieldSystem * param0)
 {
     sub_0205A0BC();
 }
 
-static void ov5_021D5C5C (UnkStruct_0203CDB0 * param0)
+static void ov5_021D5C5C (FieldSystem * param0)
 {
     Overlay_LoadByID(FS_OVERLAY_ID(overlay56), 2);
     param0->unk_84 = ov56_02256410(param0);
 }
 
-static void ov5_021D5C78 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D5C78 (FieldSystem * param0)
 {
     ov5_021EA790(param0);
 }
 
-static void ov5_021D5C80 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D5C80 (FieldSystem * param0)
 {
     sub_0205A0A0();
 }
 
-static void ov5_021D5C88 (UnkStruct_0203CDB0 * param0)
+static void ov5_021D5C88 (FieldSystem * param0)
 {
     ov56_02256468(param0->unk_84);
     Overlay_UnloadByID(FS_OVERLAY_ID(overlay56));
 }
 
-static BOOL ov5_021D5CA0 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D5CA0 (FieldSystem * param0)
 {
     return ov5_021EA7CC(param0);
 }
 
-static BOOL ov5_021D5CA8 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D5CA8 (FieldSystem * param0)
 {
     return 1;
 }
 
-static BOOL ov5_021D5CAC (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021D5CAC (FieldSystem * param0)
 {
     return 1;
 }
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index d4d2c6be7c..5ca84b439f 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -126,7 +126,7 @@ typedef struct UnkStruct_ov5_021D6594_t {
     UnkStruct_ov5_021D69B8 * unk_00;
     const UnkStruct_ov5_021F8D90 * unk_04;
     UnkStruct_ov5_021D61D0 unk_08;
-    UnkStruct_0203CDB0 * unk_140;
+    FieldSystem * unk_140;
     NARC * unk_144;
 } UnkStruct_ov5_021D6594;
 
@@ -380,7 +380,7 @@ static void ov5_021DB500(UnkStruct_ov5_021DB614 * param0);
 static void ov5_021DB7CC(UnkStruct_ov5_021DB614 * param0);
 static void ov5_021DB588(fx32 param0, int param1, int param2, int param3, int * param4, int * param5);
 
-UnkStruct_ov5_021D5EF8 * ov5_021D5EB8 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D5EF8 * ov5_021D5EB8 (FieldSystem * param0)
 {
     UnkStruct_ov5_021D5EF8 * v0;
 
@@ -875,7 +875,7 @@ static void ov5_021D630C (GraphicElementData * param0, VecFx32 * param1)
     sub_02021C50(param0, param1);
 }
 
-UnkStruct_ov5_021D6594 * ov5_021D6364 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D6594 * ov5_021D6364 (FieldSystem * param0)
 {
     UnkStruct_ov5_021D6594 * v0;
 
@@ -5117,7 +5117,7 @@ static void ov5_021DB04C (SysTask * param0, void * param1)
     UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1;
     UnkStruct_ov5_021DB04C * v1;
     UnkStruct_ov5_021D6594 * v2 = v0->unk_00;
-    UnkStruct_0203CDB0 * v3 = v2->unk_140;
+    FieldSystem * v3 = v2->unk_140;
 
     v1 = (UnkStruct_ov5_021DB04C *)v0->unk_B98;
 
diff --git a/src/overlay005/ov5_021DB888.c b/src/overlay005/ov5_021DB888.c
index 29efb7e0ac..36681595d8 100644
--- a/src/overlay005/ov5_021DB888.c
+++ b/src/overlay005/ov5_021DB888.c
@@ -34,7 +34,7 @@ typedef struct {
 
 typedef struct {
     u32 unk_00;
-    UnkStruct_0203CDB0 * unk_04;
+    FieldSystem * unk_04;
     UnkStruct_020507E4 * unk_08;
     const UnkStruct_ov5_021F8E48 * unk_0C;
     UnkStruct_02061AB4 * unk_10[64];
@@ -52,8 +52,8 @@ typedef struct {
 } UnkStruct_ov5_021DBC64;
 
 void ov5_021DB888(UnkStruct_020508D4 * param0, StringFormatter * param1, u16 * param2);
-u16 ov5_021DBD98(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16 param2);
-BOOL ov5_021DBB94(UnkStruct_0203CDB0 * param0);
+u16 ov5_021DBD98(FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2);
+BOOL ov5_021DBB94(FieldSystem * param0);
 static BOOL ov5_021DBB70(u32 param0);
 static BOOL ov5_021DB8D8(UnkStruct_020508D4 * param0);
 static int ov5_021DBA58(UnkStruct_ov5_021DBA58 * param0);
@@ -65,17 +65,17 @@ static void ov5_021DBC94(SysTask * param0, void * param1);
 static BOOL ov5_021DBCD4(UnkStruct_ov5_021DBA58 * param0);
 static BOOL ov5_021DBCE0(UnkStruct_ov5_021DBA58 * param0);
 static u16 ov5_021DBD88(UnkStruct_02061AB4 * param0);
-static void ov5_021DBC08(UnkStruct_0203CDB0 * param0);
-static u16 ov5_021DBDDC(UnkStruct_0203CDB0 * param0, u16 param1);
-static u16 ov5_021DBDFC(UnkStruct_0203CDB0 * param0, u16 param1);
-static u16 ov5_021DBE48(UnkStruct_0203CDB0 * param0, u16 param1, u16 param2);
+static void ov5_021DBC08(FieldSystem * param0);
+static u16 ov5_021DBDDC(FieldSystem * param0, u16 param1);
+static u16 ov5_021DBDFC(FieldSystem * param0, u16 param1);
+static u16 ov5_021DBE48(FieldSystem * param0, u16 param1, u16 param2);
 static u16 ov5_021DBE70(u16 param0, u16 param1);
 static u16 ov5_021DBEA4(u16 param0, u16 param1);
 static BOOL ov5_021DBEB8(UnkStruct_02061AB4 * param0);
 static void ov5_021DBECC(UnkStruct_02061AB4 * param0, u16 param1);
-void ov5_021DBED4(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1);
-static BOOL ov5_021DBF20(UnkStruct_0203CDB0 * param0);
-static UnkStruct_02061AB4 * ov5_021DBF70(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, int param2);
+void ov5_021DBED4(FieldSystem * param0, UnkStruct_02061AB4 * param1);
+static BOOL ov5_021DBF20(FieldSystem * param0);
+static UnkStruct_02061AB4 * ov5_021DBF70(FieldSystem * param0, UnkStruct_02061AB4 * param1, int param2);
 
 const UnkStruct_ov5_021F8E48 Unk_ov5_021F8E48[] = {
 	{ 0xE, 0xE, 0x0, 0x0, 0x0, 0x0 },
@@ -334,7 +334,7 @@ static const UnkStruct_ov5_021F8E3C Unk_ov5_021F8E34[] = {
 void ov5_021DB888 (UnkStruct_020508D4 * param0, StringFormatter * param1, u16 * param2)
 {
     UnkStruct_ov5_021DBA58 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DBA58));
 
@@ -530,7 +530,7 @@ static BOOL ov5_021DBB70 (u32 param0)
     return 0;
 }
 
-BOOL ov5_021DBB94 (UnkStruct_0203CDB0 * param0)
+BOOL ov5_021DBB94 (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     u16 v1 = sub_0206B0E8(v0);
@@ -558,7 +558,7 @@ BOOL ov5_021DBB94 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static void ov5_021DBC08 (UnkStruct_0203CDB0 * param0)
+static void ov5_021DBC08 (FieldSystem * param0)
 {
     int v0;
     UnkStruct_02061AB4 * v1;
@@ -676,7 +676,7 @@ static u16 ov5_021DBD88 (UnkStruct_02061AB4 * param0)
     return sub_0203F254(v0);
 }
 
-u16 ov5_021DBD98 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16 param2)
+u16 ov5_021DBD98 (FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2)
 {
     u16 v0, v1, v2;
 
@@ -697,7 +697,7 @@ u16 ov5_021DBD98 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16
     return v2;
 }
 
-static u16 ov5_021DBDDC (UnkStruct_0203CDB0 * param0, u16 param1)
+static u16 ov5_021DBDDC (FieldSystem * param0, u16 param1)
 {
     int v0, v1;
     const UnkStruct_ov5_021F8E48 * v2 = Unk_ov5_021F8E48;
@@ -713,7 +713,7 @@ static u16 ov5_021DBDDC (UnkStruct_0203CDB0 * param0, u16 param1)
     return 0xff;
 }
 
-static u16 ov5_021DBDFC (UnkStruct_0203CDB0 * param0, u16 param1)
+static u16 ov5_021DBDFC (FieldSystem * param0, u16 param1)
 {
     int v0, v1;
     const UnkStruct_ov5_021F8E48 * v2 = Unk_ov5_021F8E48;
@@ -733,7 +733,7 @@ static u16 ov5_021DBDFC (UnkStruct_0203CDB0 * param0, u16 param1)
     return v1 - 1;
 }
 
-static u16 ov5_021DBE48 (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2)
+static u16 ov5_021DBE48 (FieldSystem * param0, u16 param1, u16 param2)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     u16 v1 = param2;
@@ -787,7 +787,7 @@ static void ov5_021DBECC (UnkStruct_02061AB4 * param0, u16 param1)
     return;
 }
 
-void ov5_021DBED4 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
+void ov5_021DBED4 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
 {
     UnkStruct_02061AB4 * v0;
     u32 v1;
@@ -819,7 +819,7 @@ void ov5_021DBED4 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
     return;
 }
 
-static BOOL ov5_021DBF20 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021DBF20 (FieldSystem * param0)
 {
     int v0, v1;
     UnkStruct_02061AB4 * v2;
@@ -849,7 +849,7 @@ static BOOL ov5_021DBF20 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static UnkStruct_02061AB4 * ov5_021DBF70 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, int param2)
+static UnkStruct_02061AB4 * ov5_021DBF70 (FieldSystem * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     UnkStruct_02061AB4 * v0;
     u32 v1, v2, v3, v4;
diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c
index a37754fe77..94364fb068 100644
--- a/src/overlay005/ov5_021DC018.c
+++ b/src/overlay005/ov5_021DC018.c
@@ -38,7 +38,7 @@
 #include "overlay005/ov5_021DC018.h"
 
 struct UnkStruct_ov5_021DC1A4_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     SysTask * unk_04;
     Window unk_08;
     Window * unk_18;
@@ -73,8 +73,8 @@ struct UnkStruct_ov5_021DC1A4_t {
     u16 unk_2DC;
 };
 
-static void ov5_021DC018(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9);
-UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8);
+static void ov5_021DC018(FieldSystem * param0, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9);
+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_021DCD94(UnkStruct_ov5_021DC1A4 * param0, u8 param1);
@@ -83,7 +83,7 @@ static void ov5_021DC290(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2
 static u32 ov5_021DC300(UnkStruct_ov5_021DC1A4 * param0);
 static void ov5_021DC33C(UnkStruct_ov5_021DC1A4 * param0);
 static void ov5_021DC3B0(SysTask * param0, void * param1);
-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);
@@ -98,13 +98,13 @@ static void ov5_021DCA28(UnkStruct_ov5_021DC1A4 * param0);
 static void ov5_021DCA90(UnkStruct_ov5_021DC1A4 * param0, u16 param1, u32 param2);
 static void ov5_021DCAF4(UnkStruct_ov5_021DC1A4 * param0);
 static void ov5_021DCC64(SysTask * param0, void * param1);
-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);
 static void ov5_021DCC00(UnkStruct_ov5_021DC1A4 * param0, u16 param1, u8 param2, u8 param3);
 u16 ov5_021DCCC8(int param0);
-UnkStruct_ov5_021DC1A4 * ov5_021DD250(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 * param3, StringFormatter * param4, u8 param5, u8 param6, u8 param7, u8 param8);
+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);
 
-static void ov5_021DC018 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9)
+static void ov5_021DC018 (FieldSystem * param0, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9)
 {
     int v0;
 
@@ -155,7 +155,7 @@ static void ov5_021DC018 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DC1A4 *
     return;
 }
 
-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)
 {
     UnkStruct_ov5_021DC1A4 * v0;
     int v1;
@@ -331,7 +331,7 @@ void ov5_021DC424 (UnkStruct_ov5_021DC1A4 * param0)
     return;
 }
 
-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)
 {
     return ov5_021DC150(param0, param1, param2, param3, param4, param5, param6, param7, param8);
 }
@@ -633,7 +633,7 @@ static void ov5_021DCAF4 (UnkStruct_ov5_021DC1A4 * param0)
     return;
 }
 
-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)
 {
     u8 v0;
     u32 v1, v2;
@@ -813,7 +813,7 @@ static void ov5_021DCE64 (UnkStruct_ov5_021DC1A4 * param0, u8 param1, u8 param2)
     return;
 }
 
-Window * ov5_021DCEB0 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2)
+Window * ov5_021DCEB0 (FieldSystem * param0, u8 param1, u8 param2)
 {
     Window * v0 = sub_0201A778(4, 1);
 
@@ -845,7 +845,7 @@ void ov5_021DCF58 (Window * param0)
     sub_0201A928(param0, 1);
 }
 
-void ov5_021DCF6C (UnkStruct_0203CDB0 * param0, Window * param1)
+void ov5_021DCF6C (FieldSystem * param0, Window * param1)
 {
     MessageLoader * v0;
     StringFormatter * v1;
@@ -875,7 +875,7 @@ void ov5_021DCF6C (UnkStruct_0203CDB0 * param0, Window * param1)
     sub_0201A9A4(param1);
 }
 
-Window * ov5_021DD020 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2)
+Window * ov5_021DD020 (FieldSystem * param0, u8 param1, u8 param2)
 {
     Window * v0 = sub_0201A778(4, 1);
 
@@ -894,7 +894,7 @@ void ov5_021DD084 (Window * param0)
     sub_0201A928(param0, 1);
 }
 
-void ov5_021DD098 (UnkStruct_0203CDB0 * param0, Window * param1)
+void ov5_021DD098 (FieldSystem * param0, Window * param1)
 {
     MessageLoader * v0;
     StringFormatter * v1;
@@ -924,7 +924,7 @@ void ov5_021DD098 (UnkStruct_0203CDB0 * param0, Window * param1)
     sub_0201A9A4(param1);
 }
 
-Window * ov5_021DD140 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2)
+Window * ov5_021DD140 (FieldSystem * param0, u8 param1, u8 param2)
 {
     Window * v0 = sub_0201A778(4, 1);
 
@@ -937,7 +937,7 @@ Window * ov5_021DD140 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2)
     return v0;
 }
 
-void ov5_021DD1A4 (UnkStruct_0203CDB0 * param0, Window * param1)
+void ov5_021DD1A4 (FieldSystem * param0, Window * param1)
 {
     MessageLoader * v0;
     StringFormatter * v1;
@@ -967,7 +967,7 @@ void ov5_021DD1A4 (UnkStruct_0203CDB0 * param0, Window * param1)
     sub_0201A9A4(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)
+UnkStruct_ov5_021DC1A4 * ov5_021DD250 (FieldSystem * param0, u8 param1, u8 param2, u16 * param3, StringFormatter * param4, u8 param5, u8 param6, u8 param7, u8 param8)
 {
     UnkStruct_ov5_021DC1A4 * v0;
 
diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c
index c955c2dd08..e42e8d3f5f 100644
--- a/src/overlay005/ov5_021DD42C.c
+++ b/src/overlay005/ov5_021DD42C.c
@@ -34,9 +34,9 @@ typedef struct {
 } UnkStruct_ov5_021DD648;
 
 static u8 ov5_021DD574(UnkStruct_0203E724 * param0);
-static void ov5_021DD588(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * param1);
-static void ov5_021DD5D0(UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov5_021DD648 * param2);
-static void ov5_021DD610(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * param1);
+static void ov5_021DD588(FieldSystem * param0, UnkStruct_ov5_021DD648 * param1);
+static void ov5_021DD5D0(FieldSystem * param0, StringFormatter * param1, UnkStruct_ov5_021DD648 * param2);
+static void ov5_021DD610(FieldSystem * param0, UnkStruct_ov5_021DD648 * param1);
 static void ov5_021DD648(UnkStruct_ov5_021DD648 * param0, const MessageLoader * param1, u32 param2);
 static void ov5_021DD664(UnkStruct_ov5_021DD648 * param0, u16 param1, u16 param2, u16 param3, u16 param4);
 static void ov5_021DD6B4(UnkStruct_ov5_021DD648 * param0, int param1, int param2, int param3, int param4);
@@ -114,7 +114,7 @@ static u8 ov5_021DD574 (UnkStruct_0203E724 * param0)
     return sub_02027AC0(sub_02025E44(param0->unk_34->unk_0C));
 }
 
-static void ov5_021DD588 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * param1)
+static void ov5_021DD588 (FieldSystem * param0, UnkStruct_ov5_021DD648 * param1)
 {
     param1->unk_00 = *((Strbuf **)(sub_0203F098(param0, 16)));
     param1->unk_04 = *((Strbuf **)(sub_0203F098(param0, 17)));
@@ -124,7 +124,7 @@ static void ov5_021DD588 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 *
     param1->unk_14 = sub_0203F098(param0, 3);
 }
 
-static void ov5_021DD5D0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov5_021DD648 * param2)
+static void ov5_021DD5D0 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov5_021DD648 * param2)
 {
     param2->unk_00 = *((Strbuf **)(sub_0203F098(param0, 16)));
     param2->unk_04 = *((Strbuf **)(sub_0203F098(param0, 17)));
@@ -134,7 +134,7 @@ static void ov5_021DD5D0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     param2->unk_14 = sub_0203F098(param0, 3);
 }
 
-static void ov5_021DD610 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * param1)
+static void ov5_021DD610 (FieldSystem * param0, UnkStruct_ov5_021DD648 * param1)
 {
     if (*(param1->unk_10) == 0) {
         sub_0205D8F4(param0->unk_08, param1->unk_0C, 3);
diff --git a/src/overlay005/ov5_021DD6FC.c b/src/overlay005/ov5_021DD6FC.c
index 202d5681e3..0a466e9362 100644
--- a/src/overlay005/ov5_021DD6FC.c
+++ b/src/overlay005/ov5_021DD6FC.c
@@ -304,7 +304,7 @@ void ov5_021DDA78 (UnkStruct_ov5_021DD9C8 * param0)
     }
 }
 
-void ov5_021DDAA4 (UnkStruct_0203CDB0 * param0)
+void ov5_021DDAA4 (FieldSystem * param0)
 {
     int v0;
     int v1;
diff --git a/src/overlay005/ov5_021DDAE4.c b/src/overlay005/ov5_021DDAE4.c
index af8bd784a0..c76d5fe27a 100644
--- a/src/overlay005/ov5_021DDAE4.c
+++ b/src/overlay005/ov5_021DDAE4.c
@@ -25,7 +25,7 @@ typedef struct {
 
 static BOOL ov5_021DDAE4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov5_021DDBC8 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
diff --git a/src/overlay005/ov5_021DDBE8.c b/src/overlay005/ov5_021DDBE8.c
index f75b5ad7fb..d1d79695f0 100644
--- a/src/overlay005/ov5_021DDBE8.c
+++ b/src/overlay005/ov5_021DDBE8.c
@@ -154,7 +154,7 @@ typedef struct {
     u16 unk_00;
     u8 unk_02;
     u8 unk_03;
-    UnkStruct_0203CDB0 * unk_04;
+    FieldSystem * unk_04;
     UnkStruct_02014014 * unk_08;
     void * unk_0C;
     u32 unk_10;
@@ -180,8 +180,8 @@ static void ov5_021DEE84(UnkStruct_ov5_021DED04 * param0);
 static void ov5_021DE67C(GraphicElementData * param0, void * param1, u32 param2);
 static void ov5_021DF258(SysTask * param0, void * param1);
 static void ov5_021DF28C(SysTask * param0, void * param1);
-static void ov5_021DF30C(UnkStruct_0203CDB0 * param0);
-static void ov5_021DF3D4(UnkStruct_0203CDB0 * param0);
+static void ov5_021DF30C(FieldSystem * param0);
+static void ov5_021DF3D4(FieldSystem * param0);
 static u32 ov5_021DF3E8(u32 param0, BOOL param1);
 static u32 ov5_021DF414(u32 param0, BOOL param1);
 static void include_ov5_021DDBE8_rodata(SysTask * dummy1, void * dummy2);
@@ -245,7 +245,7 @@ static const u16 Unk_ov5_021F9A2C[8][2] = {
 
 static UnkStruct_ov5_02202120 * Unk_ov5_02202120 = NULL;
 
-void ov5_021DDBE8 (int param0, UnkStruct_0203CDB0 * param1, BOOL * param2)
+void ov5_021DDBE8 (int param0, FieldSystem * param1, BOOL * param2)
 {
     SysTask * v0;
     UnkStruct_ov5_021DDC28 * v1;
@@ -1467,7 +1467,7 @@ void ov5_021DEF8C (int * param0)
     sub_0200DA3C(ov5_021DEF74, param0, 1024);
 }
 
-void ov5_021DEFA0 (UnkStruct_0203CDB0 * param0)
+void ov5_021DEFA0 (FieldSystem * param0)
 {
     GF_ASSERT(Unk_ov5_02202120 == NULL);
 
@@ -1648,7 +1648,7 @@ static void ov5_021DF28C (SysTask * param0, void * param1)
     }
 }
 
-static void ov5_021DF30C (UnkStruct_0203CDB0 * param0)
+static void ov5_021DF30C (FieldSystem * param0)
 {
     {
         UnkStruct_02099F80 v0 = {
@@ -1724,7 +1724,7 @@ static void ov5_021DF30C (UnkStruct_0203CDB0 * param0)
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 }
 
-static void ov5_021DF3D4 (UnkStruct_0203CDB0 * param0)
+static void ov5_021DF3D4 (FieldSystem * param0)
 {
     sub_02019044(param0->unk_08, 2);
     ov5_021D1434(param0->unk_08);
diff --git a/src/overlay005/ov5_021DF440.c b/src/overlay005/ov5_021DF440.c
index 1aab44e888..b4b323c1fd 100644
--- a/src/overlay005/ov5_021DF440.c
+++ b/src/overlay005/ov5_021DF440.c
@@ -47,7 +47,7 @@ typedef struct UnkStruct_ov5_021DF47C_t {
     u32 unk_04;
     u32 unk_08;
     u32 unk_0C;
-    UnkStruct_0203CDB0 * unk_10;
+    FieldSystem * unk_10;
     UnkStruct_ov5_021DF6AC * unk_14;
     NARC * unk_18;
     UnkStruct_020711EC * unk_1C;
@@ -111,7 +111,7 @@ static void ov5_021DFA88(UnkStruct_ov5_021DF47C * param0, u32 param1, UnkStruct_
 static void ov5_021DFAC0(SysTask * param0, void * param1);
 static void ov5_021DFADC(SysTask * param0, void * param1);
 
-UnkStruct_ov5_021DF47C * ov5_021DF440 (UnkStruct_0203CDB0 * param0, u32 param1, u32 param2)
+UnkStruct_ov5_021DF47C * ov5_021DF440 (FieldSystem * param0, u32 param1, u32 param2)
 {
     UnkStruct_ov5_021DF47C * v0;
 
@@ -220,14 +220,14 @@ void * ov5_021DF55C (UnkStruct_ov5_021DF47C * param0, u32 param1)
     return v0->unk_04;
 }
 
-UnkStruct_0203CDB0 * ov5_021DF574 (const UnkStruct_ov5_021DF47C * param0)
+FieldSystem * ov5_021DF574 (const UnkStruct_ov5_021DF47C * param0)
 {
     return param0->unk_10;
 }
 
 UnkStruct_ov5_021DF47C * ov5_021DF578 (const UnkStruct_02061AB4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+    FieldSystem * v0 = sub_02062C00(param0);
     return (UnkStruct_ov5_021DF47C *)v0->unk_40;
 }
 
diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c
index 2b6140c0cb..37bbfb950c 100644
--- a/src/overlay005/ov5_021DFB54.c
+++ b/src/overlay005/ov5_021DFB54.c
@@ -56,7 +56,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     UnkStruct_0205E884 * unk_0C;
     UnkStruct_02061AB4 * unk_10;
     UnkStruct_ov9_0224F6EC * unk_14;
@@ -67,7 +67,7 @@ typedef struct {
     int unk_04;
     int unk_08;
     UnkStruct_ov5_021E1050 unk_0C;
-    UnkStruct_0203CDB0 * unk_1C;
+    FieldSystem * unk_1C;
     UnkStruct_0205E884 * unk_20;
     UnkStruct_02061AB4 * unk_24;
     UnkStruct_ov101_021D5D90 * unk_28;
@@ -76,7 +76,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     UnkStruct_0205E884 * unk_0C;
     UnkStruct_02061AB4 * unk_10;
     UnkStruct_ov101_021D5D90 * unk_14;
@@ -86,7 +86,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     int unk_08;
-    UnkStruct_0203CDB0 * unk_0C;
+    FieldSystem * unk_0C;
     UnkStruct_0205E884 * unk_10;
     UnkStruct_02061AB4 * unk_14;
     UnkStruct_ov101_021D5D90 * unk_18;
@@ -104,7 +104,7 @@ typedef struct {
     fx32 unk_18;
     VecFx32 unk_1C;
     VecFx32 unk_28;
-    UnkStruct_0203CDB0 * unk_34;
+    FieldSystem * unk_34;
     UnkStruct_0205E884 * unk_38;
     UnkStruct_02061AB4 * unk_3C;
     UnkStruct_ov5_021E1050 unk_40;
@@ -114,12 +114,12 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     UnkStruct_0205E884 * unk_0C;
 } UnkStruct_ov5_021E0534;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_0205E884 * unk_04;
     UnkStruct_02061AB4 * unk_08;
     int unk_0C;
@@ -130,43 +130,43 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     UnkStruct_0205E884 * unk_0C;
 } UnkStruct_ov5_021E0FF0;
 
-static int ov5_021DFE68(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static int ov5_021DFEF4(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static int ov5_021DFF1C(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static void ov5_021DFF88(int param0, UnkStruct_0203CDB0 * param1, UnkStruct_0205E884 * param2, UnkStruct_02061AB4 * param3);
+static int ov5_021DFE68(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
+static int ov5_021DFEF4(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
+static int ov5_021DFF1C(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
+static void ov5_021DFF88(int param0, FieldSystem * param1, UnkStruct_0205E884 * param2, UnkStruct_02061AB4 * param3);
 static BOOL ov5_021DFFBC(UnkStruct_020508D4 * param0);
-static void ov5_021E00B0(UnkStruct_0203CDB0 * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
+static void ov5_021E00B0(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
 static BOOL ov5_021E0160(UnkStruct_020508D4 * param0);
-static int ov5_021E032C(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static void ov5_021E0390(int param0, UnkStruct_0203CDB0 * param1, UnkStruct_0205E884 * param2);
+static int ov5_021E032C(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
+static void ov5_021E0390(int param0, FieldSystem * param1, UnkStruct_0205E884 * param2);
 static BOOL ov5_021E03C8(UnkStruct_020508D4 * param0);
-static int ov5_021E04A8(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static int ov5_021E04EC(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static void ov5_021E0534(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1);
+static int ov5_021E04A8(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
+static int ov5_021E04EC(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
+static void ov5_021E0534(FieldSystem * param0, UnkStruct_0205E884 * param1);
 static BOOL ov5_021E0560(UnkStruct_020508D4 * param0);
-static int ov5_021E067C(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2);
-static int ov5_021E06A8(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1);
-static void ov5_021E06F8(UnkStruct_0203CDB0 * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
+static int ov5_021E067C(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2);
+static int ov5_021E06A8(FieldSystem * param0, UnkStruct_0205E884 * param1);
+static void ov5_021E06F8(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
 static BOOL ov5_021E07A0(UnkStruct_020508D4 * param0);
-static UnkStruct_ov5_021F9B10 * ov5_021E0948(UnkStruct_0203CDB0 * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
+static UnkStruct_ov5_021F9B10 * ov5_021E0948(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
 static BOOL ov5_021E09D4(UnkStruct_020508D4 * param0);
-static SysTask * ov5_021E0F54(UnkStruct_0203CDB0 * param0, u32 param1);
+static SysTask * ov5_021E0F54(FieldSystem * param0, u32 param1);
 static void ov5_021E0FC0(SysTask * param0);
 static void ov5_021E0FF0(SysTask * param0, void * param1);
-static void ov5_021E1028(UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov5_021E1050 * param2);
-static void ov5_021E103C(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021E1050 * param1);
+static void ov5_021E1028(FieldSystem * param0, Pokemon * param1, UnkStruct_ov5_021E1050 * param2);
+static void ov5_021E103C(FieldSystem * param0, UnkStruct_ov5_021E1050 * param1);
 static int ov5_021E1050(UnkStruct_ov5_021E1050 * param0);
 static void ov5_021E106C(UnkStruct_0205E884 * param0, int param1);
 static void ov5_021E10C0(void * param0, const UnkStruct_020216E0 * param1);
 static UnkStruct_02061AB4 * ov5_021E10D4(UnkStruct_0205E884 * param0, int param1);
 static void * ov5_021E1110(int param0);
 static void ov5_021E1134(void * param0);
-static Pokemon * ov5_021E1140(UnkStruct_0203CDB0 * param0, int param1);
-static void ov5_021E0DE0(UnkStruct_0203CDB0 * param0);
+static Pokemon * ov5_021E1140(FieldSystem * param0, int param1);
+static void ov5_021E0DE0(FieldSystem * param0);
 static BOOL ov5_021E0E10(UnkStruct_020508D4 * param0);
 
 static void(*const Unk_ov5_021F9B74[10])(UnkStruct_0205E884 *);
@@ -204,7 +204,7 @@ static void ov5_021DFB90 (UnkStruct_0205E884 * param0)
         v1 = 0x18;
     } else {
         UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0);
-        UnkStruct_0203CDB0 * v3 = sub_02062C00(v2);
+        FieldSystem * v3 = sub_02062C00(v2);
 
         if (sub_02071CB4(v3, 2) == 1) {
             v1 = 0x1c;
@@ -255,7 +255,7 @@ static void ov5_021DFC3C (UnkStruct_0205E884 * param0)
 {
     int v0, v1;
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0);
-    UnkStruct_0203CDB0 * v3 = sub_02062C00(v2);
+    FieldSystem * v3 = sub_02062C00(v2);
     int v4 = sub_0205F108(param0);
     UnkStruct_ov101_021D5D90 * v5 = sub_0205EC04(param0);
 
@@ -318,7 +318,7 @@ static void ov5_021DFD28 (UnkStruct_0205E884 * param0)
         v1 = 0x1b;
     } else {
         UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0);
-        UnkStruct_0203CDB0 * v3 = sub_02062C00(v2);
+        FieldSystem * v3 = sub_02062C00(v2);
 
         if (sub_02071CB4(v3, 2) == 1) {
             v1 = 0x1e;
@@ -338,7 +338,7 @@ static void ov5_021DFD68 (UnkStruct_0205E884 * param0)
         v1 = 0x1a;
     } else {
         UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0);
-        UnkStruct_0203CDB0 * v3 = sub_02062C00(v2);
+        FieldSystem * v3 = sub_02062C00(v2);
 
         if (sub_02071CB4(v3, 2) == 1) {
             v1 = 0x1d;
@@ -378,7 +378,7 @@ static void(*const Unk_ov5_021F9B74[10])(UnkStruct_0205E884 *) = {
     ov5_021DFDC4
 };
 
-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)
 {
     {
         UnkStruct_02061AB4 * v0;
@@ -415,7 +415,7 @@ int ov5_021DFDE0 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int
     return 0;
 }
 
-static int ov5_021DFE68 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021DFE68 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
 {
     int v0 = sub_02061434(param1, param2);
 
@@ -448,7 +448,7 @@ static int ov5_021DFE68 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param
     return 0;
 }
 
-static int ov5_021DFEF4 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021DFEF4 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
 {
     int v0 = sub_02061434(param1, param2);
 
@@ -459,7 +459,7 @@ static int ov5_021DFEF4 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param
     return 0;
 }
 
-static int ov5_021DFF1C (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021DFF1C (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
 {
     if (param3 != 1) {
         return 0;
@@ -501,7 +501,7 @@ static int ov5_021DFF1C (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param
     }
 }
 
-static void ov5_021DFF88 (int param0, UnkStruct_0203CDB0 * param1, UnkStruct_0205E884 * param2, UnkStruct_02061AB4 * param3)
+static void ov5_021DFF88 (int param0, FieldSystem * param1, UnkStruct_0205E884 * param2, UnkStruct_02061AB4 * param3)
 {
     UnkStruct_ov5_021DFF88 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021DFF88)));
 
@@ -579,7 +579,7 @@ static BOOL ov5_021DFFBC (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static void ov5_021E00B0 (UnkStruct_0203CDB0 * param0, int param1, const UnkStruct_ov5_021E1050 * param2)
+static void ov5_021E00B0 (FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2)
 {
     UnkStruct_ov5_021E00B0 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E00B0)));
 
@@ -595,7 +595,7 @@ static void ov5_021E00B0 (UnkStruct_0203CDB0 * param0, int param1, const UnkStru
 void ov5_021E00EC (UnkStruct_020508D4 * param0, int param1, int param2)
 {
     UnkStruct_ov5_021E1050 v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     Pokemon * v2 = ov5_021E1140(v1, param2);
 
     ov5_021E1028(v1, v2, &v0);
@@ -708,7 +708,7 @@ static BOOL ov5_021E0160 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int ov5_021E032C (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021E032C (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
 {
     if ((param3 != 1) || (sub_0205EB74(param1) != 0x2)) {
         return 0;
@@ -739,7 +739,7 @@ static int ov5_021E032C (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param
     return 1;
 }
 
-static void ov5_021E0390 (int param0, UnkStruct_0203CDB0 * param1, UnkStruct_0205E884 * param2)
+static void ov5_021E0390 (int param0, FieldSystem * param1, UnkStruct_0205E884 * param2)
 {
     UnkStruct_ov5_021E0390 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0390)));
 
@@ -803,7 +803,7 @@ static BOOL ov5_021E03C8 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int ov5_021E04A8 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021E04A8 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
 {
     if ((param2 != 1) || (param3 != 1) || (sub_0205EB74(param1) != 0x2)) {
         return 0;
@@ -821,7 +821,7 @@ static int ov5_021E04A8 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param
     return 1;
 }
 
-static int ov5_021E04EC (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021E04EC (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
 {
     if (sub_0205F008(param1) == 1) {
         return 0;
@@ -840,7 +840,7 @@ static int ov5_021E04EC (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param
     return 1;
 }
 
-static void ov5_021E0534 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1)
+static void ov5_021E0534 (FieldSystem * param0, UnkStruct_0205E884 * param1)
 {
     UnkStruct_ov5_021E0534 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0534)));
 
@@ -892,7 +892,7 @@ static BOOL ov5_021E0560 (UnkStruct_020508D4 * param0)
             u8 v7 = sub_02062BE8(v1);
 
             if (sub_0205DD0C(v7) == 1) {
-                UnkStruct_0203CDB0 * v8 = sub_02050A60(param0);
+                FieldSystem * v8 = sub_02050A60(param0);
                 BattleParams * v9;
 
                 if (ov6_022413E4(v8, &v9) == 1) {
@@ -920,7 +920,7 @@ static BOOL ov5_021E0560 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int ov5_021E067C (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2)
+static int ov5_021E067C (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param1);
 
@@ -935,7 +935,7 @@ static int ov5_021E067C (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param
     return 0;
 }
 
-static int ov5_021E06A8 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1)
+static int ov5_021E06A8 (FieldSystem * param0, UnkStruct_0205E884 * param1)
 {
     if (sub_0205EBB8(param1) < 1) {
         return 0;
@@ -965,7 +965,7 @@ static int ov5_021E06A8 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param
     return 0;
 }
 
-static void ov5_021E06F8 (UnkStruct_0203CDB0 * param0, int param1, const UnkStruct_ov5_021E1050 * param2)
+static void ov5_021E06F8 (FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2)
 {
     UnkStruct_ov5_021F9B54 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021F9B54)));
 
@@ -981,7 +981,7 @@ static void ov5_021E06F8 (UnkStruct_0203CDB0 * param0, int param1, const UnkStru
 void ov5_021E0734 (UnkStruct_020508D4 * param0, int param1, int param2)
 {
     UnkStruct_ov5_021E1050 v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     Pokemon * v2 = ov5_021E1140(v1, param2);
 
     ov5_021E1028(v1, v2, &v0);
@@ -1142,7 +1142,7 @@ static int(*const Unk_ov5_021F9B54[])(UnkStruct_ov5_021F9B54 *) = {
     ov5_021E0924
 };
 
-static UnkStruct_ov5_021F9B10 * ov5_021E0948 (UnkStruct_0203CDB0 * param0, int param1, const UnkStruct_ov5_021E1050 * param2)
+static UnkStruct_ov5_021F9B10 * ov5_021E0948 (FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2)
 {
     UnkStruct_ov5_021F9B10 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021F9B10)));
 
@@ -1158,7 +1158,7 @@ static UnkStruct_ov5_021F9B10 * ov5_021E0948 (UnkStruct_0203CDB0 * param0, int p
     return v0;
 }
 
-void ov5_021E097C (UnkStruct_0203CDB0 * param0, int param1)
+void ov5_021E097C (FieldSystem * param0, int param1)
 {
     UnkStruct_ov5_021F9B10 * v0 = ov5_021E0948(param0, param1, NULL);
     sub_02050904(param0, ov5_021E09D4, v0);
@@ -1167,7 +1167,7 @@ void ov5_021E097C (UnkStruct_0203CDB0 * param0, int param1)
 void ov5_021E0998 (UnkStruct_020508D4 * param0, int param1, int param2)
 {
     UnkStruct_ov5_021E1050 v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     Pokemon * v2 = ov5_021E1140(v1, param2);
 
     ov5_021E1028(v1, v2, &v0);
@@ -1514,11 +1514,11 @@ static const UnkStruct_ov5_021F8E3C Unk_ov5_021F9C00[] = {
 
 void ov5_021E0DD4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     ov5_021E0DE0(v0);
 }
 
-static void ov5_021E0DE0 (UnkStruct_0203CDB0 * param0)
+static void ov5_021E0DE0 (FieldSystem * param0)
 {
     UnkStruct_ov5_021E0DE0 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0DE0)));
 
@@ -1628,7 +1628,7 @@ void ov5_021E0EEC (UnkStruct_0205E884 * param0)
     }
 }
 
-static SysTask * ov5_021E0F54 (UnkStruct_0203CDB0 * param0, u32 param1)
+static SysTask * ov5_021E0F54 (FieldSystem * param0, u32 param1)
 {
     UnkStruct_0205E884 * v0 = param0->unk_3C;
     int v1 = sub_0205EB74(v0);
@@ -1683,7 +1683,7 @@ static void ov5_021E0FF0 (SysTask * param0, void * param1)
     sub_02062B68(v1);
 }
 
-SysTask * ov5_021E1000 (UnkStruct_0203CDB0 * param0)
+SysTask * ov5_021E1000 (FieldSystem * param0)
 {
     return ov5_021E0F54(param0, (1 << 7));
 }
@@ -1693,7 +1693,7 @@ void ov5_021E100C (SysTask * param0)
     ov5_021E0FC0(param0);
 }
 
-SysTask * ov5_021E1014 (UnkStruct_0203CDB0 * param0)
+SysTask * ov5_021E1014 (FieldSystem * param0)
 {
     return ov5_021E0F54(param0, (1 << 9));
 }
@@ -1703,14 +1703,14 @@ void ov5_021E1020 (SysTask * param0)
     ov5_021E0FC0(param0);
 }
 
-static void ov5_021E1028 (UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov5_021E1050 * param2)
+static void ov5_021E1028 (FieldSystem * param0, Pokemon * param1, UnkStruct_ov5_021E1050 * param2)
 {
     param2->unk_00 = 1;
     param2->unk_08 = param1;
     param2->unk_04 = sub_0205EB98(param0->unk_3C);
 }
 
-static void ov5_021E103C (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021E1050 * param1)
+static void ov5_021E103C (FieldSystem * param0, UnkStruct_ov5_021E1050 * param1)
 {
     param1->unk_0C = ov6_02243F88(param0, 0, param1->unk_08, param1->unk_04);
 }
@@ -1733,7 +1733,7 @@ static void ov5_021E106C (UnkStruct_0205E884 * param0, int param1)
         ov5_021EE3FC(v0, param1, NULL, NULL);
     } else {
         int v1;
-        UnkStruct_0203CDB0 * v2;
+        FieldSystem * v2;
         UnkStruct_020216E0 * v3;
 
         v2 = sub_02062C00(v0);
@@ -1750,7 +1750,7 @@ static void ov5_021E10C0 (void * param0, const UnkStruct_020216E0 * param1)
 {
     UnkStruct_0205E884 * v0 = param0;
     UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0);
-    UnkStruct_0203CDB0 * v2 = sub_02062C00(v1);
+    FieldSystem * v2 = sub_02062C00(v1);
 
     ov9_0224A564(v2, param1);
 }
@@ -1780,7 +1780,7 @@ static void ov5_021E1134 (void * param0)
     Heap_FreeToHeapExplicit(4, param0);
 }
 
-static Pokemon * ov5_021E1140 (UnkStruct_0203CDB0 * param0, int param1)
+static Pokemon * ov5_021E1140 (FieldSystem * param0, int param1)
 {
     Pokemon * v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param1);
     return v0;
diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c
index 65078b29e3..ae35855223 100644
--- a/src/overlay005/ov5_021E1154.c
+++ b/src/overlay005/ov5_021E1154.c
@@ -21,17 +21,17 @@ typedef struct {
     int unk_00;
     int unk_04;
     int unk_08;
-    UnkStruct_0203CDB0 * unk_0C;
+    FieldSystem * unk_0C;
     UnkStruct_0205E884 * unk_10;
     UnkStruct_02061AB4 * unk_14;
 } UnkStruct_ov5_021E11B0;
 
-static void ov5_021E11B0(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2);
+static void ov5_021E11B0(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2);
 static BOOL ov5_021E120C(UnkStruct_020508D4 * param0);
 static void * ov5_021E132C(int param0);
 static void ov5_021E1350(void * param0);
 
-int ov5_021E1154 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2)
+int ov5_021E1154 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param1);
     u8 v1 = sub_02062BE8(v0);
@@ -53,7 +53,7 @@ int ov5_021E1154 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int
     return 1;
 }
 
-static void ov5_021E11B0 (UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2)
+static void ov5_021E11B0 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2)
 {
     UnkStruct_ov5_021E11B0 * v0 = ov5_021E132C((sizeof(UnkStruct_ov5_021E11B0)));
 
diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c
index f839966e90..1495d4a5a0 100644
--- a/src/overlay005/ov5_021E135C.c
+++ b/src/overlay005/ov5_021E135C.c
@@ -18,7 +18,7 @@
 #include "overlay005/ov5_021ECC20.h"
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     BOOL * unk_04;
     int unk_08;
     int unk_0C;
@@ -128,7 +128,7 @@ static void ov5_021E1470 (SysTask * param0, void * param1)
     }
 }
 
-void ov5_021E15A8 (UnkStruct_0203CDB0 * param0, BOOL param1, BOOL * param2)
+void ov5_021E15A8 (FieldSystem * param0, BOOL param1, BOOL * param2)
 {
     UnkStruct_ov5_021E135C * v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021E135C));
 
diff --git a/src/overlay005/ov5_021E1B08.c b/src/overlay005/ov5_021E1B08.c
index e016de5b35..276b094578 100644
--- a/src/overlay005/ov5_021E1B08.c
+++ b/src/overlay005/ov5_021E1B08.c
@@ -19,10 +19,10 @@ struct UnkStruct_ov5_021E1B20_t {
     u8 unk_13_7 : 1;
 };
 
-static void ov5_021E1BE0(UnkStruct_0203CDB0 * param0);
-static void ov5_021E1C1C(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021E1C70(UnkStruct_0203CDB0 * param0);
-static BOOL ov5_021E1CB0(UnkStruct_0203CDB0 * param0);
+static void ov5_021E1BE0(FieldSystem * param0);
+static void ov5_021E1C1C(FieldSystem * param0);
+static BOOL ov5_021E1C70(FieldSystem * param0);
+static BOOL ov5_021E1CB0(FieldSystem * param0);
 
 void * ov5_021E1B08 (u32 param0)
 {
@@ -71,7 +71,7 @@ BOOL ov5_021E1B58 (UnkStruct_ov5_021E1B20 * param0)
     return 0;
 }
 
-void ov5_021E1B68 (UnkStruct_0203CDB0 * param0)
+void ov5_021E1B68 (FieldSystem * param0)
 {
     UnkStruct_ov5_021E1B20 * v0 = param0->unk_64;
 
@@ -99,13 +99,13 @@ void ov5_021E1B68 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void ov5_021E1BCC (UnkStruct_0203CDB0 * param0, u8 param1)
+void ov5_021E1BCC (FieldSystem * param0, u8 param1)
 {
     ov5_021E1B40(param0->unk_64, param1);
     ov5_021E1B68(param0);
 }
 
-static void ov5_021E1BE0 (UnkStruct_0203CDB0 * param0)
+static void ov5_021E1BE0 (FieldSystem * param0)
 {
     sub_02019184(param0->unk_08, 3, 3, -48);
 
@@ -117,7 +117,7 @@ static void ov5_021E1BE0 (UnkStruct_0203CDB0 * param0)
     sub_0205DA80(&param0->unk_64->unk_00, param0->unk_64->unk_12, param0->unk_64->unk_10);
 }
 
-static void ov5_021E1C1C (UnkStruct_0203CDB0 * param0)
+static void ov5_021E1C1C (FieldSystem * param0)
 {
     if (param0->unk_64->unk_13_7 == 0) {
         return;
@@ -131,7 +131,7 @@ static void ov5_021E1C1C (UnkStruct_0203CDB0 * param0)
     param0->unk_64->unk_13_7 = 0;
 }
 
-static BOOL ov5_021E1C70 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021E1C70 (FieldSystem * param0)
 {
     int v0 = sub_020192F8(param0->unk_08, 3);
 
@@ -148,7 +148,7 @@ static BOOL ov5_021E1C70 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static BOOL ov5_021E1CB0 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021E1CB0 (FieldSystem * param0)
 {
     int v0 = sub_020192F8(param0->unk_08, 3);
 
diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c
index 514164d4c2..4a84b102af 100644
--- a/src/overlay005/ov5_021E1D20.c
+++ b/src/overlay005/ov5_021E1D20.c
@@ -44,7 +44,7 @@ typedef struct {
 } UnkStruct_ov5_021E1D20;
 
 struct UnkStruct_ov5_021E1FF4_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     int unk_04;
     u8 unk_08;
     BGL * unk_0C;
@@ -56,7 +56,7 @@ struct UnkStruct_ov5_021E1FF4_t {
     int unk_30;
 };
 
-static void ov5_021E2028(UnkStruct_0203CDB0 * param0);
+static void ov5_021E2028(FieldSystem * param0);
 
 static const int Unk_ov5_021F9CCC[] = {
     0x0,
@@ -73,7 +73,7 @@ static const int Unk_ov5_021F9CBC[] = {
     0x8
 };
 
-static void ov5_021E1D20 (UnkStruct_ov5_021E1D20 * param0, const UnkStruct_0203CDB0 * param1)
+static void ov5_021E1D20 (UnkStruct_ov5_021E1D20 * param0, const FieldSystem * param1)
 {
     SaveData * v0 = param1->unk_0C;
     UnkStruct_02049FA8 * v1 = sub_0203A720(sub_0203A790(v0));
@@ -189,7 +189,7 @@ void ov5_021E1F7C (UnkStruct_ov5_021E1FF4 * param0)
     Heap_FreeToHeap(param0->unk_10);
 }
 
-UnkStruct_ov5_021E1FF4 * ov5_021E1F98 (UnkStruct_0203CDB0 * param0, int param1, u8 param2)
+UnkStruct_ov5_021E1FF4 * ov5_021E1F98 (FieldSystem * param0, int param1, u8 param2)
 {
     UnkStruct_ov5_021E1FF4 * v0;
 
@@ -218,7 +218,7 @@ void ov5_021E1FF4 (UnkStruct_ov5_021E1FF4 * param0)
     Heap_FreeToHeap(param0);
 }
 
-BOOL ov5_021E200C (UnkStruct_0203CDB0 * param0)
+BOOL ov5_021E200C (FieldSystem * param0)
 {
     ov5_021E2028(param0);
 
@@ -229,7 +229,7 @@ BOOL ov5_021E200C (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static void ov5_021E2028 (UnkStruct_0203CDB0 * param0)
+static void ov5_021E2028 (FieldSystem * param0)
 {
     sub_0203A7A8(param0);
     ov5_021EA714(param0, 4, 0);
@@ -240,7 +240,7 @@ static void ov5_021E2028 (UnkStruct_0203CDB0 * param0)
     param0->unk_1C->unk_10 = sub_0205EA78(param0->unk_3C);
 }
 
-void ov5_021E2064 (UnkStruct_0203CDB0 * param0)
+void ov5_021E2064 (FieldSystem * param0)
 {
     if (param0 == NULL) {
         GF_ASSERT(0);
diff --git a/src/overlay005/ov5_021E2338.c b/src/overlay005/ov5_021E2338.c
index d78d361e16..4da418cc25 100644
--- a/src/overlay005/ov5_021E2338.c
+++ b/src/overlay005/ov5_021E2338.c
@@ -2250,7 +2250,7 @@ typedef struct {
     s32 unk_34;
 } UnkStruct_ov5_021E4F7C;
 
-static void ov5_021E4DE0 (UnkStruct_0203CDB0 * param0, const UnkStruct_ov5_021F9DD4 * param1)
+static void ov5_021E4DE0 (FieldSystem * param0, const UnkStruct_ov5_021F9DD4 * param1)
 {
     UnkStruct_ov115_0226527C v0;
 
@@ -2968,7 +2968,7 @@ void ov5_021E585C (SysTask * param0, void * param1)
     }
 }
 
-static u32 ov5_021E5880 (UnkStruct_0203CDB0 * param0)
+static u32 ov5_021E5880 (FieldSystem * param0)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(param0->unk_0C);
 
diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c
index e99c9697a8..dd6f3f679a 100644
--- a/src/overlay005/ov5_021E622C.c
+++ b/src/overlay005/ov5_021E622C.c
@@ -1968,7 +1968,7 @@ u16 ov5_021E73A0(Party * param0, int param1, StringFormatter * param2);
 u8 ov5_021E73C8(UnkStruct_02026310 * param0);
 void ov5_021E72BC(UnkStruct_02026310 * param0, StringFormatter * param1);
 static void ov5_021E62C4(Party * param0, int param1, UnkStruct_02026218 * param2, SaveData * param3);
-static int ov5_021E7110(UnkStruct_0203CDB0 * param0);
+static int ov5_021E7110(FieldSystem * param0);
 
 static BoxPokemon * ov5_021E622C (UnkStruct_02026310 * param0, int param1)
 {
@@ -2833,7 +2833,7 @@ static const u16 Unk_ov5_021F9F54[] = {
     0x4BE
 };
 
-static int ov5_021E7110 (UnkStruct_0203CDB0 * param0)
+static int ov5_021E7110 (FieldSystem * param0)
 {
     int v0 = sub_02055BB8(param0) * 100 + sub_02055BC4(param0);
     int v1;
@@ -2851,7 +2851,7 @@ static int ov5_021E7110 (UnkStruct_0203CDB0 * param0)
     return 255;
 }
 
-BOOL ov5_021E7154 (UnkStruct_02026310 * param0, Party * param1, UnkStruct_0203CDB0 * param2)
+BOOL ov5_021E7154 (UnkStruct_02026310 * param0, Party * param1, FieldSystem * param2)
 {
     u32 v0, v1, v2, v3, v4;
     u32 v5 = 0, v6;
diff --git a/src/overlay005/ov5_021E779C.c b/src/overlay005/ov5_021E779C.c
index 457ae8e017..b92f9fd792 100644
--- a/src/overlay005/ov5_021E779C.c
+++ b/src/overlay005/ov5_021E779C.c
@@ -740,7 +740,7 @@ static BOOL ov5_021E80D0 (UnkStruct_ov5_021E8F60 * param0, const int param1, con
     return 1;
 }
 
-void ov5_021E8188 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021E8F60 * param1)
+void ov5_021E8188 (FieldSystem * param0, UnkStruct_ov5_021E8F60 * param1)
 {
     u8 v0;
     UnkStruct_ov5_021E7814 * v1;
@@ -2293,7 +2293,7 @@ void ov5_021E9F98 (UnkStruct_ov5_021E8F60 * param0, UnkStruct_ov5_021E8F60 * par
     param0->unk_A8 = param1->unk_A8;
 }
 
-void ov5_021EA174 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021E8F60 * param1)
+void ov5_021EA174 (FieldSystem * param0, UnkStruct_ov5_021E8F60 * param1)
 {
     u8 v0;
     UnkStruct_ov5_021E7814 * v1;
diff --git a/src/overlay005/ov5_021EA714.c b/src/overlay005/ov5_021EA714.c
index 6c71c9ac68..08f831ce30 100644
--- a/src/overlay005/ov5_021EA714.c
+++ b/src/overlay005/ov5_021EA714.c
@@ -18,7 +18,7 @@
 FS_EXTERN_OVERLAY(overlay24);
 FS_EXTERN_OVERLAY(overlay25);
 
-void ov5_021EA714 (UnkStruct_0203CDB0 * param0, int param1, u32 param2)
+void ov5_021EA714 (FieldSystem * param0, int param1, u32 param2)
 {
     if ((param0->unk_04 != NULL) && (param0->unk_04->unk_14 != NULL)) {
         ov25_02253D7C(param0->unk_04->unk_14, param1, param2);
@@ -26,7 +26,7 @@ void ov5_021EA714 (UnkStruct_0203CDB0 * param0, int param1, u32 param2)
 }
 
 
-void ov5_021EA728 (UnkStruct_0203CDB0 * param0)
+void ov5_021EA728 (FieldSystem * param0)
 {
     PoketchData * v0 = SaveData_PoketchData(param0->unk_0C);
     UnkStruct_020507E4 * v1 = SaveData_Events(param0->unk_0C);
@@ -41,7 +41,7 @@ void ov5_021EA728 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void ov5_021EA790 (UnkStruct_0203CDB0 * param0)
+void ov5_021EA790 (FieldSystem * param0)
 {
     PoketchData * v0 = SaveData_PoketchData(param0->unk_0C);
     UnkStruct_020507E4 * v1 = SaveData_Events(param0->unk_0C);
@@ -54,7 +54,7 @@ void ov5_021EA790 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-u8 ov5_021EA7CC (UnkStruct_0203CDB0 * param0)
+u8 ov5_021EA7CC (FieldSystem * param0)
 {
     PoketchData * v0 = SaveData_PoketchData(param0->unk_0C);
     UnkStruct_020507E4 * v1 = SaveData_Events(param0->unk_0C);
@@ -76,18 +76,18 @@ u8 ov5_021EA7CC (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-void ov5_021EA830 (UnkStruct_0203CDB0 * param0)
+void ov5_021EA830 (FieldSystem * param0)
 {
     Overlay_LoadByID(FS_OVERLAY_ID(overlay24), 2);
     ov24_02253CE0(param0->unk_08);
 }
 
-void ov5_021EA848 (UnkStruct_0203CDB0 * param0)
+void ov5_021EA848 (FieldSystem * param0)
 {
     ov24_02253DA4(param0->unk_08);
 }
 
-BOOL ov5_021EA854 (UnkStruct_0203CDB0 * param0)
+BOOL ov5_021EA854 (FieldSystem * param0)
 {
     if (ov24_02253DB4(param0->unk_08)) {
         Overlay_UnloadByID(FS_OVERLAY_ID(overlay24));
diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c
index ab2558963e..355899648d 100644
--- a/src/overlay005/ov5_021EA874.c
+++ b/src/overlay005/ov5_021EA874.c
@@ -50,7 +50,7 @@ typedef struct {
     Strbuf* unk_0C;
     Window unk_10;
     Window unk_20;
-    UnkStruct_0203CDB0 * unk_30;
+    FieldSystem * unk_30;
     SaveData * unk_34;
     StringFormatter * unk_38;
     MessageLoader * unk_3C;
@@ -384,7 +384,7 @@ static BOOL ov5_021EAD38 (UnkStruct_ov5_021EAE78 * param0)
 static BOOL ov5_021EADB4 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021EAE78 * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     switch (v0->unk_48) {
     case 0:
@@ -473,7 +473,7 @@ static void ov5_021EAF1C (UnkStruct_ov5_021EAE78 * param0)
     }
 }
 
-void ov5_021EAF50 (UnkStruct_0203CDB0 * param0)
+void ov5_021EAF50 (FieldSystem * param0)
 {
     UnkStruct_ov5_021EAE78 * v0;
     UnkStruct_020508D4 * v1 = param0->unk_10;
diff --git a/src/overlay005/ov5_021EE75C.c b/src/overlay005/ov5_021EE75C.c
index 7b07d4c25e..b7b8bffb30 100644
--- a/src/overlay005/ov5_021EE75C.c
+++ b/src/overlay005/ov5_021EE75C.c
@@ -19,7 +19,7 @@ typedef struct {
     int unk_04;
 } UnkStruct_ov5_021EE75C;
 
-static void ov5_021EE75C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021EE75C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov5_021EE75C * v0 = (UnkStruct_ov5_021EE75C *)param2;
 
@@ -27,12 +27,12 @@ static void ov5_021EE75C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     v0->unk_04 = 0;
 }
 
-static void ov5_021EE764 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021EE764 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     return;
 }
 
-static void ov5_021EE768 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021EE768 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     u8 v0;
     int v1, v2;
@@ -71,7 +71,7 @@ static const UnkStruct_ov6_0223E6EC Unk_ov5_021FF4F0 = {
     NULL
 };
 
-void ov5_021EE7C0 (UnkStruct_0203CDB0 * param0)
+void ov5_021EE7C0 (FieldSystem * param0)
 {
     ov5_021D1B6C(param0->unk_04->unk_04, &Unk_ov5_021FF4F0);
 }
diff --git a/src/overlay005/ov5_021EE7D4.c b/src/overlay005/ov5_021EE7D4.c
index 03c660b052..8d814b8779 100644
--- a/src/overlay005/ov5_021EE7D4.c
+++ b/src/overlay005/ov5_021EE7D4.c
@@ -100,7 +100,7 @@ static u32 ov5_021EE8A8 (u16 param0, u16 param1)
     return v3 * v4 / 10;
 }
 
-u8 ov5_021EE920 (UnkStruct_0203CDB0 * param0, u16 param1)
+u8 ov5_021EE920 (FieldSystem * param0, u16 param1)
 {
     Pokemon * v0;
     vu16 v1, v2;
@@ -132,7 +132,7 @@ u8 ov5_021EE920 (UnkStruct_0203CDB0 * param0, u16 param1)
     }
 }
 
-void ov5_021EE9BC (UnkStruct_0203CDB0 * param0, u16 param1)
+void ov5_021EE9BC (FieldSystem * param0, u16 param1)
 {
     Pokemon * v0;
     vu16 v1;
@@ -143,7 +143,7 @@ void ov5_021EE9BC (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206B0C4(SaveData_Events(param0->unk_0C), v1);
 }
 
-static void ov5_021EE9E8 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3, vu16 param4)
+static void ov5_021EE9E8 (FieldSystem * param0, u8 param1, u8 param2, u16 param3, vu16 param4)
 {
     u32 v0;
     StringFormatter ** v1 = sub_0203F098(param0, 15);
@@ -159,7 +159,7 @@ static void ov5_021EE9E8 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16
     sub_0200B60C(*v1, param2, v0 % 10, 1, 0, 1);
 }
 
-void ov5_021EEA54 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3)
+void ov5_021EEA54 (FieldSystem * param0, u8 param1, u8 param2, u16 param3)
 {
     vu16 v0;
 
@@ -167,7 +167,7 @@ void ov5_021EEA54 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3
     ov5_021EE9E8(param0, param1, param2, param3, v0);
 }
 
-void ov5_021EEA84 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3)
+void ov5_021EEA84 (FieldSystem * param0, u8 param1, u8 param2, u16 param3)
 {
     Pokemon * v0;
     u16 v1;
diff --git a/src/overlay005/ov5_021EFB0C.c b/src/overlay005/ov5_021EFB0C.c
index f26d9b93d5..9bad812034 100644
--- a/src/overlay005/ov5_021EFB0C.c
+++ b/src/overlay005/ov5_021EFB0C.c
@@ -37,7 +37,7 @@ typedef struct UnkStruct_ov5_021EFB30_t {
 
 static void ov5_021EFCF8(const BOOL param0, u8 * param1);
 static void ov5_021EFD58(u8 * param0);
-static void ov5_021EFE7C(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021E1608 * param1, const int param2);
+static void ov5_021EFE7C(FieldSystem * param0, UnkStruct_ov5_021E1608 * param1, const int param2);
 static u8 ov5_021EFF10(const int param0);
 static const int ov5_021EFDAC(const u8 param0);
 static const int ov5_021EFDC0(const u8 param0);
@@ -102,7 +102,7 @@ void ov5_021EFB30 (UnkStruct_ov5_021EFB30 ** param0)
     *param0 = NULL;
 }
 
-BOOL ov5_021EFB40 (UnkStruct_0203CDB0 * param0, int * param1)
+BOOL ov5_021EFB40 (FieldSystem * param0, int * param1)
 {
     UnkStruct_02055130 v0;
     int v1, v2;
@@ -125,7 +125,7 @@ BOOL ov5_021EFB40 (UnkStruct_0203CDB0 * param0, int * param1)
     return v3;
 }
 
-u16 ov5_021EFB94 (UnkStruct_0203CDB0 * param0)
+u16 ov5_021EFB94 (FieldSystem * param0)
 {
     u8 v0;
     UnkStruct_0202D844 * v1;
@@ -148,7 +148,7 @@ u16 ov5_021EFB94 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void ov5_021EFBDC (UnkStruct_0203CDB0 * param0)
+void ov5_021EFBDC (FieldSystem * param0)
 {
     u8 v0;
     UnkStruct_0202D844 * v1;
@@ -195,7 +195,7 @@ void ov5_021EFBDC (UnkStruct_0203CDB0 * param0)
     sub_0202D848(v0, v1);
 }
 
-void ov5_021EFC90 (UnkStruct_0203CDB0 * param0)
+void ov5_021EFC90 (FieldSystem * param0)
 {
     u8 v0;
 
@@ -358,7 +358,7 @@ static const BOOL ov5_021EFE58 (const int param0, u8 * param1)
     return v1;
 }
 
-static void ov5_021EFE7C (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021E1608 * param1, const int param2)
+static void ov5_021EFE7C (FieldSystem * param0, UnkStruct_ov5_021E1608 * param1, const int param2)
 {
     u16 v0;
     u8 v1;
@@ -460,7 +460,7 @@ static BOOL ov5_021EFF4C (const u32 param0, const u8 param1)
     return 0;
 }
 
-int ov5_021EFFE4 (UnkStruct_0203CDB0 * param0)
+int ov5_021EFFE4 (FieldSystem * param0)
 {
     u8 v0;
 
@@ -491,18 +491,18 @@ int ov5_021EFFE4 (UnkStruct_0203CDB0 * param0)
 
 void ov5_021F0030 (void * param0, const int param1, UnkStruct_ov5_021E1608 * const param2)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     u8 v1;
 
     if (param1 < 0) {
         return;
     }
 
-    v0 = (UnkStruct_0203CDB0 *)param0;
+    v0 = (FieldSystem *)param0;
     ov5_021EFE7C(v0, param2, param1);
 }
 
-void ov5_021F0040 (UnkStruct_0203CDB0 * param0)
+void ov5_021F0040 (FieldSystem * param0)
 {
     UnkStruct_0202D844 * v0;
     UnkStruct_0202D84C * v1;
diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c
index 1bb104d489..59fabcb7e5 100644
--- a/src/overlay005/ov5_021F007C.c
+++ b/src/overlay005/ov5_021F007C.c
@@ -58,7 +58,7 @@ static void ov5_021F0260(BGL * param0);
 static void ov5_021F02B8(UnkStruct_ov5_021F02B8 * param0, int param1, int param2, int param3);
 static BOOL ov5_021F02C8(UnkStruct_ov5_021F02B8 * param0);
 
-static void ov5_021F007C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021F007C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov5_021F007C * v0 = param2;
 
@@ -72,7 +72,7 @@ static void ov5_021F007C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     Sound_PlayEffect(1608);
 }
 
-static void ov5_021F00BC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021F00BC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov5_021F007C * v0 = param2;
 
@@ -84,13 +84,13 @@ static void ov5_021F00BC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     v0->unk_3C = 0;
 }
 
-static void ov5_021F00E4 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021F00E4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov5_021F007C * v0 = param2;
     Heap_FreeToHeap(v0->unk_00);
 }
 
-static void ov5_021F00F0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021F00F0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     BOOL v0;
     UnkStruct_ov5_021F007C * v1 = param2;
@@ -109,7 +109,7 @@ static void ov5_021F00F0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     sub_0201972C(2, v1->unk_08, 32, 6 * 32);
 }
 
-static void ov5_021F013C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021F013C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov5_021F013C * v0 = param2;
 
@@ -125,7 +125,7 @@ static void ov5_021F013C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     Sound_PlayEffect(1608);
 }
 
-static void ov5_021F0188 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021F0188 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov5_021F013C * v0 = param2;
 
@@ -137,12 +137,12 @@ static void ov5_021F0188 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     G2_SetBlendAlpha((GX_PLANEMASK_BG2), GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BD, 10, 16 - 10);
 }
 
-static void ov5_021F01BC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021F01BC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     return;
 }
 
-static void ov5_021F01C0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021F01C0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     BOOL v0;
     UnkStruct_ov5_021F013C * v1 = param2;
@@ -160,12 +160,12 @@ static void ov5_021F01C0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     G2_ChangeBlendAlpha(v1->unk_00.unk_00, 16 - v1->unk_00.unk_00);
 }
 
-static void ov5_021F01EC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov5_021F01EC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     return;
 }
 
-UnkStruct_ov5_021D1BEC * ov5_021F01F0 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov5_021F01F0 (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -181,7 +181,7 @@ UnkStruct_ov5_021D1BEC * ov5_021F01F0 (UnkStruct_0203CDB0 * param0)
     return v1;
 }
 
-UnkStruct_ov5_021D1BEC * ov5_021F0204 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov5_021F0204 (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -208,7 +208,7 @@ BOOL ov5_021F0220 (UnkStruct_ov5_021D1BEC * param0)
     return v0->unk_14;
 }
 
-UnkStruct_ov5_021D1BEC * ov5_021F022C (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov5_021F022C (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -224,7 +224,7 @@ UnkStruct_ov5_021D1BEC * ov5_021F022C (UnkStruct_0203CDB0 * param0)
     return v1;
 }
 
-UnkStruct_ov5_021D1BEC * ov5_021F0240 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov5_021F0240 (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -288,17 +288,17 @@ static BOOL ov5_021F02C8 (UnkStruct_ov5_021F02B8 * param0)
     return 1;
 }
 
-static void ov5_021F02F4 (UnkStruct_0203CDB0 * param0)
+static void ov5_021F02F4 (FieldSystem * param0)
 {
     sub_0201975C(2, 0);
 }
 
-static void ov5_021F0300 (UnkStruct_0203CDB0 * param0)
+static void ov5_021F0300 (FieldSystem * param0)
 {
     sub_0201975C(2, 0x7fff);
 }
 
-static void ov5_021F0310 (UnkStruct_0203CDB0 * param0)
+static void ov5_021F0310 (FieldSystem * param0)
 {
     u16 v0 = 0x7fff;
 
@@ -314,7 +314,7 @@ static void ov5_021F0310 (UnkStruct_0203CDB0 * param0)
     ov5_021F02F4(param0);
 }
 
-static void ov5_021F0374 (UnkStruct_0203CDB0 * param0)
+static void ov5_021F0374 (FieldSystem * param0)
 {
     u16 v0 = 0x7fff;
 
@@ -330,7 +330,7 @@ static void ov5_021F0374 (UnkStruct_0203CDB0 * param0)
     ov5_021F02F4(param0);
 }
 
-static BOOL ov5_021F03D8 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021F03D8 (FieldSystem * param0)
 {
     static const u32 v0[] = {
         23,
@@ -353,7 +353,7 @@ static BOOL ov5_021F03D8 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static BOOL ov5_021F0408 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021F0408 (FieldSystem * param0)
 {
     static const u32 v0[1] = {
         8,
@@ -376,7 +376,7 @@ static BOOL ov5_021F0408 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static BOOL ov5_021F0438 (UnkStruct_0203CDB0 * param0)
+static BOOL ov5_021F0438 (FieldSystem * param0)
 {
     static const u32 v0[18] = {
         2,
@@ -433,7 +433,7 @@ u32 ov5_021F0484 (void)
 
 BOOL ov5_021F0488 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov5_021F0468 * v1 = sub_02050A64(param0);
     BOOL v2;
 
diff --git a/src/overlay005/ov5_021F0824.c b/src/overlay005/ov5_021F0824.c
index 1710b523ff..8bccd06f27 100644
--- a/src/overlay005/ov5_021F0824.c
+++ b/src/overlay005/ov5_021F0824.c
@@ -13,7 +13,7 @@
 #include "overlay005/ov5_021F0824.h"
 #include "overlay023/ov23_02241F74.h"
 
-void ov5_021F0824 (UnkStruct_0203CDB0 * param0)
+void ov5_021F0824 (FieldSystem * param0)
 {
     int v0;
     int v1;
diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c
index 51edaa4c71..405d73aa84 100644
--- a/src/overlay005/ov5_021F08CC.c
+++ b/src/overlay005/ov5_021F08CC.c
@@ -63,7 +63,7 @@ typedef struct {
     int unk_14;
     int unk_18;
     int unk_1C;
-    UnkStruct_0203CDB0 * unk_20;
+    FieldSystem * unk_20;
     UnkStruct_ov101_021D5D90 * unk_24;
     u8 unk_28;
     Strbuf* unk_2C;
@@ -87,7 +87,7 @@ static u16 ov5_021F0E58(int param0);
 int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, UnkStruct_0205E884 *, UnkStruct_02061AB4 *);
 const int Unk_ov5_021FFA00[];
 
-void * ov5_021F08CC (UnkStruct_0203CDB0 * param0, u32 param1, int param2)
+void * ov5_021F08CC (FieldSystem * param0, u32 param1, int param2)
 {
     UnkStruct_ov5_021F08CC * v0 = Heap_AllocFromHeapAtEnd(param1, sizeof(UnkStruct_ov5_021F08CC));
 
@@ -101,7 +101,7 @@ void * ov5_021F08CC (UnkStruct_0203CDB0 * param0, u32 param1, int param2)
 
 BOOL ov5_021F08F8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov5_021F08CC * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -150,7 +150,7 @@ BOOL ov5_021F08F8 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-SysTask * ov5_021F09B4 (UnkStruct_0203CDB0 * param0, int param1, BOOL param2)
+SysTask * ov5_021F09B4 (FieldSystem * param0, int param1, BOOL param2)
 {
     SysTask * v0;
     UnkStruct_ov5_021F0D6C * v1 = ov5_021F0D1C(sizeof(UnkStruct_ov5_021F0D6C));
@@ -507,7 +507,7 @@ static int ov5_021F0D54 (void)
 
 static void ov5_021F0D6C (UnkStruct_ov5_021F0D6C * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_20;
+    FieldSystem * v0 = param0->unk_20;
 
     param0->unk_48 = MessageLoader_Init(1, 26, 213, 4);
     param0->unk_2C = Strbuf_Init(0x400, 4);
@@ -525,7 +525,7 @@ static void ov5_021F0DA4 (UnkStruct_ov5_021F0D6C * param0)
 
 static void ov5_021F0DC4 (UnkStruct_ov5_021F0D6C * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_20;
+    FieldSystem * v0 = param0->unk_20;
 
     sub_0205D8F4(v0->unk_08, &param0->unk_38, 3);
     sub_0205D944(&param0->unk_38, sub_02025E44(v0->unk_0C));
@@ -536,7 +536,7 @@ static void ov5_021F0DE8 (UnkStruct_ov5_021F0D6C * param0, u32 param1)
     ov5_021F0DC4(param0);
 
     {
-        UnkStruct_0203CDB0 * v0 = param0->unk_20;
+        FieldSystem * v0 = param0->unk_20;
 
         MessageLoader_GetStrbuf(param0->unk_48, param1, param0->unk_30);
         StringFormatter_Format(param0->unk_34, param0->unk_2C, param0->unk_30);
diff --git a/src/overlay005/ov5_021F0EB0.c b/src/overlay005/ov5_021F0EB0.c
index 2efebd6849..fbae7221f5 100644
--- a/src/overlay005/ov5_021F0EB0.c
+++ b/src/overlay005/ov5_021F0EB0.c
@@ -24,7 +24,7 @@ typedef struct {
     fx32 unk_20;
     u32 unk_24;
     fx32 unk_28;
-    UnkStruct_0203CDB0 * unk_2C;
+    FieldSystem * unk_2C;
     UnkStruct_020203AC * unk_30;
 } UnkStruct_ov5_021F0FB8;
 
@@ -36,7 +36,7 @@ static int ov5_021F0FF8(UnkStruct_ov5_021F0FB8 * param0);
 
 static void(*const Unk_ov5_0220020C[4])(UnkStruct_ov5_021F0FB8 *);
 
-SysTask * ov5_021F0EB0 (UnkStruct_0203CDB0 * param0, u32 param1)
+SysTask * ov5_021F0EB0 (FieldSystem * param0, u32 param1)
 {
     SysTask * v0;
     UnkStruct_ov5_021F0FB8 * v1 = Heap_AllocFromHeapAtEnd(param1, (sizeof(UnkStruct_ov5_021F0FB8)));
diff --git a/src/overlay005/ov5_021F101C.c b/src/overlay005/ov5_021F101C.c
index 67a9dd2a65..4b4249929f 100644
--- a/src/overlay005/ov5_021F101C.c
+++ b/src/overlay005/ov5_021F101C.c
@@ -22,7 +22,7 @@ typedef struct {
 
 BOOL ov5_021F101C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020711C8 * v1 = sub_02050A64(param0);
     int * v2 = sub_02050A68(param0);
     UnkStruct_ov5_021F101C * v3 = v1->unk_04;
diff --git a/src/overlay005/ov5_021F134C.c b/src/overlay005/ov5_021F134C.c
index 9042dff90f..46666da988 100644
--- a/src/overlay005/ov5_021F134C.c
+++ b/src/overlay005/ov5_021F134C.c
@@ -88,7 +88,7 @@ void ov5_021F1370 (void * param0)
 
 static void ov5_021F1388 (UnkStruct_ov5_021F1388 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = ov5_021DF574(param0->unk_20);
+    FieldSystem * v0 = ov5_021DF574(param0->unk_20);
     int v1 = sub_02062858(v0->unk_38) - 1;
     SysTask * v2 = SysTask_Start(ov5_021F1424, param0, v1);
 
diff --git a/src/overlay005/ov5_021F17B8.c b/src/overlay005/ov5_021F17B8.c
index dcabed5f31..64e917c07a 100644
--- a/src/overlay005/ov5_021F17B8.c
+++ b/src/overlay005/ov5_021F17B8.c
@@ -26,7 +26,7 @@ typedef struct {
 } UnkStruct_ov5_021F17E4;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F17E4 * unk_08;
     UnkStruct_02061AB4 * unk_0C;
@@ -45,7 +45,7 @@ typedef struct {
 } UnkStruct_ov5_021F1A24;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F17E4 * unk_08;
     UnkStruct_ov5_021DF84C unk_0C;
diff --git a/src/overlay005/ov5_021F25C0.c b/src/overlay005/ov5_021F25C0.c
index 1de9de1dfd..a9ccc20a7d 100644
--- a/src/overlay005/ov5_021F25C0.c
+++ b/src/overlay005/ov5_021F25C0.c
@@ -90,7 +90,7 @@ UnkStruct_ov101_021D5D90 * ov5_021F261C (UnkStruct_02061AB4 * param0, int param1
     v0.unk_0C = param0;
 
     if (param4 == 0) {
-        UnkStruct_0203CDB0 * v2 = sub_02062C00(param0);
+        FieldSystem * v2 = sub_02062C00(param0);
 
         v1.x = (((param1) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1));
         v1.z = (((param2) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1));
diff --git a/src/overlay005/ov5_021F2850.c b/src/overlay005/ov5_021F2850.c
index 265e62e350..0b793ad506 100644
--- a/src/overlay005/ov5_021F2850.c
+++ b/src/overlay005/ov5_021F2850.c
@@ -32,7 +32,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     UnkStruct_ov5_021F2874 * unk_0C;
     UnkStruct_02061AB4 * unk_10;
 } UnkStruct_ov5_021F28F4;
diff --git a/src/overlay005/ov5_021F2D20.c b/src/overlay005/ov5_021F2D20.c
index 4d06923443..dd923d866e 100644
--- a/src/overlay005/ov5_021F2D20.c
+++ b/src/overlay005/ov5_021F2D20.c
@@ -25,7 +25,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     int unk_08;
-    UnkStruct_0203CDB0 * unk_0C;
+    FieldSystem * unk_0C;
     UnkStruct_ov5_021DF47C * unk_10;
     UnkStruct_ov5_021F2D20 * unk_14;
     UnkStruct_02061AB4 * unk_18;
@@ -45,7 +45,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     UnkStruct_ov5_021DF47C * unk_0C;
     UnkStruct_ov5_021F2D20 * unk_10;
 } UnkStruct_021F30C4;
@@ -60,7 +60,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     UnkStruct_ov5_021DF47C * unk_0C;
     UnkStruct_ov5_021F2D20 * unk_10;
 } UnkStruct_021F3154;
@@ -396,7 +396,7 @@ static const UnkStruct_020217F4 Unk_ov5_02200570[] = {
     {0x0, 0x0, 0x2}
 };
 
-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)
 {
     VecFx32 v0;
     UnkStruct_021F3154 v1;
diff --git a/src/overlay005/ov5_021F3284.c b/src/overlay005/ov5_021F3284.c
index 40f63f01b3..bb2d0d6fad 100644
--- a/src/overlay005/ov5_021F3284.c
+++ b/src/overlay005/ov5_021F3284.c
@@ -21,7 +21,7 @@ typedef struct {
 } UnkStruct_ov5_021F32B0;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F32B0 * unk_08;
     UnkStruct_02061AB4 * unk_0C;
diff --git a/src/overlay005/ov5_021F348C.c b/src/overlay005/ov5_021F348C.c
index 0f34bbe483..49ae713304 100644
--- a/src/overlay005/ov5_021F348C.c
+++ b/src/overlay005/ov5_021F348C.c
@@ -23,7 +23,7 @@ typedef struct {
 } UnkStruct_ov5_021F34D0;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F34D0 * unk_08;
     UnkStruct_02061AB4 * unk_0C;
diff --git a/src/overlay005/ov5_021F37A8.c b/src/overlay005/ov5_021F37A8.c
index 46ae2b70c3..4e569c8dc2 100644
--- a/src/overlay005/ov5_021F37A8.c
+++ b/src/overlay005/ov5_021F37A8.c
@@ -25,7 +25,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     int unk_08;
-    UnkStruct_0203CDB0 * unk_0C;
+    FieldSystem * unk_0C;
     UnkStruct_ov5_021DF47C * unk_10;
     UnkStruct_ov5_021F37D4 * unk_14;
     UnkStruct_02061AB4 * unk_18;
diff --git a/src/overlay005/ov5_021F3A50.c b/src/overlay005/ov5_021F3A50.c
index 39583d3eb2..ed89c78528 100644
--- a/src/overlay005/ov5_021F3A50.c
+++ b/src/overlay005/ov5_021F3A50.c
@@ -25,7 +25,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     int unk_08;
-    UnkStruct_0203CDB0 * unk_0C;
+    FieldSystem * unk_0C;
     UnkStruct_ov5_021DF47C * unk_10;
     UnkStruct_ov5_021F3A7C * unk_14;
     UnkStruct_02061AB4 * unk_18;
diff --git a/src/overlay005/ov5_021F3D00.c b/src/overlay005/ov5_021F3D00.c
index 11782f1cb8..d6d5fd534f 100644
--- a/src/overlay005/ov5_021F3D00.c
+++ b/src/overlay005/ov5_021F3D00.c
@@ -100,7 +100,7 @@ UnkStruct_ov101_021D5D90 * ov5_021F3D90 (UnkStruct_02061AB4 * param0, int param1
     v3 = ov5_021DF578(param0);
 
     {
-        UnkStruct_0203CDB0 * v4 = ov5_021DF574(v3);
+        FieldSystem * v4 = ov5_021DF574(v3);
         int v5 = sub_02063020(param0);
         int v6 = sub_02063040(param0);
 
diff --git a/src/overlay005/ov5_021F3E74.c b/src/overlay005/ov5_021F3E74.c
index 41a33c7013..e188e7434f 100644
--- a/src/overlay005/ov5_021F3E74.c
+++ b/src/overlay005/ov5_021F3E74.c
@@ -22,7 +22,7 @@ typedef struct {
 } UnkStruct_ov5_021F3EA0;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F3EA0 * unk_08;
     UnkStruct_02061AB4 * unk_0C;
diff --git a/src/overlay005/ov5_021F4018.c b/src/overlay005/ov5_021F4018.c
index 422fdc703c..95e145ae7e 100644
--- a/src/overlay005/ov5_021F4018.c
+++ b/src/overlay005/ov5_021F4018.c
@@ -74,7 +74,7 @@ static void ov5_021F407C (UnkStruct_021F416C * param0)
     sub_02073AA8(&param0->unk_3C);
 }
 
-void ov5_021F4098 (UnkStruct_0203CDB0 * param0, int param1)
+void ov5_021F4098 (FieldSystem * param0, int param1)
 {
     int v0, v1;
     VecFx32 v2 = {0, 0, 0};
@@ -121,7 +121,7 @@ void ov5_021F4098 (UnkStruct_0203CDB0 * param0, int param1)
     }
 }
 
-void ov5_021F416C (UnkStruct_0203CDB0 * param0, int param1)
+void ov5_021F416C (FieldSystem * param0, int param1)
 {
     int v0, v1;
     UnkStruct_ov5_021DF47C * v2;
diff --git a/src/overlay005/ov5_021F428C.c b/src/overlay005/ov5_021F428C.c
index 34dae8d5b4..f1290d5de8 100644
--- a/src/overlay005/ov5_021F428C.c
+++ b/src/overlay005/ov5_021F428C.c
@@ -34,7 +34,7 @@ typedef struct {
     s16 unk_04;
     fx32 unk_08;
     UnkStruct_ov5_021F431C * unk_0C;
-    UnkStruct_0203CDB0 * unk_10;
+    FieldSystem * unk_10;
 } UnkStruct_ov5_021F440C;
 
 typedef struct {
@@ -67,7 +67,7 @@ typedef struct {
 
 static void ov5_021F431C(UnkStruct_ov5_021F431C * param0);
 static void ov5_021F4370(UnkStruct_ov5_021F431C * param0);
-static UnkStruct_ov101_021D5D90 ** ov5_021F439C(UnkStruct_0203CDB0 * param0, int param1, int param2, fx32 param3, int param4, UnkStruct_ov5_021F440C * param5);
+static UnkStruct_ov101_021D5D90 ** ov5_021F439C(FieldSystem * param0, int param1, int param2, fx32 param3, int param4, UnkStruct_ov5_021F440C * param5);
 static void ov5_021F440C(UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F4698 * param1);
 
 static const UnkStruct_ov101_021D86B0 Unk_ov5_0220070C;
@@ -151,7 +151,7 @@ static void ov5_021F4370 (UnkStruct_ov5_021F431C * param0)
     }
 }
 
-static UnkStruct_ov101_021D5D90 ** ov5_021F439C (UnkStruct_0203CDB0 * param0, int param1, int param2, fx32 param3, int param4, UnkStruct_ov5_021F440C * param5)
+static UnkStruct_ov101_021D5D90 ** ov5_021F439C (FieldSystem * param0, int param1, int param2, fx32 param3, int param4, UnkStruct_ov5_021F440C * param5)
 {
     int v0, v1;
     UnkStruct_ov5_021DF47C * v2;
@@ -206,7 +206,7 @@ static void ov5_021F440C (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F4
     sub_020715D4(param0, &v0);
 }
 
-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)
 {
     UnkStruct_ov5_021DF47C * v0;
     UnkStruct_ov101_021D5D90 ** v1;
@@ -338,7 +338,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_0220070C = {
     ov5_021F464C
 };
 
-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)
 {
     UnkStruct_ov5_021DF47C * v0;
     UnkStruct_ov101_021D5D90 ** v1;
diff --git a/src/overlay005/ov5_021F4E08.c b/src/overlay005/ov5_021F4E08.c
index eabfbc3f70..c54e9832d7 100644
--- a/src/overlay005/ov5_021F4E08.c
+++ b/src/overlay005/ov5_021F4E08.c
@@ -23,7 +23,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     UnkStruct_ov5_021DF47C * unk_0C;
     UnkStruct_ov5_021F4E38 * unk_10;
 } UnkStruct_ov5_021F4EAC;
@@ -86,7 +86,7 @@ static void ov5_021F4E94 (UnkStruct_ov5_021F4E38 * param0)
     }
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F4EAC (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)
 {
     int v0, v1;
     UnkStruct_ov5_021F4EAC v2;
@@ -120,7 +120,7 @@ UnkStruct_ov101_021D5D90 * ov5_021F4EAC (UnkStruct_0203CDB0 * param0, int param1
     return v5;
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F4F18 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4)
+UnkStruct_ov101_021D5D90 * ov5_021F4F18 (FieldSystem * param0, int param1, int param2, int param3, int param4)
 {
     UnkStruct_ov5_021F4F18 * v0;
     UnkStruct_ov101_021D5D90 * v1 = ov5_021F4EAC(param0, param1, param2, param3, param4);
diff --git a/src/overlay005/ov5_021F55CC.c b/src/overlay005/ov5_021F55CC.c
index a346976ced..65979c7f4f 100644
--- a/src/overlay005/ov5_021F55CC.c
+++ b/src/overlay005/ov5_021F55CC.c
@@ -70,7 +70,7 @@ static void ov5_021F5620 (UnkStruct_ov5_021F55F8 * param0)
     sub_02073AA8(&param0->unk_18);
 }
 
-void ov5_021F5634 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+void ov5_021F5634 (FieldSystem * param0, int param1, int param2, int param3)
 {
     int v0, v1;
     UnkStruct_ov5_021F5634 v2;
diff --git a/src/overlay005/ov5_021F575C.c b/src/overlay005/ov5_021F575C.c
index 8e0d3ab46b..ac9b011feb 100644
--- a/src/overlay005/ov5_021F575C.c
+++ b/src/overlay005/ov5_021F575C.c
@@ -69,7 +69,7 @@ static void ov5_021F57B4 (UnkStruct_021F5788 * param0)
     sub_02073AA8(&param0->unk_1C);
 }
 
-void ov5_021F57C8 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+void ov5_021F57C8 (FieldSystem * param0, int param1, int param2)
 {
     int v0, v1;
     UnkStruct_ov5_021F57C8 v2;
diff --git a/src/overlay005/ov5_021F5A10.c b/src/overlay005/ov5_021F5A10.c
index 22bef15918..d6ca13c62c 100644
--- a/src/overlay005/ov5_021F5A10.c
+++ b/src/overlay005/ov5_021F5A10.c
@@ -131,7 +131,7 @@ static void ov5_021F5A90 (UnkStruct_ov5_021F5A34 * param0, int param1)
     }
 }
 
-void ov5_021F5AA4 (UnkStruct_0203CDB0 * param0, BOOL param1)
+void ov5_021F5AA4 (FieldSystem * param0, BOOL param1)
 {
     UnkStruct_ov5_021F5A34 * v0 = ov5_021DF55C(param0->unk_40, 20);
 
diff --git a/src/overlay005/ov5_021F600C.c b/src/overlay005/ov5_021F600C.c
index 95b67ebc65..81a4a17c7d 100644
--- a/src/overlay005/ov5_021F600C.c
+++ b/src/overlay005/ov5_021F600C.c
@@ -21,7 +21,7 @@ typedef struct UnkStruct_ov5_021F600C_t {
 } UnkStruct_ov5_021F600C;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F600C * unk_08;
     UnkStruct_02061AB4 * unk_0C;
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index 04e0f1baa0..16e58ad172 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -69,7 +69,7 @@ typedef struct {
 } UnkStruct_ov5_02200C90;
 
 struct UnkStruct_ov5_021F6704_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     SysTask * unk_04;
     Window unk_08;
     Window * unk_18;
@@ -109,8 +109,8 @@ BOOL ov5_021F72B8(UnkStruct_0203E724 * param0);
 BOOL ov5_021F6B3C(UnkStruct_0203E724 * param0);
 BOOL ov5_021F6E50(UnkStruct_0203E724 * param0);
 static void ov5_021F661C(UnkStruct_ov5_021F6704 * param0, MessageLoader * param1);
-static void ov5_021F6624(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9, u16 * param10, u16 * param11);
-UnkStruct_ov5_021F6704 * ov5_021F6704(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8, u16 * param9, u16 * param10);
+static void ov5_021F6624(FieldSystem * param0, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9, u16 * param10, u16 * param11);
+UnkStruct_ov5_021F6704 * ov5_021F6704(FieldSystem * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8, u16 * param9, u16 * param10);
 void ov5_021F6760(UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param2, u32 param3);
 static void ov5_021F6768(UnkStruct_ov5_021F6704 * param0);
 static void ov5_021F6830(UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param2, u32 param3);
@@ -141,7 +141,7 @@ BOOL ov5_021F6454 (UnkStruct_0203E724 * param0)
     int v4, v5;
     MessageLoader * v6;
     MessageLoader * v7;
-    UnkStruct_0203CDB0 * v8 = param0->unk_34;
+    FieldSystem * v8 = param0->unk_34;
     UnkStruct_ov5_021F6704 * v9;
     StringFormatter ** v10 = sub_0203F098(v8, 15);
     u16 v11 = inline_02049538(param0);
@@ -192,7 +192,7 @@ BOOL ov5_021F6454 (UnkStruct_0203E724 * param0)
 
 static BOOL ov5_021F65D4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F118(v0, param0->unk_18[0]);
 
     if (*v1 == 0xeeee) {
@@ -219,7 +219,7 @@ static void ov5_021F661C (UnkStruct_ov5_021F6704 * param0, MessageLoader * param
     return;
 }
 
-static void ov5_021F6624 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9, u16 * param10, u16 * param11)
+static void ov5_021F6624 (FieldSystem * param0, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9, u16 * param10, u16 * param11)
 {
     int v0;
 
@@ -256,7 +256,7 @@ static void ov5_021F6624 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F6704 *
     return;
 }
 
-UnkStruct_ov5_021F6704 * ov5_021F6704 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8, u16 * param9, u16 * param10)
+UnkStruct_ov5_021F6704 * ov5_021F6704 (FieldSystem * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8, u16 * param9, u16 * param10)
 {
     UnkStruct_ov5_021F6704 * v0;
     int v1;
@@ -457,7 +457,7 @@ BOOL ov5_021F6B3C (UnkStruct_0203E724 * param0)
     u8 v0;
     u32 v1[6];
     Pokemon * v2;
-    UnkStruct_0203CDB0 * v3 = param0->unk_34;
+    FieldSystem * v3 = param0->unk_34;
     u16 v4 = inline_02049538(param0);
     u16 * v5 = inline_0204FCAC(param0);
     u16 * v6 = inline_0204FCAC(param0);
@@ -506,7 +506,7 @@ BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0)
     u32 v7;
     int v8[6];
     int v9 = 0;
-    UnkStruct_0203CDB0 * v10 = param0->unk_34;
+    FieldSystem * v10 = param0->unk_34;
     u16 * v11 = inline_0204FCAC(param0);
 
     v1 = Party_GetFromSavedata(v10->unk_0C);
@@ -572,7 +572,7 @@ BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0)
     u32 v4;
     int v5;
     int v6;
-    UnkStruct_0203CDB0 * v7 = param0->unk_34;
+    FieldSystem * v7 = param0->unk_34;
     u16 v8 = inline_02049538(param0);
     u16 * v9 = inline_0204FCAC(param0);
 
@@ -623,7 +623,7 @@ BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0)
 BOOL ov5_021F6E50 (UnkStruct_0203E724 * param0)
 {
     Pokemon * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
 
@@ -639,7 +639,7 @@ BOOL ov5_021F6E9C (UnkStruct_0203E724 * param0)
     int v3, v4, v5;
     Pokemon * v6;
     Party * v7;
-    UnkStruct_0203CDB0 * v8 = param0->unk_34;
+    FieldSystem * v8 = param0->unk_34;
     u16 * v9 = inline_0204FCAC(param0);
     u16 * v10 = inline_0204FCAC(param0);
 
@@ -673,7 +673,7 @@ BOOL ov5_021F6F44 (UnkStruct_0203E724 * param0)
     u16 v2, v3;
     Pokemon * v4;
     Party * v5;
-    UnkStruct_0203CDB0 * v6 = param0->unk_34;
+    FieldSystem * v6 = param0->unk_34;
     u16 v7 = inline_02049538(param0);
     u16 v8 = inline_02049538(param0);
     u16 v9 = inline_02049538(param0);
@@ -693,7 +693,7 @@ BOOL ov5_021F6FC0 (UnkStruct_0203E724 * param0)
     u16 v0;
     int v1, v2;
     Pokemon * v3;
-    UnkStruct_0203CDB0 * v4 = param0->unk_34;
+    FieldSystem * v4 = param0->unk_34;
     u16 v5 = inline_02049538(param0);
     u16 * v6 = inline_0204FCAC(param0);
 
@@ -764,7 +764,7 @@ BOOL ov5_021F71B8 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0202783C * v0;
     Pokemon * v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
 
     v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v2->unk_0C), 0);
     v0 = sub_0202783C(v2->unk_0C);
@@ -778,7 +778,7 @@ BOOL ov5_021F7208 (UnkStruct_0203E724 * param0)
     int v0, v1, v2;
     UnkStruct_0202783C * v3;
     Pokemon * v4;
-    UnkStruct_0203CDB0 * v5 = param0->unk_34;
+    FieldSystem * v5 = param0->unk_34;
     u16 * v6 = inline_0204FCAC(param0);
     u16 * v7 = inline_0204FCAC(param0);
     u16 * v8 = inline_0204FCAC(param0);
@@ -797,7 +797,7 @@ BOOL ov5_021F7270 (UnkStruct_0203E724 * param0)
 {
     Pokemon * v0;
     Party * v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
     u16 v3 = inline_02049538(param0);
     u16 * v4 = inline_0204FCAC(param0);
 
@@ -812,7 +812,7 @@ BOOL ov5_021F72B8 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_020507E4 * v0;
     UnkStruct_0202CD88 * v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
     u16 v3 = inline_02049538(param0);
     u16 * v4 = inline_0204FCAC(param0);
 
@@ -987,7 +987,7 @@ BOOL ov5_021F7538 (UnkStruct_0203E724 * param0)
     VecFx32 v1;
     UnkStruct_020216E0 * v2;
     int v3 = 0;
-    UnkStruct_0203CDB0 * v4 = param0->unk_34;
+    FieldSystem * v4 = param0->unk_34;
     UnkStruct_02061830 * v5 = v4->unk_38;
     UnkStruct_02061AB4 * v6 = sub_0205EB3C(v4->unk_3C);
     UnkStruct_02061AB4 * v7;
@@ -1028,7 +1028,7 @@ BOOL ov5_021F7538 (UnkStruct_0203E724 * param0)
 BOOL ov5_021F7604 (UnkStruct_0203E724 * param0)
 {
     int v0 = 0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     UnkStruct_02061830 * v2 = v1->unk_38;
     UnkStruct_02061AB4 * v3 = sub_0205EB3C(v1->unk_3C);
     UnkStruct_02061AB4 * v4;
@@ -1066,7 +1066,7 @@ static void ov5_021F7654 (UnkStruct_02061AB4 * param0, int param1)
 BOOL ov5_021F76A0 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     UnkStruct_02061830 * v2 = v1->unk_38;
 
     v0 = sub_0206251C(v2, 32);
diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c
index a87a7c504b..373b162675 100644
--- a/src/overlay005/ov5_021F77A8.c
+++ b/src/overlay005/ov5_021F77A8.c
@@ -611,7 +611,7 @@ const MovesetMask sTeachableMovesets[MOVESET_MAX] = {
 };
 
 struct UnkStruct_ov5_021F7ED8_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     SysTask * unk_04;
     Window unk_08;
     Window * unk_18;
@@ -650,8 +650,8 @@ static u16 ov5_021F7A4C(u16 param0);
 static u8 ReadMovesetMaskByte(Pokemon * param0, u8 param1);
 static u16 ov5_021F7B60(Pokemon * param0, u16 param1);
 static void ov5_021F7E10(UnkStruct_ov5_021F7ED8 * param0, MessageLoader * param1);
-static void ov5_021F7E18(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9);
-UnkStruct_ov5_021F7ED8 * ov5_021F7ED8(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8);
+static void ov5_021F7E18(FieldSystem * param0, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9);
+UnkStruct_ov5_021F7ED8 * ov5_021F7ED8(FieldSystem * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8);
 void ov5_021F7F2C(UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param2, u32 param3);
 static void ov5_021F7F34(UnkStruct_ov5_021F7ED8 * param0);
 static void ov5_021F7FF8(UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param2, u32 param3);
@@ -892,7 +892,7 @@ BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0)
     Pokemon * v6;
     MessageLoader * v7;
     MessageLoader * v8;
-    UnkStruct_0203CDB0 * v9 = param0->unk_34;
+    FieldSystem * v9 = param0->unk_34;
     UnkStruct_ov5_021F7ED8 * v10;
     u16 v11[4];
     u16 v12[(NELEMS(sTeachableMoves))];
@@ -970,7 +970,7 @@ BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0)
 
 static BOOL ov5_021F7DE8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F118(v0, param0->unk_18[0]);
 
     if (*v1 == 0xeeee) {
@@ -986,7 +986,7 @@ static void ov5_021F7E10 (UnkStruct_ov5_021F7ED8 * param0, MessageLoader * param
     return;
 }
 
-static void ov5_021F7E18 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9)
+static void ov5_021F7E18 (FieldSystem * param0, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringFormatter * param7, Window * param8, MessageLoader * param9)
 {
     int v0;
 
@@ -1019,7 +1019,7 @@ static void ov5_021F7E18 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F7ED8 *
     return;
 }
 
-UnkStruct_ov5_021F7ED8 * ov5_021F7ED8 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8)
+UnkStruct_ov5_021F7ED8 * ov5_021F7ED8 (FieldSystem * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8)
 {
     UnkStruct_ov5_021F7ED8 * v0;
     int v1;
@@ -1193,7 +1193,7 @@ static void ov5_021F8250 (UnkStruct_ov5_021F7ED8 * param0)
 
 BOOL ov5_021F82B8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     UnkStruct_ov5_021DC1A4 ** v2 = sub_0203F098(v0, 0);
     u8 v3 = (*((param0)->unk_08++));
@@ -1209,7 +1209,7 @@ BOOL ov5_021F82B8 (UnkStruct_0203E724 * param0)
 
 BOOL ov5_021F8358 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
 
     ov5_021DD3A8(*v1);
diff --git a/src/overlay005/ov5_021F8370.c b/src/overlay005/ov5_021F8370.c
index abbf55563a..af4d275d4c 100644
--- a/src/overlay005/ov5_021F8370.c
+++ b/src/overlay005/ov5_021F8370.c
@@ -46,20 +46,20 @@ typedef struct {
 } UnkStruct_ov5_021F8480_sub1;
 
 struct UnkStruct_ov5_021F8480_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_02071C34 * unk_04;
     UnkStruct_ov5_021F8480_sub1 unk_08[23];
 };
 
 static void ov5_021F8480(UnkStruct_ov5_021F8480 * param0, const u32 param1);
-static BOOL ov5_021F8508(UnkStruct_0203CDB0 * param0, u32 param1);
-static BOOL ov5_021F851C(int param0, int param1, const UnkStruct_ov5_0220192C * param2, UnkStruct_0203CDB0 * param3);
+static BOOL ov5_021F8508(FieldSystem * param0, u32 param1);
+static BOOL ov5_021F851C(int param0, int param1, const UnkStruct_ov5_0220192C * param2, FieldSystem * param3);
 
 static const UnkStruct_ov5_0220192C Unk_ov5_0220192C[23];
 static const u32 Unk_ov5_0220188C[20];
 static const UnkStruct_ov5_022018DC Unk_ov5_022018DC[20];
 
-void ov5_021F8370 (UnkStruct_0203CDB0 * param0)
+void ov5_021F8370 (FieldSystem * param0)
 {
     int v0;
     UnkStruct_02027860 * v1;
@@ -88,7 +88,7 @@ void ov5_021F8370 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void ov5_021F83C0 (UnkStruct_0203CDB0 * param0)
+void ov5_021F83C0 (FieldSystem * param0)
 {
     UnkStruct_ov5_021F8480 * v0 = param0->unk_04->unk_24;
 
@@ -96,7 +96,7 @@ void ov5_021F83C0 (UnkStruct_0203CDB0 * param0)
     param0->unk_04->unk_24 = NULL;
 }
 
-BOOL ov5_021F83D4 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
+BOOL ov5_021F83D4 (FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
 {
     int v0;
     const UnkStruct_ov5_021F83D4 * v1;
@@ -113,7 +113,7 @@ BOOL ov5_021F83D4 (UnkStruct_0203CDB0 * param0, const int param1, const int para
     return 0;
 }
 
-BOOL ov5_021F8410 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const int param3)
+BOOL ov5_021F8410 (FieldSystem * param0, const int param1, const int param2, const int param3)
 {
     UnkStruct_02027860 * v0 = sub_02027860(sub_0203D174(param0));
 
@@ -148,7 +148,7 @@ static void ov5_021F8480 (UnkStruct_ov5_021F8480 * param0, const u32 param1)
     VecFx32 v3 = {0, 0, 0};
     int v4 = Unk_ov5_0220188C[param1];
     const UnkStruct_ov5_0220192C * v5 = Unk_ov5_0220192C;
-    UnkStruct_0203CDB0 * v6 = param0->unk_00;
+    FieldSystem * v6 = param0->unk_00;
 
     for (v0 = 0; v0 < 23; v0++, v5++) {
         if (v5->unk_00 == param1) {
@@ -171,12 +171,12 @@ static void ov5_021F8480 (UnkStruct_ov5_021F8480 * param0, const u32 param1)
     }
 }
 
-static BOOL ov5_021F8508 (UnkStruct_0203CDB0 * param0, u32 param1)
+static BOOL ov5_021F8508 (FieldSystem * param0, u32 param1)
 {
     return sub_0206AF6C(SaveData_Events(param0->unk_0C), 2, param1);
 }
 
-static BOOL ov5_021F851C (int param0, int param1, const UnkStruct_ov5_0220192C * param2, UnkStruct_0203CDB0 * param3)
+static BOOL ov5_021F851C (int param0, int param1, const UnkStruct_ov5_0220192C * param2, FieldSystem * param3)
 {
     const UnkStruct_ov5_021F83D4 * v0 = &param2->unk_10;
 
diff --git a/src/overlay005/ov5_021F8560.c b/src/overlay005/ov5_021F8560.c
index a5508f3230..e92b0aac18 100644
--- a/src/overlay005/ov5_021F8560.c
+++ b/src/overlay005/ov5_021F8560.c
@@ -110,7 +110,7 @@ UnkStruct_ov101_021D5D90 * ov5_021F85BC (UnkStruct_0205E884 * param0, int param1
     v4.unk_14 = param0;
 
     if (param5 == 0) {
-        UnkStruct_0203CDB0 * v6 = sub_02062C00(v5);
+        FieldSystem * v6 = sub_02062C00(v5);
 
         v2 = &Unk_ov5_02201BC8[param6];
         v3.x = (((param1) << 4) * FX32_ONE) + v2->x;
diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c
index 58eb4eab19..a1bcb60231 100644
--- a/src/overlay006/ov6_0223E140.c
+++ b/src/overlay006/ov6_0223E140.c
@@ -52,7 +52,7 @@
 void include_unk_ov6_02248F30();
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_02099F80 unk_04;
     UnkStruct_ov5_021E20E8 * unk_2C;
     int unk_30;
@@ -139,7 +139,7 @@ typedef struct {
     fx32 unk_E0;
     UnkStruct_ov6_0223FD0C unk_E4;
     UnkStruct_ov6_0223FD0C unk_F4;
-    UnkStruct_0203CDB0 * unk_104;
+    FieldSystem * unk_104;
     UnkStruct_02061AB4 * unk_108;
     UnkStruct_02061AB4 * unk_10C;
     UnkStruct_02061AB4 * unk_110;
@@ -183,7 +183,7 @@ typedef struct {
 } UnkStruct_ov6_022400A8_sub1;
 
 typedef struct UnkStruct_ov6_022400A8_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_ov6_0223E140 unk_04;
     UnkStruct_ov6_022400A8_sub1 unk_40;
     NNSFndAllocator unk_11C;
@@ -217,7 +217,7 @@ typedef struct {
 
 typedef struct UnkStruct_ov6_022401B8_t {
     u32 unk_00;
-    UnkStruct_0203CDB0 * unk_04;
+    FieldSystem * unk_04;
     UnkStruct_ov6_02240240 unk_08;
     UnkStruct_ov6_02240260 unk_34;
     NNSFndAllocator unk_10C;
@@ -256,7 +256,7 @@ typedef struct UnkStruct_ov6_02240C44_t {
     UnkStruct_02017294 unk_00;
     UnkStruct_020170F4 unk_78;
     UnkStruct_02017248 unk_88[4];
-    UnkStruct_0203CDB0 * unk_D8;
+    FieldSystem * unk_D8;
     NNSFndAllocator unk_DC;
 } UnkStruct_ov6_02240C44;
 
@@ -297,7 +297,7 @@ static void ov6_0223FF7C(UnkStruct_ov6_0223FDE4 * param0);
 static BOOL ov6_0223FFC8(UnkStruct_ov6_0223FDE4 * param0);
 static void ov6_0223FFE4(UnkStruct_ov6_0223FDE4 * param0, fx32 param1, fx32 param2);
 static void ov6_02240064(SysTask * param0, void * param1);
-static void ov6_02240240(UnkStruct_ov6_02240240 * param0, UnkStruct_0203CDB0 * param1, u32 param2);
+static void ov6_02240240(UnkStruct_ov6_02240240 * param0, FieldSystem * param1, u32 param2);
 static void ov6_02240260(UnkStruct_ov6_02240260 * param0, u32 param1, NNSFndAllocator * param2);
 static void ov6_022402E4(UnkStruct_ov6_02240260 * param0, fx32 param1, fx32 param2, fx32 param3);
 static void ov6_02240340(UnkStruct_ov6_02240260 * param0, NNSFndAllocator * param1);
@@ -496,7 +496,7 @@ static void ov6_0223E2FC (SysTask * param0, void * param1)
     SysTask_Done(param0);
 }
 
-static void ov6_0223E318 (UnkStruct_0203CDB0 * param0, u32 param1, BOOL param2)
+static void ov6_0223E318 (FieldSystem * param0, u32 param1, BOOL param2)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -511,7 +511,7 @@ static void ov6_0223E318 (UnkStruct_0203CDB0 * param0, u32 param1, BOOL param2)
 
 static BOOL ov6_0223E33C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov6_0223E33C * v1 = sub_02050A64(param0);
 
     switch (v1->unk_0C) {
@@ -533,7 +533,7 @@ static BOOL ov6_0223E33C (UnkStruct_020508D4 * param0)
 
 void ov6_0223E384 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov6_0223E33C * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C));
 
     memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C));
@@ -561,7 +561,7 @@ static void ov6_0223E3D8 (UnkStruct_ov6_0223E33C * param0)
 
 static BOOL ov6_0223E408 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov6_0223E33C * v1 = sub_02050A64(param0);
 
     switch (v1->unk_0C) {
@@ -620,7 +620,7 @@ static BOOL ov6_0223E408 (UnkStruct_020508D4 * param0)
 
 void ov6_0223E4EC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov6_0223E33C * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C));
 
     memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C));
@@ -632,7 +632,7 @@ void ov6_0223E4EC (UnkStruct_020508D4 * param0)
     sub_02050944(param0, ov6_0223E408, v1);
 }
 
-static void ov6_0223E548 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E548 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E548 * v0 = param2;
 
@@ -642,13 +642,13 @@ static void ov6_0223E548 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     v0->unk_00 = 0;
 }
 
-static void ov6_0223E568 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E568 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E548 * v0 = param2;
     ov6_022401B8(v0->unk_48);
 }
 
-static void ov6_0223E574 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E574 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E548 * v0 = param2;
     BOOL v1[2];
@@ -745,7 +745,7 @@ static void ov6_0223E574 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-static void ov6_0223E6D4 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E6D4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E548 * v0 = param2;
 
@@ -756,7 +756,7 @@ static void ov6_0223E6D4 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-UnkStruct_ov5_021D1BEC * ov6_0223E6EC (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov6_0223E6EC (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -833,7 +833,7 @@ static BOOL ov6_0223E71C (UnkStruct_ov6_0223E71C * param0)
     return 0;
 }
 
-static void ov6_0223E7B4 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E7B4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E7B4 * v0 = param2;
     UnkStruct_02061AB4 * v1;
@@ -850,25 +850,25 @@ static void ov6_0223E7B4 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     ov6_0224077C(v0->unk_00, v2, v3, v4);
 }
 
-static void ov6_0223E7F0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E7F0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E7B4 * v0 = param2;
     ov6_02240774(v0->unk_00);
 }
 
-static void ov6_0223E7FC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E7FC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E7B4 * v0 = param2;
     ov6_022407A8(v0->unk_00);
 }
 
-static void ov6_0223E808 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E808 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E7B4 * v0 = param2;
     ov6_022407B0(v0->unk_00);
 }
 
-UnkStruct_ov5_021D1BEC * ov6_0223E814 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov6_0223E814 (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -889,7 +889,7 @@ void ov6_0223E828 (UnkStruct_ov5_021D1BEC * param0)
     ov5_021D1BEC(param0);
 }
 
-static void ov6_0223E830 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E830 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E830 * v0 = param2;
     VecFx32 v1;
@@ -932,7 +932,7 @@ static void ov6_0223E830 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     ov6_02240AEC(v0->unk_08, v1.x, v1.y, v1.z);
 }
 
-static void ov6_0223E8D0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E8D0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E830 * v0 = param2;
     VecFx32 v1;
@@ -966,7 +966,7 @@ static void ov6_0223E8D0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     ov6_02240B24(v0->unk_08, v1.x, v1.y, v1.z);
 }
 
-static void ov6_0223E984 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223E984 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E830 * v0 = param2;
     VecFx32 v1;
@@ -1000,7 +1000,7 @@ static void ov6_0223E984 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     ov6_02240B60(v0->unk_08, v1.x, v1.y, v1.z);
 }
 
-static void ov6_0223EA38 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223EA38 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E830 * v0 = param2;
 
@@ -1008,7 +1008,7 @@ static void ov6_0223EA38 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     ov6_02240AD4(v0->unk_08);
 }
 
-static void ov6_0223EA4C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223EA4C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E830 * v0 = param2;
 
@@ -1016,7 +1016,7 @@ static void ov6_0223EA4C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     ov6_02240ADC(v0->unk_08);
 }
 
-static void ov6_0223EA60 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223EA60 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E830 * v0 = param2;
 
@@ -1024,7 +1024,7 @@ static void ov6_0223EA60 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     ov6_02240AE4(v0->unk_08);
 }
 
-UnkStruct_ov5_021D1BEC * ov6_0223EA74 (UnkStruct_0203CDB0 * param0, u32 param1)
+UnkStruct_ov5_021D1BEC * ov6_0223EA74 (FieldSystem * param0, u32 param1)
 {
     static UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -1078,7 +1078,7 @@ static void ov6_0223EB34 (UnkStruct_ov6_0223EA98 * param0)
     sub_020171A0(&param0->unk_AC, &param0->unk_C0);
 }
 
-static void ov6_0223EB4C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223EB4C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223EA98 * v0 = param2;
 
@@ -1101,7 +1101,7 @@ static void ov6_0223EB4C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     v0->unk_00 = 0;
 }
 
-static void ov6_0223EBD0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223EBD0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223EA98 * v0 = param2;
     ov6_022400A8(v0->unk_08);
@@ -1598,7 +1598,7 @@ static BOOL ov6_0223F9F4 (UnkStruct_ov6_0223EA98 * param0)
     return 0;
 }
 
-static void ov6_0223FAF8 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223FAF8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223EA98 * v0 = param2;
     u32 v1[2];
@@ -1693,13 +1693,13 @@ static void ov6_0223FAF8 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-static void ov6_0223FCC0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0223FCC0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223EA98 * v0 = param2;
     ov6_022400C4(v0->unk_08);
 }
 
-UnkStruct_ov5_021D1BEC * ov6_0223FCCC (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov6_0223FCCC (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024, sizeof(UnkStruct_ov6_0223EA98), ov6_0223EB4C, ov6_0223EBD0, ov6_0223FAF8, ov6_0223FCC0
@@ -2024,7 +2024,7 @@ static void ov6_02240064 (SysTask * param0, void * param1)
     GX_SetMasterBrightness(v0->unk_00.unk_00);
 }
 
-UnkStruct_ov6_022400A8 * ov6_02240074 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov6_022400A8 * ov6_02240074 (FieldSystem * param0)
 {
     UnkStruct_ov6_022400A8 * v0;
 
@@ -2060,7 +2060,7 @@ void ov6_022400C4 (UnkStruct_ov6_022400A8 * param0)
     NNS_G3dGePopMtx(1);
 }
 
-UnkStruct_ov6_022401B8 * ov6_02240104 (u32 param0, UnkStruct_0203CDB0 * param1)
+UnkStruct_ov6_022401B8 * ov6_02240104 (u32 param0, FieldSystem * param1)
 {
     UnkStruct_ov6_022401B8 * v0;
 
@@ -2127,7 +2127,7 @@ void ov6_02240228 (UnkStruct_ov6_022401B8 * param0)
     ov6_02240600(&param0->unk_34);
 }
 
-static void ov6_02240240 (UnkStruct_ov6_02240240 * param0, UnkStruct_0203CDB0 * param1, u32 param2)
+static void ov6_02240240 (UnkStruct_ov6_02240240 * param0, FieldSystem * param1, u32 param2)
 {
     param0->unk_00 = sub_0206251C(param1->unk_38, param2);
     GF_ASSERT(param0->unk_00);
@@ -2790,7 +2790,7 @@ void include_unk_ov6_02248F30 (void)
     Unk_ov6_02248F30[0];
 }
 
-UnkStruct_ov6_02240C44 * ov6_02240B9C (u32 param0, UnkStruct_0203CDB0 * param1)
+UnkStruct_ov6_02240C44 * ov6_02240B9C (u32 param0, FieldSystem * param1)
 {
     UnkStruct_ov6_02240C44 * v0;
     int v1;
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index b28ad80472..64cd2083d8 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -80,33 +80,33 @@ typedef struct {
     const u8 * unk_04;
 } UnkStruct_ov6_02248FF0;
 
-static BOOL ov6_022417C8(UnkStruct_0203CDB0 * param0, const u32 param1, const u8 param2);
-static u8 ov6_02241874(UnkStruct_0203CDB0 * param0, u8 param1, u8 * param2);
-static BOOL ov6_022418B4(UnkStruct_0203CDB0 * param0, u32 param1);
-static BOOL ov6_022418DC(UnkStruct_0203CDB0 * param0, u32 param1);
+static BOOL ov6_022417C8(FieldSystem * param0, const u32 param1, const u8 param2);
+static u8 ov6_02241874(FieldSystem * param0, u8 param1, u8 * param2);
+static BOOL ov6_022418B4(FieldSystem * param0, u32 param1);
+static BOOL ov6_022418DC(FieldSystem * param0, u32 param1);
 static BOOL ov6_0224222C(Pokemon * param0, const UnkStruct_ov6_022422D0 * param1, const UnkStruct_ov6_0224222C * param2, const u8 param3, const u8 param4, const u8 param5, u8 * param6);
 static BOOL ov6_022422D0(const UnkStruct_ov6_022422D0 * param0, Pokemon * param1, const u8 param2);
-static int ov6_0224214C(UnkStruct_0203CDB0 * param0);
-static int ov6_02242158(UnkStruct_0203CDB0 * param0);
-static int ov6_02242164(UnkStruct_0203CDB0 * param0, const int param1);
-static BOOL ov6_02241674(UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6);
-static BOOL ov6_0224174C(UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4);
-static BOOL ov6_02241790(UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4);
-static BOOL ov6_022417AC(UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5);
+static int ov6_0224214C(FieldSystem * param0);
+static int ov6_02242158(FieldSystem * param0);
+static int ov6_02242164(FieldSystem * param0, const int param1);
+static BOOL ov6_02241674(FieldSystem * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6);
+static BOOL ov6_0224174C(FieldSystem * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4);
+static BOOL ov6_02241790(FieldSystem * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4);
+static BOOL ov6_022417AC(FieldSystem * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5);
 static BOOL ov6_02241DC4(Pokemon * param0, const int param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const u8 param4, const int param5, BattleParams * param6);
-static BOOL ov6_02241F7C(UnkStruct_0203CDB0 * param0, Pokemon * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, BattleParams * param5, const int param6, const int param7);
+static BOOL ov6_02241F7C(FieldSystem * param0, Pokemon * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, BattleParams * param5, const int param6, const int param7);
 static BOOL ov6_02241F2C(const int param0, const int param1, const int param2, const BOOL param3, const u32 param4, const UnkStruct_ov6_022422D0 * param5, Pokemon * param6, BattleParams * param7);
 static u8 ov6_0224226C(const BOOL param0, const u8 param1, const UnkStruct_ov6_022422D0 * param2, const u32 param3, Pokemon * param4);
-static void ov6_02242328(UnkStruct_0203CDB0 * param0, const BOOL param1, BattleParams ** param2);
-static void ov6_02242354(UnkStruct_0203CDB0 * param0, const BOOL param1, const BOOL param2, UnkStruct_ov6_0224222C * param3);
+static void ov6_02242328(FieldSystem * param0, const BOOL param1, BattleParams ** param2);
+static void ov6_02242354(FieldSystem * param0, const BOOL param1, const BOOL param2, UnkStruct_ov6_0224222C * param3);
 static BOOL ov6_02242388(const u8 param0, const UnkStruct_ov6_022422D0 * param1);
 static void ov6_0224239C(const u32 param0, UnkStruct_0206C638 * param1, BattleParams * param2);
-static BOOL ov6_02242440(UnkStruct_0203CDB0 * param0, UnkStruct_0206C638 ** param1);
+static BOOL ov6_02242440(FieldSystem * param0, UnkStruct_0206C638 ** param1);
 static BOOL ov6_02242514(const int param0, const UnkStruct_ov6_022422D0 * param1, Pokemon * param2, BattleParams * param3);
 static u8 ov6_022425D4(const UnkStruct_ov6_0224222C * param0, const UnkStruct_ov6_022422D0 * param1, const u8 param2);
-static void ov6_02242634(UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3);
+static void ov6_02242634(FieldSystem * param0, Pokemon * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3);
 static void ov6_02241A90(Pokemon * param0, u8 * param1);
-static void ov6_02241ABC(UnkStruct_0203CDB0 * param0, u8 * param1);
+static void ov6_02241ABC(FieldSystem * param0, u8 * param1);
 
 static const u8 Unk_ov6_02248FDC[] = {
     0x0,
@@ -186,7 +186,7 @@ void ov6_02240C9C (const UnkStruct_ov6_02242634 * param0, int * param1, int * pa
     }
 }
 
-static void ov6_02240CC8 (UnkStruct_0203CDB0 * param0, const UnkStruct_ov6_02242634 * param1, int * param2, int * param3)
+static void ov6_02240CC8 (FieldSystem * param0, const UnkStruct_ov6_02242634 * param1, int * param2, int * param3)
 {
     u32 v0;
     UnkStruct_0202D7B0 * v1;
@@ -203,7 +203,7 @@ static void ov6_02240CC8 (UnkStruct_0203CDB0 * param0, const UnkStruct_ov6_02242
     }
 }
 
-static void ov6_02240D00 (UnkStruct_0203CDB0 * param0, const BOOL param1, int * param2, int * param3)
+static void ov6_02240D00 (FieldSystem * param0, const BOOL param1, int * param2, int * param3)
 {
     int * v0;
     u16 v1, v2;
@@ -227,7 +227,7 @@ static void ov6_02240D00 (UnkStruct_0203CDB0 * param0, const BOOL param1, int *
     }
 }
 
-BOOL ov6_02240D5C (UnkStruct_0203CDB0 * param0)
+BOOL ov6_02240D5C (FieldSystem * param0)
 {
     BattleParams * v0;
     Pokemon * v1;
@@ -394,7 +394,7 @@ BOOL ov6_02240D5C (UnkStruct_0203CDB0 * param0)
     return v6;
 }
 
-BOOL ov6_0224106C (UnkStruct_0203CDB0 * param0, const int param1, BattleParams ** param2)
+BOOL ov6_0224106C (FieldSystem * param0, const int param1, BattleParams ** param2)
 {
     Pokemon * v0;
     Party * v1;
@@ -482,7 +482,7 @@ BOOL ov6_0224106C (UnkStruct_0203CDB0 * param0, const int param1, BattleParams *
     return 1;
 }
 
-BOOL ov6_022411C8 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1)
+BOOL ov6_022411C8 (FieldSystem * param0, UnkStruct_020508D4 * param1)
 {
     BattleParams * v0;
     Pokemon * v1;
@@ -605,7 +605,7 @@ BOOL ov6_022411C8 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1)
     return 1;
 }
 
-BOOL ov6_022413E4 (UnkStruct_0203CDB0 * param0, BattleParams ** param1)
+BOOL ov6_022413E4 (FieldSystem * param0, BattleParams ** param1)
 {
     Pokemon * v0;
     int v1, v2;
@@ -750,7 +750,7 @@ BOOL ov6_022413E4 (UnkStruct_0203CDB0 * param0, BattleParams ** param1)
     return v5;
 }
 
-static BOOL ov6_02241674 (UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6)
+static BOOL ov6_02241674 (FieldSystem * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6)
 {
     BOOL v0;
 
@@ -796,7 +796,7 @@ static BOOL ov6_02241674 (UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleP
     return v0;
 }
 
-static BOOL ov6_0224174C (UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4)
+static BOOL ov6_0224174C (FieldSystem * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4)
 {
     BOOL v0;
     {
@@ -814,7 +814,7 @@ static BOOL ov6_0224174C (UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleP
     return v0;
 }
 
-static BOOL ov6_02241790 (UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4)
+static BOOL ov6_02241790 (FieldSystem * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4)
 {
     BOOL v0;
 
@@ -825,7 +825,7 @@ static BOOL ov6_02241790 (UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleP
     return v0;
 }
 
-static BOOL ov6_022417AC (UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5)
+static BOOL ov6_022417AC (FieldSystem * param0, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5)
 {
     BOOL v0;
 
@@ -833,7 +833,7 @@ static BOOL ov6_022417AC (UnkStruct_0203CDB0 * param0, Pokemon * param1, BattleP
     return v0;
 }
 
-static BOOL ov6_022417C8 (UnkStruct_0203CDB0 * param0, const u32 param1, const u8 param2)
+static BOOL ov6_022417C8 (FieldSystem * param0, const u32 param1, const u8 param2)
 {
     u8 v0;
     u32 v1;
@@ -877,7 +877,7 @@ static BOOL ov6_022417C8 (UnkStruct_0203CDB0 * param0, const u32 param1, const u
     return 0;
 }
 
-static u8 ov6_02241874 (UnkStruct_0203CDB0 * param0, u8 param1, u8 * param2)
+static u8 ov6_02241874 (FieldSystem * param0, u8 param1, u8 * param2)
 {
     if (sub_0205DE6C(param1)) {
         if (sub_0205DB58(param1)) {
@@ -892,7 +892,7 @@ static u8 ov6_02241874 (UnkStruct_0203CDB0 * param0, u8 param1, u8 * param2)
     return 0;
 }
 
-static BOOL ov6_022418B4 (UnkStruct_0203CDB0 * param0, u32 param1)
+static BOOL ov6_022418B4 (FieldSystem * param0, u32 param1)
 {
     param1 = (param1 / 10) >> 8;
 
@@ -909,7 +909,7 @@ static BOOL ov6_022418B4 (UnkStruct_0203CDB0 * param0, u32 param1)
     return 0;
 }
 
-static BOOL ov6_022418DC (UnkStruct_0203CDB0 * param0, u32 param1)
+static BOOL ov6_022418DC (FieldSystem * param0, u32 param1)
 {
     if (inline_020564D0(100) >= param1) {
         return 0;
@@ -1061,7 +1061,7 @@ static void ov6_02241A90 (Pokemon * param0, u8 * param1)
     }
 }
 
-static void ov6_02241ABC (UnkStruct_0203CDB0 * param0, u8 * param1)
+static void ov6_02241ABC (FieldSystem * param0, u8 * param1)
 {
     u8 v0;
 
@@ -1326,7 +1326,7 @@ static BOOL ov6_02241F2C (const int param0, const int param1, const int param2,
     return 1;
 }
 
-static BOOL ov6_02241F7C (UnkStruct_0203CDB0 * param0, Pokemon * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, BattleParams * param5, const int param6, const int param7)
+static BOOL ov6_02241F7C (FieldSystem * param0, Pokemon * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, BattleParams * param5, const int param6, const int param7)
 {
     u8 v0;
     u8 v1 = 0;
@@ -1363,7 +1363,7 @@ static BOOL ov6_02241F7C (UnkStruct_0203CDB0 * param0, Pokemon * param1, const U
     return 1;
 }
 
-void ov6_02242034 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
+void ov6_02242034 (FieldSystem * param0, BattleParams * param1)
 {
     Pokemon * v0;
     int v1;
@@ -1404,7 +1404,7 @@ void ov6_02242034 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
     return;
 }
 
-void ov6_022420D4 (UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, BattleParams * param3)
+void ov6_022420D4 (FieldSystem * param0, u16 param1, u8 param2, BattleParams * param3)
 {
     Pokemon * v0;
     UnkStruct_ov6_022422D0 v1;
@@ -1422,7 +1422,7 @@ void ov6_022420D4 (UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, BattlePar
     return;
 }
 
-BOOL ov6_02242110 (UnkStruct_0203CDB0 * param0, u8 param1)
+BOOL ov6_02242110 (FieldSystem * param0, u8 param1)
 {
     int v0 = 0;
 
@@ -1441,7 +1441,7 @@ BOOL ov6_02242110 (UnkStruct_0203CDB0 * param0, u8 param1)
     }
 }
 
-static int ov6_0224214C (UnkStruct_0203CDB0 * param0)
+static int ov6_0224214C (FieldSystem * param0)
 {
     UnkStruct_ov6_02242634 * v0;
 
@@ -1449,7 +1449,7 @@ static int ov6_0224214C (UnkStruct_0203CDB0 * param0)
     return v0->unk_00;
 }
 
-static int ov6_02242158 (UnkStruct_0203CDB0 * param0)
+static int ov6_02242158 (FieldSystem * param0)
 {
     UnkStruct_ov6_02242634 * v0;
 
@@ -1457,7 +1457,7 @@ static int ov6_02242158 (UnkStruct_0203CDB0 * param0)
     return v0->unk_A8;
 }
 
-static int ov6_02242164 (UnkStruct_0203CDB0 * param0, const int param1)
+static int ov6_02242164 (FieldSystem * param0, const int param1)
 {
     UnkStruct_ov6_02242634 * v0;
 
@@ -1581,7 +1581,7 @@ static BOOL ov6_022422D0 (const UnkStruct_ov6_022422D0 * param0, Pokemon * param
     return 0;
 }
 
-static void ov6_02242328 (UnkStruct_0203CDB0 * param0, const BOOL param1, BattleParams ** param2)
+static void ov6_02242328 (FieldSystem * param0, const BOOL param1, BattleParams ** param2)
 {
     if (!param1) {
         (*param2) = sub_02051D8C(11, (0x0 | 0x0));
@@ -1591,7 +1591,7 @@ static void ov6_02242328 (UnkStruct_0203CDB0 * param0, const BOOL param1, Battle
     }
 }
 
-static void ov6_02242354 (UnkStruct_0203CDB0 * param0, const BOOL param1, const BOOL param2, UnkStruct_ov6_0224222C * param3)
+static void ov6_02242354 (FieldSystem * param0, const BOOL param1, const BOOL param2, UnkStruct_ov6_0224222C * param3)
 {
     if (param1) {
         ov6_02242F74(sub_0202D814(sub_0202D834(param0->unk_0C), 1), param2, param0->unk_1C->unk_00, &param3[6].unk_00, &param3[7].unk_00);
@@ -1639,7 +1639,7 @@ static void ov6_0224239C (const u32 param0, UnkStruct_0206C638 * param1, BattleP
     Heap_FreeToHeap(v7);
 }
 
-static BOOL ov6_02242440 (UnkStruct_0203CDB0 * param0, UnkStruct_0206C638 ** param1)
+static BOOL ov6_02242440 (FieldSystem * param0, UnkStruct_0206C638 ** param1)
 {
     UnkStruct_0202D7B0 * v0;
     UnkStruct_0206C638 * v1[6];
@@ -1756,7 +1756,7 @@ static u8 ov6_022425D4 (const UnkStruct_ov6_0224222C * param0, const UnkStruct_o
     return param2;
 }
 
-static void ov6_02242634 (UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3)
+static void ov6_02242634 (FieldSystem * param0, Pokemon * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3)
 {
     if (Pokemon_GetValue(param1, MON_DATA_IS_EGG, NULL) == 0) {
         param3->unk_0D = 0;
diff --git a/src/overlay006/ov6_02242984.c b/src/overlay006/ov6_02242984.c
index bc42148564..27f27b8e99 100644
--- a/src/overlay006/ov6_02242984.c
+++ b/src/overlay006/ov6_02242984.c
@@ -28,11 +28,11 @@ typedef struct {
 typedef struct UnkStruct_ov6_02242A8C_t {
     UnkStruct_ov6_02242A10 unk_00[6];
     UnkStruct_02049FA8 unk_18;
-    UnkStruct_0203CDB0 * unk_2C;
+    FieldSystem * unk_2C;
     int unk_30;
 } UnkStruct_ov6_02242A8C;
 
-int ov6_02242984 (UnkStruct_0203CDB0 * param0)
+int ov6_02242984 (FieldSystem * param0)
 {
     u8 v0;
     BOOL v1;
@@ -54,7 +54,7 @@ int ov6_02242984 (UnkStruct_0203CDB0 * param0)
     return v2[inline_020564D0(12)];
 }
 
-UnkStruct_ov6_02242A8C * ov6_02242A10 (const int param0, UnkStruct_0203CDB0 * param1)
+UnkStruct_ov6_02242A8C * ov6_02242A10 (const int param0, FieldSystem * param1)
 {
     u8 v0;
     UnkStruct_ov6_02242A8C * v1;
diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c
index f4018e91d7..98fbfa56ac 100644
--- a/src/overlay006/ov6_02242AF0.c
+++ b/src/overlay006/ov6_02242AF0.c
@@ -24,7 +24,7 @@
 
 typedef struct UnkStruct_ov6_02242B58_t UnkStruct_ov6_02242B58;
 
-typedef BOOL (* UnkFuncPtr_ov6_02242B58)(UnkStruct_0203CDB0 *, UnkStruct_ov6_02242B58 *, const fx32 *, VecFx32 *);
+typedef BOOL (* UnkFuncPtr_ov6_02242B58)(FieldSystem *, UnkStruct_ov6_02242B58 *, const fx32 *, VecFx32 *);
 
 typedef struct UnkStruct_ov6_02242B58_t {
     UnkFuncPtr_ov6_02242B58 unk_00;
@@ -38,8 +38,8 @@ typedef struct UnkStruct_ov6_02242B58_t {
 } UnkStruct_ov6_02242B58;
 
 static BOOL ov6_02242C5C(UnkStruct_020508D4 * param0);
-static BOOL ov6_02242D94(UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3);
-static BOOL ov6_02242E60(UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3);
+static BOOL ov6_02242D94(FieldSystem * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3);
+static BOOL ov6_02242E60(FieldSystem * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3);
 
 static const int Unk_ov6_02249058[7] = {
     0x4,
@@ -81,7 +81,7 @@ static const fx32 Unk_ov6_02249074[] = {
     FX32_ONE / 2
 };
 
-void ov6_02242AF0 (UnkStruct_0203CDB0 * param0)
+void ov6_02242AF0 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_ov6_02242AF0 * v1;
@@ -108,7 +108,7 @@ void ov6_02242AF0 (UnkStruct_0203CDB0 * param0)
     ov5_021E19CC(param0->unk_A4, param0->unk_30, 475, &v2, NULL, param0->unk_50);
 }
 
-void ov6_02242B58 (UnkStruct_0203CDB0 * param0, const u16 param1, const u16 param2)
+void ov6_02242B58 (FieldSystem * param0, const u16 param1, const u16 param2)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_ov6_02242AF0 * v1;
@@ -178,7 +178,7 @@ void ov6_02242B58 (UnkStruct_0203CDB0 * param0, const u16 param1, const u16 para
     sub_02050944(param0->unk_10, ov6_02242C5C, v2);
 }
 
-u32 ov6_02242C3C (UnkStruct_0203CDB0 * param0, const u16 param1)
+u32 ov6_02242C3C (FieldSystem * param0, const u16 param1)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_ov6_02242AF0 * v1;
@@ -195,7 +195,7 @@ u32 ov6_02242C3C (UnkStruct_0203CDB0 * param0, const u16 param1)
 
 static BOOL ov6_02242C5C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov6_02242B58 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_05) {
@@ -256,7 +256,7 @@ static BOOL ov6_02242C5C (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static BOOL ov6_02242D94 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3)
+static BOOL ov6_02242D94 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3)
 {
     if (param1->unk_04 == 0) {
         param3->z -= Unk_ov6_02249074[param1->unk_06];
@@ -293,7 +293,7 @@ static BOOL ov6_02242D94 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02242B58 *
     }
 }
 
-static BOOL ov6_02242E60 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3)
+static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3)
 {
     UnkStruct_02061AB4 * v0;
     VecFx32 v1;
diff --git a/src/overlay006/ov6_02243004.c b/src/overlay006/ov6_02243004.c
index c2bb58e5a3..2c6074a093 100644
--- a/src/overlay006/ov6_02243004.c
+++ b/src/overlay006/ov6_02243004.c
@@ -11,7 +11,7 @@
 
 static UnkStruct_ov5_021D1BEC * Unk_ov6_02249940;
 
-BOOL ov6_02243004 (UnkStruct_0203CDB0 * param0, int param1)
+BOOL ov6_02243004 (FieldSystem * param0, int param1)
 {
     VecFx32 v0;
     UnkStruct_ov115_0226527C v1;
diff --git a/src/overlay006/ov6_022430C4.c b/src/overlay006/ov6_022430C4.c
index 4a79d702ed..855d9bfcc4 100644
--- a/src/overlay006/ov6_022430C4.c
+++ b/src/overlay006/ov6_022430C4.c
@@ -11,7 +11,7 @@
 
 static void ov6_022431A0(UnkStruct_020698E4 * param0, UnkStruct_ov6_022430E8 ** param1);
 
-int ov6_022430C4 (UnkStruct_0203CDB0 * param0)
+int ov6_022430C4 (FieldSystem * param0)
 {
     int v0;
     int v1;
@@ -29,7 +29,7 @@ int ov6_022430C4 (UnkStruct_0203CDB0 * param0)
     return v1;
 }
 
-int ov6_022430E8 (UnkStruct_0203CDB0 * param0, const u8 param1)
+int ov6_022430E8 (FieldSystem * param0, const u8 param1)
 {
     UnkStruct_020698E4 * v0;
     UnkStruct_ov6_022430E8 * v1[3];
@@ -42,7 +42,7 @@ int ov6_022430E8 (UnkStruct_0203CDB0 * param0, const u8 param1)
     return v1[param1]->unk_00;
 }
 
-int ov6_02243114 (UnkStruct_0203CDB0 * param0, const u8 param1)
+int ov6_02243114 (FieldSystem * param0, const u8 param1)
 {
     UnkStruct_020698E4 * v0;
     UnkStruct_ov6_022430E8 * v1[3];
@@ -54,12 +54,12 @@ int ov6_02243114 (UnkStruct_0203CDB0 * param0, const u8 param1)
     return v1[param1]->unk_02;
 }
 
-int ov6_02243140 (UnkStruct_0203CDB0 * param0)
+int ov6_02243140 (FieldSystem * param0)
 {
     return GetChainCount(param0);
 }
 
-int GetRadarSpecies (UnkStruct_0203CDB0 * param0) {
+int GetRadarSpecies (FieldSystem * param0) {
     int species, level;
 
     GetRadarMon(param0->chain, &species, &level);
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 30fec9a91a..a5f76224b7 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -68,7 +68,7 @@ typedef struct {
     fx32 unk_54;
     fx32 unk_58;
     Pokemon * unk_5C;
-    UnkStruct_0203CDB0 * unk_60;
+    FieldSystem * unk_60;
     NNSG2dScreenData * unk_64;
     NNSG2dCharacterData * unk_68;
     NNSG2dPaletteData * unk_6C;
@@ -177,7 +177,7 @@ typedef struct {
     int unk_08;
     int unk_0C;
     int unk_10;
-    UnkStruct_0203CDB0 * unk_14;
+    FieldSystem * unk_14;
     UnkStruct_ov6_02243258 unk_18;
     GraphicElementData * unk_1D0;
     UnkStruct_020711EC * unk_1D4;
@@ -187,7 +187,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_020711EC * unk_00;
-    UnkStruct_0203CDB0 * unk_04;
+    FieldSystem * unk_04;
     GraphicElementData * unk_08;
     UnkStruct_ov6_02243258 * unk_0C;
 } UnkStruct_ov6_02243888;
@@ -255,7 +255,7 @@ typedef struct {
     UnkStruct_ov6_02243FFC * unk_04;
 } UnkStruct_ov6_02245F80;
 
-static UnkStruct_ov6_02243FFC * ov6_02243FDC(UnkStruct_0203CDB0 * param0);
+static UnkStruct_ov6_02243FFC * ov6_02243FDC(FieldSystem * param0);
 static void ov6_02243FFC(UnkStruct_ov6_02243FFC * param0);
 static void ov6_02244004(SysTask * param0, void * param1);
 static void ov6_022443B8(SysTask * param0, void * param1);
@@ -318,7 +318,7 @@ static void ov6_02246018(UnkStruct_ov6_02243FFC * param0);
 static void ov6_02243F2C(void);
 static void ov6_02243F50(void);
 static void * ov6_02245F44(u32 param0, int param1);
-static void ov6_02243F74(UnkStruct_0203CDB0 * param0, int param1);
+static void ov6_02243F74(FieldSystem * param0, int param1);
 static void ov6_02245D10(SysTask * param0, void * param1);
 
 int(*const Unk_ov6_022492D8[])(UnkStruct_ov6_02243FFC *);
@@ -608,7 +608,7 @@ static GraphicElementData * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int p
 static const UnkStruct_ov101_021D86B0 Unk_ov6_0224925C;
 int(*const * const Unk_ov6_02249110[])(UnkStruct_ov6_02249110 *);
 
-static UnkStruct_ov101_021D5D90 * ov6_02243888 (UnkStruct_0203CDB0 * param0, UnkStruct_020711EC * param1, UnkStruct_ov6_02243258 * param2, GraphicElementData * param3)
+static UnkStruct_ov101_021D5D90 * ov6_02243888 (FieldSystem * param0, UnkStruct_020711EC * param1, UnkStruct_ov6_02243258 * param2, GraphicElementData * param3)
 {
     UnkStruct_ov101_021D5D90 * v0;
     VecFx32 v1 = {0, 0, 0};
@@ -1024,13 +1024,13 @@ static void ov6_02243F50 (void)
     sub_0200F174(0, 0, 0, 0x7fff, 6, 1, 4);
 }
 
-static void ov6_02243F74 (UnkStruct_0203CDB0 * param0, int param1)
+static void ov6_02243F74 (FieldSystem * param0, int param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_3C);
     sub_02062D64(v0, param1);
 }
 
-SysTask * ov6_02243F88 (UnkStruct_0203CDB0 * param0, u32 param1, Pokemon * param2, int param3)
+SysTask * ov6_02243F88 (FieldSystem * param0, u32 param1, Pokemon * param2, int param3)
 {
     SysTask * v0;
     UnkStruct_ov6_02243FFC * v1 = ov6_02243FDC(param0);
@@ -1062,7 +1062,7 @@ void ov6_02243FC8 (SysTask * param0)
     SysTask_Done(param0);
 }
 
-static UnkStruct_ov6_02243FFC * ov6_02243FDC (UnkStruct_0203CDB0 * param0)
+static UnkStruct_ov6_02243FFC * ov6_02243FDC (FieldSystem * param0)
 {
     UnkStruct_ov6_02243FFC * v0 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov6_02243FFC)));
 
@@ -2881,7 +2881,7 @@ static const UnkStruct_ov101_021D86B0 dummy_field_cutin = {
 
 int(*const Unk_ov6_02249270[])(UnkStruct_ov6_02249270 *);
 
-SysTask * ov6_02245CCC (UnkStruct_0203CDB0 * param0, int param1)
+SysTask * ov6_02245CCC (FieldSystem * param0, int param1)
 {
     UnkStruct_ov6_02249270 * v0 = ov6_02245F44(4, (sizeof(UnkStruct_ov6_02249270)));
 
diff --git a/src/overlay006/ov6_02246034.c b/src/overlay006/ov6_02246034.c
index 060cb79447..db4c975ba3 100644
--- a/src/overlay006/ov6_02246034.c
+++ b/src/overlay006/ov6_02246034.c
@@ -22,7 +22,7 @@
 static void ov6_02246110(UnkStruct_0202D7B0 * param0, const int param1);
 static UnkStruct_0206C638 * ov6_02246148(UnkStruct_0202D7B0 * param0, const int param1);
 
-void ov6_02246034 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
+void ov6_02246034 (FieldSystem * param0, BattleParams * param1)
 {
     u16 v0;
     u8 v1;
diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c
index 80c1488880..7f820b3975 100644
--- a/src/overlay006/ov6_02246184.c
+++ b/src/overlay006/ov6_02246184.c
@@ -101,7 +101,7 @@ u32 ov6_0224622C (const UnkStruct_ov6_02246204 * param0)
     return param0->unk_00->unk_4C;
 }
 
-void ov6_02246234 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2)
+void ov6_02246234 (FieldSystem * param0, UnkStruct_ov6_02246204 * param1, int param2)
 {
     Party * v0 = Party_GetFromSavedata(param0->unk_0C);
 
@@ -109,7 +109,7 @@ void ov6_02246234 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1,
     sub_0202F180(param0->unk_0C, param1->unk_04);
 }
 
-void ov6_02246254 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, Pokemon * param4, Pokemon * param5)
+void ov6_02246254 (FieldSystem * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, Pokemon * param4, Pokemon * param5)
 {
     Party * v0 = Party_GetFromSavedata(param0->unk_0C);
     Pokemon * v1;
diff --git a/src/overlay006/ov6_02246444.c b/src/overlay006/ov6_02246444.c
index 7a26f8b9e6..507f4bdebf 100644
--- a/src/overlay006/ov6_02246444.c
+++ b/src/overlay006/ov6_02246444.c
@@ -90,7 +90,7 @@ int ov6_022464A4 (const UnkStruct_ov6_022465F4 * param0)
     return param0->unk_00;
 }
 
-static UnkStruct_ov6_022465F4 * ov6_022464A8 (UnkStruct_0203CDB0 * param0, UnkStruct_0202E794 * param1)
+static UnkStruct_ov6_022465F4 * ov6_022464A8 (FieldSystem * param0, UnkStruct_0202E794 * param1)
 {
     UnkStruct_ov6_022465F4 * v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4));
 
@@ -103,7 +103,7 @@ static UnkStruct_ov6_022465F4 * ov6_022464A8 (UnkStruct_0203CDB0 * param0, UnkSt
     return v0;
 }
 
-static UnkStruct_ov6_022465F4 * ov6_022464F8 (UnkStruct_0203CDB0 * param0, UnkStruct_0202E768 * param1)
+static UnkStruct_ov6_022465F4 * ov6_022464F8 (FieldSystem * param0, UnkStruct_0202E768 * param1)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(param0->unk_0C);
     UnkStruct_ov6_022465F4 * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4));
@@ -118,7 +118,7 @@ static UnkStruct_ov6_022465F4 * ov6_022464F8 (UnkStruct_0203CDB0 * param0, UnkSt
     return v1;
 }
 
-static UnkStruct_ov6_022465F4 * ov6_02246550 (UnkStruct_0203CDB0 * param0, int param1)
+static UnkStruct_ov6_022465F4 * ov6_02246550 (FieldSystem * param0, int param1)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(param0->unk_0C);
     UnkStruct_ov6_022465F4 * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4));
@@ -134,7 +134,7 @@ static UnkStruct_ov6_022465F4 * ov6_02246550 (UnkStruct_0203CDB0 * param0, int p
     return v1;
 }
 
-UnkStruct_ov6_022465F4 * ov6_022465A0 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+UnkStruct_ov6_022465F4 * ov6_022465A0 (FieldSystem * param0, int param1, int param2)
 {
     TVBroadcast * v0 = SaveData_TVBroadcast(param0->unk_0C);
 
diff --git a/src/overlay006/ov6_022465FC.c b/src/overlay006/ov6_022465FC.c
index 4e833ce5ff..f54daadfaa 100644
--- a/src/overlay006/ov6_022465FC.c
+++ b/src/overlay006/ov6_022465FC.c
@@ -39,13 +39,13 @@ static const UnkStruct_ov6_02249470 Unk_ov6_02249470[] = {
     {0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E}
 };
 
-void ov6_022465FC (UnkStruct_0203CDB0 * param0)
+void ov6_022465FC (FieldSystem * param0)
 {
     TVBroadcast * v0 = SaveData_TVBroadcast(param0->unk_0C);
     sub_0202E374(v0, 1);
 }
 
-int ov6_0224660C (UnkStruct_0203CDB0 * param0)
+int ov6_0224660C (FieldSystem * param0)
 {
     int v0;
     TVBroadcast * v1 = SaveData_TVBroadcast(param0->unk_0C);
@@ -67,7 +67,7 @@ int ov6_0224660C (UnkStruct_0203CDB0 * param0)
     return 3;
 }
 
-static int ov6_0224663C (UnkStruct_0203CDB0 * param0)
+static int ov6_0224663C (FieldSystem * param0)
 {
     u8 v0;
     u8 v1[7];
@@ -105,12 +105,12 @@ static void ov6_022466C8 (int param0, u8 * param1)
     NARC_ReadFromMemberByIndexPair(param1, NARC_INDEX_ARC__TV, 1, v1, sizeof(u8) * 11);
 }
 
-static BOOL ov6_022466E8 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+static BOOL ov6_022466E8 (FieldSystem * param0, int param1, int param2)
 {
     return 1;
 }
 
-static void ov6_022466EC (int param0, UnkStruct_0203CDB0 * param1, u8 * param2)
+static void ov6_022466EC (int param0, FieldSystem * param1, u8 * param2)
 {
     u8 v0[11];
     int v1, v2;
@@ -131,7 +131,7 @@ static void ov6_022466EC (int param0, UnkStruct_0203CDB0 * param1, u8 * param2)
     }
 }
 
-static int ov6_0224673C (UnkStruct_0203CDB0 * param0, const u8 * param1)
+static int ov6_0224673C (FieldSystem * param0, const u8 * param1)
 {
     u8 v0[11];
     int v1, v2;
@@ -176,7 +176,7 @@ static int ov6_0224678C (TVBroadcast * param0, int param1, int param2, BOOL para
     return 0;
 }
 
-static int ov6_022467DC (int param0, UnkStruct_0203CDB0 * param1, BOOL param2, BOOL param3, const u8 * param4, u8 * param5)
+static int ov6_022467DC (int param0, FieldSystem * param1, BOOL param2, BOOL param3, const u8 * param4, u8 * param5)
 {
     u8 v0[16];
     TVBroadcast * v1 = SaveData_TVBroadcast(param1->unk_0C);
@@ -199,7 +199,7 @@ static int ov6_022467DC (int param0, UnkStruct_0203CDB0 * param1, BOOL param2, B
     return v4;
 }
 
-static void ov6_02246844 (UnkStruct_0203CDB0 * param0, int param1, u8 * param2)
+static void ov6_02246844 (FieldSystem * param0, int param1, u8 * param2)
 {
     int v0;
     UnkStruct_ov6_022465F4 * v1;
@@ -215,7 +215,7 @@ static void ov6_02246844 (UnkStruct_0203CDB0 * param0, int param1, u8 * param2)
     }
 }
 
-static void ov6_02246884 (UnkStruct_0203CDB0 * param0, u8 * param1)
+static void ov6_02246884 (FieldSystem * param0, u8 * param1)
 {
     TVBroadcast * v0 = SaveData_TVBroadcast(param0->unk_0C);
 
@@ -228,7 +228,7 @@ static void ov6_02246884 (UnkStruct_0203CDB0 * param0, u8 * param1)
     }
 }
 
-int ov6_022468B0 (UnkStruct_0203CDB0 * param0, BOOL param1, BOOL param2)
+int ov6_022468B0 (FieldSystem * param0, BOOL param1, BOOL param2)
 {
     u8 v0[11];
     u8 v1[16];
@@ -258,7 +258,7 @@ int ov6_022468B0 (UnkStruct_0203CDB0 * param0, BOOL param1, BOOL param2)
     return v2;
 }
 
-int ov6_02246920 (UnkStruct_0203CDB0 * param0)
+int ov6_02246920 (FieldSystem * param0)
 {
     int v0;
 
@@ -284,7 +284,7 @@ int ov6_02246920 (UnkStruct_0203CDB0 * param0)
     return v0;
 }
 
-static const UnkStruct_ov6_02249470 * ov6_02246958 (UnkStruct_0203CDB0 * param0)
+static const UnkStruct_ov6_02249470 * ov6_02246958 (FieldSystem * param0)
 {
     int v0 = ov6_0224663C(param0);
 
@@ -292,7 +292,7 @@ static const UnkStruct_ov6_02249470 * ov6_02246958 (UnkStruct_0203CDB0 * param0)
     return &Unk_ov6_02249470[v0 - 1];
 }
 
-int ov6_02246978 (UnkStruct_0203CDB0 * param0, int param1)
+int ov6_02246978 (FieldSystem * param0, int param1)
 {
     TVBroadcast * v0 = SaveData_TVBroadcast(param0->unk_0C);
     const UnkStruct_ov6_02249470 * v1 = ov6_02246958(param0);
@@ -322,7 +322,7 @@ int ov6_02246978 (UnkStruct_0203CDB0 * param0, int param1)
     }
 }
 
-BOOL ov6_022469E0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, int param2, u16 * param3, u16 * param4)
+BOOL ov6_022469E0 (FieldSystem * param0, StringFormatter * param1, int param2, u16 * param3, u16 * param4)
 {
     int v0 = ov6_0224663C(param0);
     int v1 = ov6_0224669C(v0);
diff --git a/src/overlay006/ov6_02246A30.c b/src/overlay006/ov6_02246A30.c
index 82e93b01e1..6da76ad8f5 100644
--- a/src/overlay006/ov6_02246A30.c
+++ b/src/overlay006/ov6_02246A30.c
@@ -17,20 +17,20 @@
 #include "unk_0206A8DC.h"
 #include "overlay006/ov6_02246A30.h"
 
-typedef BOOL (* UnkStruct_ov6_022494B0)(UnkStruct_0203CDB0 *);
+typedef BOOL (* UnkStruct_ov6_022494B0)(FieldSystem *);
 
-static BOOL ov6_02246A30(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246A34(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246A38(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246A4C(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246A60(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246A74(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246A88(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246A9C(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246AB0(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246AC8(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246AD8(UnkStruct_0203CDB0 * param0);
-static BOOL ov6_02246AE8(UnkStruct_0203CDB0 * param0);
+static BOOL ov6_02246A30(FieldSystem * param0);
+static BOOL ov6_02246A34(FieldSystem * param0);
+static BOOL ov6_02246A38(FieldSystem * param0);
+static BOOL ov6_02246A4C(FieldSystem * param0);
+static BOOL ov6_02246A60(FieldSystem * param0);
+static BOOL ov6_02246A74(FieldSystem * param0);
+static BOOL ov6_02246A88(FieldSystem * param0);
+static BOOL ov6_02246A9C(FieldSystem * param0);
+static BOOL ov6_02246AB0(FieldSystem * param0);
+static BOOL ov6_02246AC8(FieldSystem * param0);
+static BOOL ov6_02246AD8(FieldSystem * param0);
+static BOOL ov6_02246AE8(FieldSystem * param0);
 
 static const UnkStruct_ov6_022494B0 Unk_ov6_022494B0[] = {
     ov6_02246A30,
@@ -85,53 +85,53 @@ static u8 Unk_ov6_02249878[] = {
     0x3
 };
 
-static BOOL ov6_02246A30 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246A30 (FieldSystem * param0)
 {
     return 1;
 }
 
-static BOOL ov6_02246A34 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246A34 (FieldSystem * param0)
 {
     return 0;
 }
 
-static BOOL ov6_02246A38 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246A38 (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     return inline_0208BE68(v0, 7);
 }
 
-static BOOL ov6_02246A4C (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246A4C (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     return inline_0208BE68(v0, 2);
 }
 
-static BOOL ov6_02246A60 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246A60 (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     return inline_0208BE68(v0, 9);
 }
 
-static BOOL ov6_02246A74 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246A74 (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     return inline_0208BE68(v0, 10);
 }
 
-static BOOL ov6_02246A88 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246A88 (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     return inline_0208BE68(v0, 11);
 }
 
-static BOOL ov6_02246A9C (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246A9C (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     return inline_0208BE68(v0, 17);
 }
 
-static BOOL ov6_02246AB0 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246AB0 (FieldSystem * param0)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(param0->unk_0C);
 
@@ -142,25 +142,25 @@ static BOOL ov6_02246AB0 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static BOOL ov6_02246AC8 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246AC8 (FieldSystem * param0)
 {
     PokedexData * v0 = sub_02027560(param0->unk_0C);
     return sub_02026F0C(v0);
 }
 
-static BOOL ov6_02246AD8 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246AD8 (FieldSystem * param0)
 {
     PokedexData * v0 = sub_02027560(param0->unk_0C);
     return sub_02027520(v0);
 }
 
-static BOOL ov6_02246AE8 (UnkStruct_0203CDB0 * param0)
+static BOOL ov6_02246AE8 (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     return sub_0206A954(v0);
 }
 
-static int ov6_02246AF8 (UnkStruct_0203CDB0 * param0, u8 * param1)
+static int ov6_02246AF8 (FieldSystem * param0, u8 * param1)
 {
     int v0, v1;
     BOOL v2[NELEMS(Unk_ov6_022494B0)];
@@ -181,7 +181,7 @@ static int ov6_02246AF8 (UnkStruct_0203CDB0 * param0, u8 * param1)
     return v1;
 }
 
-int ov6_02246B40 (UnkStruct_0203CDB0 * param0)
+int ov6_02246B40 (FieldSystem * param0)
 {
     u8 v0[36];
     int v1;
diff --git a/src/overlay006/ov6_02246BF4.c b/src/overlay006/ov6_02246BF4.c
index cf34628b89..fc6326ad8e 100644
--- a/src/overlay006/ov6_02246BF4.c
+++ b/src/overlay006/ov6_02246BF4.c
@@ -8,7 +8,7 @@
 #include "unk_0203E880.h"
 #include "overlay006/ov6_02246BF4.h"
 
-BOOL ov6_02246BF4 (SaveData * param0, UnkStruct_0203CDB0 * param1)
+BOOL ov6_02246BF4 (SaveData * param0, FieldSystem * param1)
 {
     u8 * v0;
 
diff --git a/src/overlay006/ov6_02246C24.c b/src/overlay006/ov6_02246C24.c
index 168d392f9e..23ad9520bc 100644
--- a/src/overlay006/ov6_02246C24.c
+++ b/src/overlay006/ov6_02246C24.c
@@ -36,7 +36,7 @@ static VecFx32 Unk_ov6_0224989C[6] = {
     {((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2))}
 };
 
-void ov6_02246C24 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov6_02246C24 (FieldSystem * param0, const u8 param1)
 {
     BOOL v0;
     UnkStruct_ov5_021E1890 * v1;
@@ -71,7 +71,7 @@ void ov6_02246C24 (UnkStruct_0203CDB0 * param0, const u8 param1)
 
 static BOOL ov6_02246C9C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov6_02246C24 * v1 = (UnkStruct_ov6_02246C24 *)sub_02050A64(param0);
 
     switch (v1->unk_0F) {
diff --git a/src/overlay006/ov6_02246F00.c b/src/overlay006/ov6_02246F00.c
index f599021706..79e23f6256 100644
--- a/src/overlay006/ov6_02246F00.c
+++ b/src/overlay006/ov6_02246F00.c
@@ -24,7 +24,7 @@ typedef struct {
 
 static BOOL ov6_02246F40(UnkStruct_020508D4 * param0);
 
-void ov6_02246F00 (UnkStruct_0203CDB0 * param0, const u8 param1, const u8 param2)
+void ov6_02246F00 (FieldSystem * param0, const u8 param1, const u8 param2)
 {
     BOOL v0;
 
@@ -45,7 +45,7 @@ void ov6_02246F00 (UnkStruct_0203CDB0 * param0, const u8 param1, const u8 param2
 
 static BOOL ov6_02246F40 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov6_02246F00 * v1 = (UnkStruct_ov6_02246F00 *)sub_02050A64(param0);
 
     switch (v1->unk_02) {
diff --git a/src/overlay006/ov6_02247078.c b/src/overlay006/ov6_02247078.c
index 41ed7b8ad4..e3374c6212 100644
--- a/src/overlay006/ov6_02247078.c
+++ b/src/overlay006/ov6_02247078.c
@@ -12,7 +12,7 @@
 #include "overlay005/ov5_021EF75C.h"
 #include "overlay006/ov6_02247078.h"
 
-void ov6_02247078 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov6_02247078 (FieldSystem * param0, const u8 param1)
 {
     BOOL v0;
     UnkStruct_ov5_021E1890 * v1;
@@ -32,12 +32,12 @@ void ov6_02247078 (UnkStruct_0203CDB0 * param0, const u8 param1)
     }
 }
 
-void ov6_022470E8 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov6_022470E8 (FieldSystem * param0, const u8 param1)
 {
     ov5_021D4250(param0->unk_54, param1, 0);
 }
 
-void ov6_022470F4 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov6_022470F4 (FieldSystem * param0, const u8 param1)
 {
     ov5_021D4250(param0->unk_54, param1, 1);
 }
diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c
index f29bdb733e..b91bee9b51 100644
--- a/src/overlay006/ov6_02247100.c
+++ b/src/overlay006/ov6_02247100.c
@@ -33,22 +33,22 @@ typedef struct {
     SysTask * unk_10;
     SysTask * unk_14;
     UnkStruct_02061AB4 * unk_18;
-    UnkStruct_0203CDB0 * unk_1C;
+    FieldSystem * unk_1C;
     Pokemon * unk_20;
 } UnkStruct_ov6_02247100;
 
 static void * ov6_02247590(u32 param0, u32 param1);
-static void ov6_0224732C(UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02247100 * param1);
+static void ov6_0224732C(FieldSystem * param0, UnkStruct_ov6_02247100 * param1);
 
-int(*const Unk_ov6_022495CC[])(UnkStruct_020508D4 *, UnkStruct_0203CDB0 *, UnkStruct_ov6_02247100 *);
-int(*const Unk_ov6_022495BC[])(UnkStruct_020508D4 *, UnkStruct_0203CDB0 *, UnkStruct_ov6_02247100 *);
-int(*const Unk_ov6_022495F0[])(UnkStruct_020508D4 *, UnkStruct_0203CDB0 *, UnkStruct_ov6_02247100 *);
+int(*const Unk_ov6_022495CC[])(UnkStruct_020508D4 *, FieldSystem *, UnkStruct_ov6_02247100 *);
+int(*const Unk_ov6_022495BC[])(UnkStruct_020508D4 *, FieldSystem *, UnkStruct_ov6_02247100 *);
+int(*const Unk_ov6_022495F0[])(UnkStruct_020508D4 *, FieldSystem *, UnkStruct_ov6_02247100 *);
 
 const UnkStruct_ov5_021F8E3C Unk_ov6_02249608[];
 const UnkStruct_ov5_021F8E3C Unk_ov6_022495DC[];
 const UnkStruct_ov5_021F8E3C Unk_ov6_0224966C[];
 
-void * ov6_02247100 (UnkStruct_0203CDB0 * param0, u32 param1)
+void * ov6_02247100 (FieldSystem * param0, u32 param1)
 {
     UnkStruct_ov6_02247100 * v0 = ov6_02247590(param1, sizeof(UnkStruct_ov6_02247100));
 
@@ -62,7 +62,7 @@ void * ov6_02247100 (UnkStruct_0203CDB0 * param0, u32 param1)
 BOOL ov6_02247120 (UnkStruct_020508D4 * param0)
 {
     int v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov6_02247100 * v2 = sub_02050A64(param0);
 
     do {
@@ -76,7 +76,7 @@ BOOL ov6_02247120 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int ov6_0224715C (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_0224715C (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     param2->unk_14 = ov5_021F0EB0(param1, 4);
     ov5_021F0F10(param2->unk_14, 1, ((FX32_ONE * -150)), 15);
@@ -98,7 +98,7 @@ static int ov6_0224715C (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 0;
 }
 
-static int ov6_022471C0 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_022471C0 (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     if (sub_0206574C(param2->unk_0C) == 0) {
         return 0;
@@ -123,7 +123,7 @@ static int ov6_022471C0 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 0;
 }
 
-static int ov6_02247244 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_02247244 (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     if (sub_0206574C(param2->unk_0C) == 1) {
         sub_02065758(param2->unk_0C);
@@ -142,7 +142,7 @@ static int ov6_02247244 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 1;
 }
 
-static int ov6_02247288 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_02247288 (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     UnkStruct_0203A790 * v0 = sub_0203A790(param1->unk_0C);
 
@@ -161,14 +161,14 @@ static int ov6_02247288 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 2;
 }
 
-static int(*const Unk_ov6_022495CC[])(UnkStruct_020508D4 *, UnkStruct_0203CDB0 *, UnkStruct_ov6_02247100 *) = {
+static int(*const Unk_ov6_022495CC[])(UnkStruct_020508D4 *, FieldSystem *, UnkStruct_ov6_02247100 *) = {
     ov6_0224715C,
     ov6_022471C0,
     ov6_02247244,
     ov6_02247288
 };
 
-void * ov6_022472C8 (UnkStruct_0203CDB0 * param0, u32 param1, int param2)
+void * ov6_022472C8 (FieldSystem * param0, u32 param1, int param2)
 {
     UnkStruct_ov6_02247100 * v0 = ov6_02247590(param1, sizeof(UnkStruct_ov6_02247100));
 
@@ -182,7 +182,7 @@ void * ov6_022472C8 (UnkStruct_0203CDB0 * param0, u32 param1, int param2)
 BOOL ov6_022472E8 (UnkStruct_020508D4 * param0)
 {
     int v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov6_02247100 * v2 = sub_02050A64(param0);
 
     do {
@@ -198,7 +198,7 @@ BOOL ov6_022472E8 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static void ov6_0224732C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02247100 * param1)
+static void ov6_0224732C (FieldSystem * param0, UnkStruct_ov6_02247100 * param1)
 {
     void * v0;
 
@@ -211,7 +211,7 @@ static void ov6_0224732C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02247100 *
     sub_0202B758(param0->unk_9C, v0, 1);
 }
 
-static int ov6_02247354 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_02247354 (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     if (param2->unk_08 == 2) {
         sub_0200F174(0, 1, 1, 0x0, 6, 1, 4);
@@ -227,7 +227,7 @@ static int ov6_02247354 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 0;
 }
 
-static int ov6_022473C8 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_022473C8 (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     if (sub_0206574C(param2->unk_0C) == 1) {
         sub_02065758(param2->unk_0C);
@@ -244,7 +244,7 @@ static int ov6_022473C8 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 1;
 }
 
-static int ov6_0224740C (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_0224740C (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     if (sub_0206574C(param2->unk_0C) == 0) {
         return 0;
@@ -264,7 +264,7 @@ static int ov6_0224740C (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 0;
 }
 
-static int ov6_02247458 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_02247458 (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     if (sub_0206574C(param2->unk_0C) == 0) {
         return 0;
@@ -280,14 +280,14 @@ static int ov6_02247458 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 2;
 }
 
-static int(*const Unk_ov6_022495BC[])(UnkStruct_020508D4 *, UnkStruct_0203CDB0 *, UnkStruct_ov6_02247100 *) = {
+static int(*const Unk_ov6_022495BC[])(UnkStruct_020508D4 *, FieldSystem *, UnkStruct_ov6_02247100 *) = {
     ov6_02247354,
     ov6_022473C8,
     ov6_0224740C,
     ov6_02247458
 };
 
-void * ov6_02247488 (UnkStruct_0203CDB0 * param0, Pokemon * param1, u32 param2)
+void * ov6_02247488 (FieldSystem * param0, Pokemon * param1, u32 param2)
 {
     UnkStruct_ov6_02247100 * v0 = ov6_02247590(param2, sizeof(UnkStruct_ov6_02247100));
 
@@ -302,7 +302,7 @@ void * ov6_02247488 (UnkStruct_0203CDB0 * param0, Pokemon * param1, u32 param2)
 BOOL ov6_022474AC (UnkStruct_020508D4 * param0)
 {
     int v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov6_02247100 * v2 = sub_02050A64(param0);
 
     do {
@@ -316,7 +316,7 @@ BOOL ov6_022474AC (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int ov6_022474E8 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_022474E8 (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     int v0 = sub_0205EB98(param1->unk_3C);
 
@@ -326,7 +326,7 @@ static int ov6_022474E8 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 0;
 }
 
-static int ov6_0224750C (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_02247100 * param2)
+static int ov6_0224750C (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
     if (ov6_02243FBC(param2->unk_10) == 0) {
         return 0;
@@ -337,7 +337,7 @@ static int ov6_0224750C (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param
     return 1;
 }
 
-static int(*const Unk_ov6_022495F0[])(UnkStruct_020508D4 *, UnkStruct_0203CDB0 *, UnkStruct_ov6_02247100 *) = {
+static int(*const Unk_ov6_022495F0[])(UnkStruct_020508D4 *, FieldSystem *, UnkStruct_ov6_02247100 *) = {
     ov6_022474E8,
     ov6_0224750C,
     ov6_0224715C,
@@ -346,7 +346,7 @@ static int(*const Unk_ov6_022495F0[])(UnkStruct_020508D4 *, UnkStruct_0203CDB0 *
     ov6_02247288
 };
 
-void * ov6_02247530 (UnkStruct_0203CDB0 * param0, Pokemon * param1, u32 param2)
+void * ov6_02247530 (FieldSystem * param0, Pokemon * param1, u32 param2)
 {
     UnkStruct_ov6_02247100 * v0 = ov6_02247590(param2, sizeof(UnkStruct_ov6_02247100));
 
@@ -361,7 +361,7 @@ void * ov6_02247530 (UnkStruct_0203CDB0 * param0, Pokemon * param1, u32 param2)
 BOOL ov6_02247554 (UnkStruct_020508D4 * param0)
 {
     int v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov6_02247100 * v2 = sub_02050A64(param0);
 
     do {
diff --git a/src/overlay006/ov6_02247660.c b/src/overlay006/ov6_02247660.c
index 47b9b79389..6366625b5e 100644
--- a/src/overlay006/ov6_02247660.c
+++ b/src/overlay006/ov6_02247660.c
@@ -12,7 +12,7 @@
 #include "unk_0205F180.h"
 #include "overlay006/ov6_02247660.h"
 
-BOOL ov6_02247660 (UnkStruct_0203CDB0 * param0)
+BOOL ov6_02247660 (FieldSystem * param0)
 {
     u8 v0;
     int v1;
diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c
index 1263844bc8..684fbce367 100644
--- a/src/overlay006/ov6_02247A0C.c
+++ b/src/overlay006/ov6_02247A0C.c
@@ -107,7 +107,7 @@ void ov6_02247A0C (UnkStruct_020508D4 * param0)
 
 static BOOL ov6_02247A34 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov6_02247A0C * v1 = sub_02050A64(param0);
 
     switch (v1->unk_04) {
diff --git a/src/overlay006/ov6_02247D30.c b/src/overlay006/ov6_02247D30.c
index a8f58f5bb8..6c888ccd09 100644
--- a/src/overlay006/ov6_02247D30.c
+++ b/src/overlay006/ov6_02247D30.c
@@ -35,7 +35,7 @@ static VecFx32 Unk_ov6_022498E4[6] = {
     {((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2))}
 };
 
-void ov6_02247D30 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov6_02247D30 (FieldSystem * param0, const u8 param1)
 {
     BOOL v0;
     UnkStruct_ov5_021E1890 * v1;
@@ -69,7 +69,7 @@ void ov6_02247D30 (UnkStruct_0203CDB0 * param0, const u8 param1)
 
 static BOOL ov6_02247DAC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov6_02247D30 * v1 = (UnkStruct_ov6_02247D30 *)sub_02050A64(param0);
 
     switch (v1->unk_0F) {
diff --git a/src/overlay006/ov6_02247F5C.c b/src/overlay006/ov6_02247F5C.c
index c0e8140852..31c140d681 100644
--- a/src/overlay006/ov6_02247F5C.c
+++ b/src/overlay006/ov6_02247F5C.c
@@ -14,7 +14,7 @@
 
 static BOOL ov6_02247FD0(UnkStruct_020508D4 * param0);
 
-void ov6_02247F5C (UnkStruct_0203CDB0 * param0)
+void ov6_02247F5C (FieldSystem * param0)
 {
     UnkStruct_ov5_021D3CE4 * v0;
 
@@ -32,7 +32,7 @@ void ov6_02247F5C (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void ov6_02247FBC (UnkStruct_0203CDB0 * param0)
+void ov6_02247FBC (FieldSystem * param0)
 {
     sub_02050944(param0->unk_10, ov6_02247FD0, NULL);
 }
@@ -41,7 +41,7 @@ static BOOL ov6_02247FD0 (UnkStruct_020508D4 * param0)
 {
     int * v0;
     UnkStruct_ov5_021D3CE4 * v1;
-    UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
+    FieldSystem * v2 = sub_02050A60(param0);
 
     v0 = sub_02050A68(param0);
 
diff --git a/src/overlay006/ov6_02248050.c b/src/overlay006/ov6_02248050.c
index 5a0e319346..794abb9051 100644
--- a/src/overlay006/ov6_02248050.c
+++ b/src/overlay006/ov6_02248050.c
@@ -59,7 +59,7 @@ typedef struct {
     UnkStruct_020170F4 unk_00;
     UnkStruct_ov6_022486B4 unk_10[16];
     void * unk_CD0[4];
-    UnkStruct_0203CDB0 * unk_CE0;
+    FieldSystem * unk_CE0;
     int unk_CE4;
     fx32 unk_CE8;
     fx32 unk_CEC;
@@ -201,7 +201,7 @@ static void ov6_02248254 (UnkStruct_ov6_02248140 * param0)
     sub_02017294(&param0->unk_00);
 }
 
-static void ov6_0224825C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0224825C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0224825C * v0 = param2;
     int v1;
@@ -221,13 +221,13 @@ static void ov6_0224825C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     v0->unk_EC = 0;
 }
 
-static void ov6_022482BC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_022482BC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0224825C * v0 = param2;
     ov6_022481BC(&v0->unk_00, &v0->unk_DC);
 }
 
-static void ov6_022482CC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_022482CC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0224825C * v0 = param2;
     int v1;
@@ -249,13 +249,13 @@ static void ov6_022482CC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-static void ov6_02248300 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_02248300 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0224825C * v0 = param2;
     ov6_02248254(&v0->unk_00);
 }
 
-UnkStruct_ov5_021D1BEC * ov6_0224830C (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov6_0224830C (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024, sizeof(UnkStruct_ov6_0224825C), ov6_0224825C, ov6_022482BC, ov6_022482CC, ov6_02248300
@@ -282,7 +282,7 @@ BOOL ov6_02248328 (UnkStruct_ov5_021D1BEC * param0)
     return 0;
 }
 
-static void ov6_02248340 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_02248340 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_02248340 * v0 = param2;
     int v1;
@@ -302,7 +302,7 @@ static void ov6_02248340 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     v0->unk_EC = 0;
 }
 
-static void ov6_022483A0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_022483A0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_02248340 * v0 = param2;
     int v1;
@@ -322,13 +322,13 @@ static void ov6_022483A0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     v0->unk_EC = 0;
 }
 
-static void ov6_02248400 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_02248400 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_02248340 * v0 = param2;
     ov6_022481BC(&v0->unk_00, &v0->unk_DC);
 }
 
-static void ov6_02248410 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_02248410 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_02248340 * v0 = param2;
     int v1;
@@ -350,13 +350,13 @@ static void ov6_02248410 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-static void ov6_02248444 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_02248444 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_02248340 * v0 = param2;
     ov6_02248254(&v0->unk_00);
 }
 
-UnkStruct_ov5_021D1BEC * ov6_02248450 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov6_02248450 (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -372,7 +372,7 @@ UnkStruct_ov5_021D1BEC * ov6_02248450 (UnkStruct_0203CDB0 * param0)
     return v1;
 }
 
-UnkStruct_ov5_021D1BEC * ov6_02248464 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov6_02248464 (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -404,7 +404,7 @@ BOOL ov6_02248480 (UnkStruct_ov5_021D1BEC * param0)
     return 0;
 }
 
-static void ov6_02248498 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_02248498 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_02248498 * v0 = param2;
     int v1;
@@ -424,7 +424,7 @@ static void ov6_02248498 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     v0->unk_1C8 = 0;
 }
 
-static void ov6_02248500 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_02248500 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_02248498 * v0 = param2;
     int v1;
@@ -434,7 +434,7 @@ static void ov6_02248500 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-static void ov6_02248520 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_02248520 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_02248498 * v0 = param2;
     BOOL v1;
@@ -468,7 +468,7 @@ static void ov6_02248520 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-static void ov6_022485DC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_022485DC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_02248498 * v0 = param2;
     int v1;
@@ -478,7 +478,7 @@ static void ov6_022485DC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-UnkStruct_ov5_021D1BEC * ov6_022485F4 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov6_022485F4 (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
@@ -608,7 +608,7 @@ static void ov6_022487E0 (UnkStruct_ov6_022487F8 * param0)
     }
 }
 
-static void ov6_022487F8 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_022487F8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_022487F8 * v0 = param2;
     int v1;
@@ -636,7 +636,7 @@ static void ov6_022487F8 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     NARC_dtor(v2);
 }
 
-static void ov6_0224889C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_0224889C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_022487F8 * v0 = param2;
     int v1;
@@ -652,7 +652,7 @@ static void ov6_0224889C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-static void ov6_022488D8 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_022488D8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_022487F8 * v0 = param2;
 
@@ -672,7 +672,7 @@ static void ov6_022488D8 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-static void ov6_02248914 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov6_02248914 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_022487F8 * v0 = param2;
     int v1;
@@ -682,7 +682,7 @@ static void ov6_02248914 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     }
 }
 
-UnkStruct_ov5_021D1BEC * ov6_0224892C (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov5_021D1BEC * ov6_0224892C (FieldSystem * param0)
 {
     static const UnkStruct_ov6_0223E6EC v0 = {
         1024,
diff --git a/src/overlay006/ov6_02248948.c b/src/overlay006/ov6_02248948.c
index 28799ea881..a9936790cd 100644
--- a/src/overlay006/ov6_02248948.c
+++ b/src/overlay006/ov6_02248948.c
@@ -19,7 +19,7 @@ typedef struct {
     u32 unk_0C;
 } UnkStruct_ov6_02248948;
 
-typedef UnkStruct_ov5_021D1BEC *(* UnkFuncPtr_ov6_02249840)(UnkStruct_0203CDB0 *);
+typedef UnkStruct_ov5_021D1BEC *(* UnkFuncPtr_ov6_02249840)(FieldSystem *);
 typedef void (* UnkFuncPtr_ov6_02249834)(UnkStruct_ov5_021D1BEC *);
 typedef BOOL (* UnkFuncPtr_ov6_0224984C)(UnkStruct_ov5_021D1BEC *);
 
@@ -60,7 +60,7 @@ static void ov6_02248948 (SysTask * param0, void * param1)
     }
 }
 
-void ov6_0224899C (UnkStruct_0203CDB0 * param0, u16 * param1, u32 param2, u32 param3)
+void ov6_0224899C (FieldSystem * param0, u16 * param1, u32 param2, u32 param3)
 {
     UnkStruct_ov6_02248948 * v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov6_02248948));
 
diff --git a/src/overlay007/ov7_02249960.c b/src/overlay007/ov7_02249960.c
index 0e78e4b438..432857d251 100644
--- a/src/overlay007/ov7_02249960.c
+++ b/src/overlay007/ov7_02249960.c
@@ -58,7 +58,7 @@ typedef struct UnkStruct_ov7_02249C2C_t {
     UnkStruct_0200112C * unk_5C;
     UIControlData * unk_60;
     ResourceMetadata * unk_64;
-    UnkStruct_0203CDB0 * unk_68;
+    FieldSystem * unk_68;
     UnkFuncPtr_ov7_02249C2C unk_6C;
     UnkFuncPtr_ov7_02249C2C_1 unk_70;
     MessageLoader * unk_74;
@@ -185,7 +185,7 @@ static void ov7_02249A10 (UnkStruct_ov84_02240FA8 param0, u8 param1, u8 param2,
     sub_0201A954(&Unk_ov7_0224F5A0->unk_20);
 }
 
-static void ov7_02249AB4 (UnkStruct_0203CDB0 * param0)
+static void ov7_02249AB4 (FieldSystem * param0)
 {
     int v0;
 
@@ -1668,7 +1668,7 @@ static int ov7_0224B3FC (void)
     return Unk_ov7_0224F5A0->unk_92 + (Unk_ov7_0224F5A0->unk_93 << 4);
 }
 
-void ov7_0224B414 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+void ov7_0224B414 (FieldSystem * param0, int param1, int param2, int param3)
 {
     ov7_02249AB4(param0);
     Unk_ov7_0224F5A0->unk_91 = param1;
@@ -1699,7 +1699,7 @@ u32 ov7_0224B460 (void)
     return v0;
 }
 
-void ov7_0224B47C (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+void ov7_0224B47C (FieldSystem * param0, int param1, int param2, int param3)
 {
     ov7_02249AB4(param0);
     Unk_ov7_0224F5A0->unk_91 = param1;
diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c
index f0a55fb6ae..351c3061aa 100644
--- a/src/overlay007/ov7_0224B4E8.c
+++ b/src/overlay007/ov7_0224B4E8.c
@@ -43,7 +43,7 @@ typedef struct {
     UnkStruct_0200112C * unk_04;
     ResourceMetadata * unk_08;
     ResourceMetadata * unk_0C;
-    UnkStruct_0203CDB0 * unk_10;
+    FieldSystem * unk_10;
     Strbuf* unk_14;
     Strbuf* unk_18;
     Strbuf* unk_1C;
@@ -460,7 +460,7 @@ static BOOL ov7_0224BBC4 (UnkStruct_ov7_0224B4E8 * param0)
 
 static BOOL ov7_0224BC74 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov7_0224B4E8 * v1 = sub_02050A64(param0);
     int v2;
 
@@ -557,7 +557,7 @@ static BOOL ov7_0224BC74 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static UnkStruct_ov7_0224B4E8 * ov7_0224BE10 (UnkStruct_0203CDB0 * param0)
+static UnkStruct_ov7_0224B4E8 * ov7_0224BE10 (FieldSystem * param0)
 {
     UnkStruct_ov7_0224B4E8 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov7_0224B4E8));
 
@@ -579,7 +579,7 @@ static UnkStruct_ov7_0224B4E8 * ov7_0224BE10 (UnkStruct_0203CDB0 * param0)
 
 void ov7_0224BE7C (UnkStruct_020508D4 * param0, u16 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov7_0224B4E8 * v1 = ov7_0224BE10(v0);
 
     v1->unk_70 = param1;
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index acc457296d..8ea3208de7 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -67,19 +67,19 @@
 #include "overlay005/ov5_021D2F14.h"
 #include "overlay007/ov7_0224CD28.h"
 
-static u8 ov7_0224CE90(UnkStruct_0203CDB0 * param0);
-static u8 ov7_0224D250(UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1);
+static u8 ov7_0224CE90(FieldSystem * param0);
+static u8 ov7_0224D250(FieldSystem * param0, UnkStruct_ov7_0224D008 * param1);
 static void ov7_0224D008(UnkStruct_ov7_0224D008 * param0);
 static void ov7_0224D018(UnkStruct_ov7_0224D008 * param0);
 static void ov7_0224D040(UnkStruct_ov7_0224D008 * param0);
 static u8 ov7_0224D1EC(UnkStruct_ov7_0224D008 * param0);
 static void ov7_0224D21C(UnkStruct_ov7_0224D008 * param0);
-static void ov7_0224D388(UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1);
+static void ov7_0224D388(FieldSystem * param0, UnkStruct_ov7_0224D008 * param1);
 static void ov7_0224D3E8(UnkStruct_ov7_0224D008 * param0);
 static void ov7_0224D474(UnkStruct_ov7_0224D008 * param0);
 static u8 ov7_0224D620(UnkStruct_ov7_0224D008 * param0);
 static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 * param0);
-static u8 ov7_0224E950(UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1);
+static u8 ov7_0224E950(FieldSystem * param0, UnkStruct_ov7_0224D008 * param1);
 static void ov7_0224D6BC(UnkStruct_ov7_0224D008 * param0);
 static void ov7_0224D85C(UnkStruct_0200112C * param0, u32 param1, u8 param2);
 static void ov7_0224D9B8(UnkStruct_0200112C * param0, u32 param1, u8 param2);
@@ -94,10 +94,10 @@ static u8 ov7_0224E3A0(UnkStruct_ov7_0224D008 * param0);
 static u8 ov7_0224E3D8(UnkStruct_ov7_0224D008 * param0);
 static u8 ov7_0224E5B0(UnkStruct_ov7_0224D008 * param0);
 static u8 ov7_0224EA2C(UnkStruct_ov7_0224D008 * param0);
-static void ov7_0224EA54(UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1);
-static void ov7_0224EC20(UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1);
+static void ov7_0224EA54(FieldSystem * param0, UnkStruct_ov7_0224D008 * param1);
+static void ov7_0224EC20(FieldSystem * param0, UnkStruct_ov7_0224D008 * param1);
 static void ov7_0224EC38(UnkStruct_020508D4 * param0);
-static u8 ov7_0224EC9C(UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1);
+static u8 ov7_0224EC9C(FieldSystem * param0, UnkStruct_ov7_0224D008 * param1);
 static void ov7_0224EAD0(UnkStruct_ov7_0224D008 * param0);
 static void ov7_0224EB14(UnkStruct_ov7_0224D008 * param0);
 static void ov7_0224EB38(UnkStruct_ov7_0224D008 * param0, u8 param1);
@@ -187,7 +187,7 @@ static UnkStruct_ov7_0224D008 * ov7_0224CD88 (void)
     return v0;
 }
 
-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)
 {
     UnkStruct_ov7_0224D008 * v0 = ov7_0224CD88();
 
@@ -219,7 +219,7 @@ void ov7_0224CDA4 (UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, u16
     sub_02050944(param0, ov7_0224CEAC, v0);
 }
 
-static u8 ov7_0224CE90 (UnkStruct_0203CDB0 * param0)
+static u8 ov7_0224CE90 (FieldSystem * param0)
 {
     int v0 = sub_0205EA78(param0->unk_3C);
 
@@ -232,7 +232,7 @@ static u8 ov7_0224CE90 (UnkStruct_0203CDB0 * param0)
 
 BOOL ov7_0224CEAC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_ov7_0224D008 * v1;
 
     v0 = sub_02050A60(param0);
@@ -394,7 +394,7 @@ static void ov7_0224D21C (UnkStruct_ov7_0224D008 * param0)
     BGL_DeleteWindow(&param0->unk_08[0]);
 }
 
-static u8 ov7_0224D250 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1)
+static u8 ov7_0224D250 (FieldSystem * param0, UnkStruct_ov7_0224D008 * param1)
 {
     if (sub_0205DA04(param1->unk_2A4) == 0) {
         return 0;
@@ -440,7 +440,7 @@ static u8 ov7_0224D250 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * pa
     return 0;
 }
 
-static void ov7_0224D388 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1)
+static void ov7_0224D388 (FieldSystem * param0, UnkStruct_ov7_0224D008 * param1)
 {
     sub_02019CB8(param1->unk_00, 3, 0, 2 - 2, 19 - 1, 27 + 5, 4 + 2, 0);
 
@@ -1381,7 +1381,7 @@ void ov7_0224E920 (UnkStruct_ov7_0224D008 * param0, u32 param1)
     }
 }
 
-static u8 ov7_0224E950 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1)
+static u8 ov7_0224E950 (FieldSystem * param0, UnkStruct_ov7_0224D008 * param1)
 {
     if (param1->unk_2A5 != param1->unk_2A6) {
         VecFx32 v0 = {-8 * FX32_ONE, 0, 0};
@@ -1430,7 +1430,7 @@ static u8 ov7_0224EA2C (UnkStruct_ov7_0224D008 * param0)
     return 1;
 }
 
-static void ov7_0224EA54 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1)
+static void ov7_0224EA54 (FieldSystem * param0, UnkStruct_ov7_0224D008 * param1)
 {
     Strbuf* v0;
 
@@ -1525,7 +1525,7 @@ static void ov7_0224EC10 (UnkStruct_ov7_0224D008 * param0, u8 param1)
     sub_0200D414(param0->unk_25C[2], param1);
 }
 
-static void ov7_0224EC20 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1)
+static void ov7_0224EC20 (FieldSystem * param0, UnkStruct_ov7_0224D008 * param1)
 {
     ov5_021D1744(0);
     param1->unk_297 = 15;
@@ -1533,7 +1533,7 @@ static void ov7_0224EC20 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 *
 
 static void ov7_0224EC38 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_ov7_0224D008 * v1;
 
     if (ScreenWipe_Done() == 0) {
@@ -1560,7 +1560,7 @@ static void ov7_0224EC38 (UnkStruct_020508D4 * param0)
     v1->unk_297 = 16;
 }
 
-static u8 ov7_0224EC9C (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1)
+static u8 ov7_0224EC9C (FieldSystem * param0, UnkStruct_ov7_0224D008 * param1)
 {
     if (ScreenWipe_Done() == 0) {
         return 18;
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index b780ced9f0..6f10b5b8e1 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -81,7 +81,7 @@ typedef struct {
 } UnkStruct_ov8_0224A1E4_sub1;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     int unk_04;
     int unk_08;
     int unk_0C;
@@ -104,7 +104,7 @@ typedef struct {
 } UnkStruct_ov8_0224CB68;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     u8 unk_04[13];
     u8 unk_11;
     u8 unk_12;
@@ -160,7 +160,7 @@ typedef struct {
     fx32 unk_04;
     int unk_08;
     UnkStruct_ov8_0224AF58 unk_0C[2];
-    UnkStruct_0203CDB0 * unk_38;
+    FieldSystem * unk_38;
 } UnkStruct_ov8_0224AF00;
 
 typedef struct {
@@ -180,7 +180,7 @@ typedef struct {
     int unk_04;
     fx32 unk_08;
     fx32 unk_0C;
-    UnkStruct_0203CDB0 * unk_10;
+    FieldSystem * unk_10;
     UnkStruct_02071BD0 * unk_14;
     UnkStruct_ov8_0224AF00 * unk_18;
     UnkStruct_ov8_0224B28C unk_1C;
@@ -215,7 +215,7 @@ typedef struct {
 } UnkStruct_ov8_0224B8A0;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_ov8_0224B8A0 unk_04[11];
     UnkStruct_ov8_0224BCA8 unk_10C[9];
 } UnkStruct_ov8_0224B8D0;
@@ -234,7 +234,7 @@ typedef struct {
     int unk_28;
     int unk_2C;
     UnkStruct_02061AB4 * unk_30;
-    UnkStruct_0203CDB0 * unk_34;
+    FieldSystem * unk_34;
 } UnkStruct_ov8_0224C0C4;
 
 typedef struct {
@@ -294,7 +294,7 @@ typedef struct {
 } UnkStruct_ov8_0224C4F8;
 
 typedef struct UnkStruct_ov8_0224C444_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_ov8_0224C4F8 unk_04[16];
     UnkStruct_ov8_0224C3B4 unk_1C4;
     u32 unk_1F0;
@@ -317,7 +317,7 @@ static BOOL ov8_0224A770(UnkStruct_020508D4 * param0);
 static BOOL ov8_0224ADE8(UnkStruct_020508D4 * param0);
 static void ov8_0224B8D0(UnkStruct_ov8_0224B8D0 * param0);
 static void ov8_0224B958(UnkStruct_ov8_0224B8D0 * param0);
-static void ov8_0224BFCC(UnkStruct_0203CDB0 * param0, UnkStruct_ov8_0224C098 * param1, UnkStruct_ov8_0224B80C * param2, int param3);
+static void ov8_0224BFCC(FieldSystem * param0, UnkStruct_ov8_0224C098 * param1, UnkStruct_ov8_0224B80C * param2, int param3);
 static void ov8_0224C098(UnkStruct_ov8_0224C098 * param0);
 static BOOL ov8_0224C0C4(UnkStruct_ov8_0224C098 * param0);
 static BOOL ov8_0224C0C8(UnkStruct_ov8_0224C098 * param0, UnkStruct_ov8_0224B80C * param1, int param2);
@@ -343,7 +343,7 @@ static void ov8_0224996C (const u8 param0, int * param1)
     (*param1) ^= (0x1 << param0);
 }
 
-void ov8_0224997C (UnkStruct_0203CDB0 * param0)
+void ov8_0224997C (FieldSystem * param0)
 {
     UnkStruct_02055130 v0;
     int v1, v2;
@@ -384,7 +384,7 @@ void ov8_0224997C (UnkStruct_0203CDB0 * param0)
     }
 }
 
-BOOL ov8_02249A40 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
+BOOL ov8_02249A40 (FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
 {
     u8 v0;
 
@@ -414,7 +414,7 @@ BOOL ov8_02249A40 (UnkStruct_0203CDB0 * param0, const int param1, const int para
 static BOOL ov8_02249A94 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -468,7 +468,7 @@ static BOOL ov8_02249A94 (UnkStruct_020508D4 * param0)
 static BOOL ov8_02249B74 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -557,7 +557,7 @@ static BOOL ov8_02249B74 (UnkStruct_020508D4 * param0)
 static BOOL ov8_02249CD8 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -607,7 +607,7 @@ static BOOL ov8_02249CD8 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void ov8_02249DBC (UnkStruct_0203CDB0 * param0)
+void ov8_02249DBC (FieldSystem * param0)
 {
     u8 v0;
     UnkStruct_ov5_021E1890 * v1;
@@ -753,7 +753,7 @@ void include_ov8_02249960 (void)
     VecFx32 * dummy2 = &dummy;
 }
 
-void ov8_02249FB8 (UnkStruct_0203CDB0 * param0)
+void ov8_02249FB8 (FieldSystem * param0)
 {
     UnkStruct_ov8_0224997C * v0;
 
@@ -783,7 +783,7 @@ void ov8_02249FB8 (UnkStruct_0203CDB0 * param0)
 static BOOL ov8_0224A018 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -831,7 +831,7 @@ static BOOL ov8_0224A018 (UnkStruct_020508D4 * param0)
 static BOOL ov8_0224A0E8 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -1345,7 +1345,7 @@ static void ov8_0224A434 (UnkStruct_ov8_0224A1E4 * param0, const fx32 param1)
 static BOOL ov8_0224A4FC (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v2 = sub_02050A64(param0);
     UnkStruct_ov8_0224A1E4 * v3;
 
@@ -1414,7 +1414,7 @@ static BOOL ov8_0224A620 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
     UnkStruct_02061AB4 * v1;
-    UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
+    FieldSystem * v2 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v3 = sub_02050A64(param0);
     UnkStruct_ov8_0224A1E4 * v4;
 
@@ -1498,7 +1498,7 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
     UnkStruct_02061AB4 * v1;
-    UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
+    FieldSystem * v2 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v3 = sub_02050A64(param0);
     UnkStruct_ov8_0224A1E4 * v4;
 
@@ -1585,7 +1585,7 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void ov8_0224A8C8 (UnkStruct_0203CDB0 * param0)
+void ov8_0224A8C8 (FieldSystem * param0)
 {
     UnkStruct_ov8_0224A1E4 * v0;
     UnkStruct_02027860 * v1;
@@ -1665,7 +1665,7 @@ void ov8_0224A8C8 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-BOOL ov8_0224AAA8 (UnkStruct_0203CDB0 * param0)
+BOOL ov8_0224AAA8 (FieldSystem * param0)
 {
     u8 v0;
     UnkStruct_ov8_0224A1E4 * v1;
@@ -1698,7 +1698,7 @@ BOOL ov8_0224AAA8 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-void ov8_0224AAE8 (UnkStruct_0203CDB0 * param0)
+void ov8_0224AAE8 (FieldSystem * param0)
 {
     UnkStruct_ov8_0224A1E4 * v0;
 
@@ -1707,7 +1707,7 @@ void ov8_0224AAE8 (UnkStruct_0203CDB0 * param0)
     param0->unk_04->unk_24 = NULL;
 }
 
-BOOL ov8_0224AAFC (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
+BOOL ov8_0224AAFC (FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
 {
     u8 v0;
     const u8 * v1;
@@ -2094,7 +2094,7 @@ static void ov8_0224AB64 (const UnkStruct_ov8_0224C788 * param0, const u8 param1
     (*v0) = v1;
 }
 
-void ov8_0224ABD4 (UnkStruct_0203CDB0 * param0)
+void ov8_0224ABD4 (FieldSystem * param0)
 {
     UnkStruct_ov8_0224ABD4 * v0;
     UnkStruct_02027860 * v1;
@@ -2147,7 +2147,7 @@ void ov8_0224ABD4 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void ov8_0224ACAC (UnkStruct_0203CDB0 * param0)
+void ov8_0224ACAC (FieldSystem * param0)
 {
     UnkStruct_ov8_0224ABD4 * v0;
 
@@ -2156,7 +2156,7 @@ void ov8_0224ACAC (UnkStruct_0203CDB0 * param0)
     param0->unk_04->unk_24 = NULL;
 }
 
-BOOL ov8_0224ACC0 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
+BOOL ov8_0224ACC0 (FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
 {
     int v0, v1, v2;
     u8 const * v3;
@@ -2182,7 +2182,7 @@ BOOL ov8_0224ACC0 (UnkStruct_0203CDB0 * param0, const int param1, const int para
     return 0;
 }
 
-void ov8_0224AD34 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void ov8_0224AD34 (FieldSystem * param0, const u8 param1)
 {
     UnkStruct_ov8_0224997C * v0;
     UnkStruct_ov8_0224ABD4 * v1;
@@ -2233,7 +2233,7 @@ void ov8_0224AD34 (UnkStruct_0203CDB0 * param0, const u8 param1)
 static BOOL ov8_0224ADE8 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v2 = sub_02050A64(param0);
     UnkStruct_ov8_0224ABD4 * v3;
 
@@ -2449,13 +2449,13 @@ static __attribute__((aligned(4))) const u8 Unk_ov8_0224CA5C[5][21] = {
     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 };
 
-static void ov8_0224AEDC (UnkStruct_0203CDB0 * param0, u16 param1)
+static void ov8_0224AEDC (FieldSystem * param0, u16 param1)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     sub_0206B46C(v0, param1);
 }
 
-static u32 ov8_0224AEF0 (UnkStruct_0203CDB0 * param0)
+static u32 ov8_0224AEF0 (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     return sub_0206B47C(v0);
@@ -2521,7 +2521,7 @@ static void ov8_0224AF84 (UnkStruct_ov8_0224AF00 * param0)
     ov8_0224AF58(v2);
 }
 
-void ov8_0224B020 (UnkStruct_0203CDB0 * param0)
+void ov8_0224B020 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071BD0 * v1;
@@ -2575,7 +2575,7 @@ void ov8_0224B020 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void ov8_0224B0FC (UnkStruct_0203CDB0 * param0)
+void ov8_0224B0FC (FieldSystem * param0)
 {
     UnkStruct_ov8_0224AF00 * v0 = param0->unk_04->unk_24;
 
@@ -2583,7 +2583,7 @@ void ov8_0224B0FC (UnkStruct_0203CDB0 * param0)
     param0->unk_04->unk_24 = NULL;
 }
 
-BOOL ov8_0224B110 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
+BOOL ov8_0224B110 (FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
 {
     BOOL v0;
     int v1, v2, v3;
@@ -2614,7 +2614,7 @@ BOOL ov8_0224B110 (UnkStruct_0203CDB0 * param0, const int param1, const int para
     return v0;
 }
 
-static void ov8_0224B18C (UnkStruct_0203CDB0 * param0, UnkStruct_ov8_0224B28C * param1, int param2, int param3)
+static void ov8_0224B18C (FieldSystem * param0, UnkStruct_ov8_0224B28C * param1, int param2, int param3)
 {
     int v0, v1, v2, v3;
     const VecFx32 * v4;
@@ -2725,7 +2725,7 @@ static void ov8_0224B2B4 (UnkStruct_ov8_0224B28C * param0, int param1, int param
     param0->unk_1C = param5;
 }
 
-static void ov8_0224B2C4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov8_0224B28C * param1)
+static void ov8_0224B2C4 (FieldSystem * param0, UnkStruct_ov8_0224B28C * param1)
 {
     const VecFx32 * v0 = sub_0205EAFC(param0->unk_3C);
 
@@ -2810,7 +2810,7 @@ static BOOL ov8_0224B370 (UnkStruct_ov8_0224AF00 * param0, const fx32 param1, co
 static BOOL ov8_0224B3D4 (UnkStruct_020508D4 * param0)
 {
     BOOL v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224B67C * v2 = sub_02050A64(param0);
     UnkStruct_02071BD0 * v3 = v2->unk_14;
     UnkStruct_ov8_0224AF00 * v4 = v2->unk_18;
@@ -2969,7 +2969,7 @@ static BOOL ov8_0224B3D4 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-BOOL ov8_0224B67C (UnkStruct_0203CDB0 * param0, Window * param1, MessageLoader * param2, Strbuf *param3)
+BOOL ov8_0224B67C (FieldSystem * param0, Window * param1, MessageLoader * param2, Strbuf *param3)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071BD0 * v1;
@@ -3007,7 +3007,7 @@ BOOL ov8_0224B67C (UnkStruct_0203CDB0 * param0, Window * param1, MessageLoader *
     return 1;
 }
 
-BOOL ov8_0224B714 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+BOOL ov8_0224B714 (FieldSystem * param0, int param1, int param2, int param3)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071BD0 * v1;
@@ -3096,7 +3096,7 @@ static const int Unk_ov8_0224C764[4] = {
 
 static int (*const Unk_ov8_0224C818[11])(UnkStruct_ov8_0224C098 *);
 
-void ov8_0224B764 (UnkStruct_0203CDB0 * param0)
+void ov8_0224B764 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071BF8 * v1;
@@ -3123,7 +3123,7 @@ void ov8_0224B764 (UnkStruct_0203CDB0 * param0)
     v1->unk_00 = 1;
 }
 
-void ov8_0224B7C0 (UnkStruct_0203CDB0 * param0)
+void ov8_0224B7C0 (FieldSystem * param0)
 {
     UnkStruct_ov8_0224B8D0 * v0 = param0->unk_04->unk_24;
 
@@ -3131,12 +3131,12 @@ void ov8_0224B7C0 (UnkStruct_0203CDB0 * param0)
     param0->unk_04->unk_24 = NULL;
 }
 
-BOOL ov8_0224B7D4 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
+BOOL ov8_0224B7D4 (FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
 {
     return 0;
 }
 
-static UnkStruct_02061AB4 * ov8_0224B7D8 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+static UnkStruct_02061AB4 * ov8_0224B7D8 (FieldSystem * param0, int param1, int param2, int param3)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -3148,7 +3148,7 @@ static UnkStruct_02061AB4 * ov8_0224B7D8 (UnkStruct_0203CDB0 * param0, int param
     return v0;
 }
 
-static void ov8_0224B80C (UnkStruct_ov8_0224B80C * param0, UnkStruct_02061AB4 * param1, UnkStruct_0203CDB0 * param2)
+static void ov8_0224B80C (UnkStruct_ov8_0224B80C * param0, UnkStruct_02061AB4 * param1, FieldSystem * param2)
 {
     param0->unk_08 = param1;
     param0->unk_00 = sub_02063020(param1);
@@ -3214,7 +3214,7 @@ static void ov8_0224B8D0 (UnkStruct_ov8_0224B8D0 * param0)
     int v0;
     UnkStruct_02061AB4 * v1;
     const UnkStruct_ov8_0224C90C * v2;
-    UnkStruct_0203CDB0 * v3 = param0->unk_00;
+    FieldSystem * v3 = param0->unk_00;
     UnkStruct_ov8_0224B8A0 * v4 = param0->unk_04;
     UnkStruct_ov8_0224BCA8 * v5 = param0->unk_10C;
 
@@ -3238,7 +3238,7 @@ static void ov8_0224B958 (UnkStruct_ov8_0224B8D0 * param0)
 {
     int v0 = 0, v1 = 0;
     UnkStruct_02061AB4 * v2;
-    UnkStruct_0203CDB0 * v3 = param0->unk_00;
+    FieldSystem * v3 = param0->unk_00;
     UnkStruct_02061830 * v4 = v3->unk_38;
     UnkStruct_ov8_0224B8A0 * v5 = param0->unk_04;
     UnkStruct_ov8_0224BCA8 * v6 = param0->unk_10C;
@@ -3342,7 +3342,7 @@ static u32 ov8_0224BAA0 (UnkStruct_ov8_0224B8D0 * param0, int param1, int param2
 static BOOL ov8_0224BAF4 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224C098 * v2 = sub_02050A64(param0);
     UnkStruct_ov8_0224B8D0 * v3 = v2->unk_3C;
 
@@ -3634,19 +3634,19 @@ static UnkStruct_ov8_0224C098 * ov8_0224BED8 (UnkStruct_ov8_0224B8D0 * param0, U
     return v0;
 }
 
-static void ov8_0224BF0C (UnkStruct_0203CDB0 * param0, UnkStruct_ov8_0224B8D0 * param1, UnkStruct_ov8_0224BCA8 * param2, int param3)
+static void ov8_0224BF0C (FieldSystem * param0, UnkStruct_ov8_0224B8D0 * param1, UnkStruct_ov8_0224BCA8 * param2, int param3)
 {
     UnkStruct_ov8_0224C098 * v0 = ov8_0224BED8(param1, param2, param3);
     sub_02050904(param0, ov8_0224BAF4, v0);
 }
 
-static void ov8_0224BF2C (UnkStruct_0203CDB0 * param0, UnkStruct_ov8_0224B8D0 * param1, UnkStruct_ov8_0224BCA8 * param2, int param3)
+static void ov8_0224BF2C (FieldSystem * param0, UnkStruct_ov8_0224B8D0 * param1, UnkStruct_ov8_0224BCA8 * param2, int param3)
 {
     UnkStruct_ov8_0224C098 * v0 = ov8_0224BED8(param1, param2, param3);
     sub_02050904(param0, ov8_0224BB78, v0);
 }
 
-BOOL ov8_0224BF4C (UnkStruct_0203CDB0 * param0)
+BOOL ov8_0224BF4C (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
 
@@ -3681,7 +3681,7 @@ BOOL ov8_0224BF4C (UnkStruct_0203CDB0 * param0)
     return 1;
 }
 
-static void ov8_0224BFCC (UnkStruct_0203CDB0 * param0, UnkStruct_ov8_0224C098 * param1, UnkStruct_ov8_0224B80C * param2, int param3)
+static void ov8_0224BFCC (FieldSystem * param0, UnkStruct_ov8_0224C098 * param1, UnkStruct_ov8_0224B80C * param2, int param3)
 {
     int v0, v1;
     const VecFx32 * v2;
@@ -3875,7 +3875,7 @@ static const UnkStruct_ov8_0224C7D0 * const Unk_ov8_0224C708[2] = {
     Unk_ov8_0224C844
 };
 
-void ov8_0224C198 (UnkStruct_0203CDB0 * param0)
+void ov8_0224C198 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071C18 * v1;
@@ -3971,7 +3971,7 @@ void ov8_0224C198 (UnkStruct_0203CDB0 * param0)
     v2->unk_1F4 = SysTask_Start(ov8_0224C3B0, v2, 0);
 }
 
-void ov8_0224C388 (UnkStruct_0203CDB0 * param0)
+void ov8_0224C388 (FieldSystem * param0)
 {
     UnkStruct_ov8_0224C444 * v0 = param0->unk_04->unk_24;
 
@@ -4071,7 +4071,7 @@ static void ov8_0224C518 (SysTask * param0, void * param1)
     return;
 }
 
-BOOL ov8_0224C51C (UnkStruct_0203CDB0 * param0)
+BOOL ov8_0224C51C (FieldSystem * param0)
 {
     int v0, v1, v2, v3;
     UnkStruct_02027860 * v4;
@@ -4111,7 +4111,7 @@ BOOL ov8_0224C51C (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-BOOL ov8_0224C5DC (UnkStruct_0203CDB0 * param0, void * param1)
+BOOL ov8_0224C5DC (FieldSystem * param0, void * param1)
 {
     UnkStruct_02027860 * v0;
 
@@ -4136,7 +4136,7 @@ BOOL ov8_0224C5DC (UnkStruct_0203CDB0 * param0, void * param1)
     return 0;
 }
 
-BOOL ov8_0224C62C (UnkStruct_0203CDB0 * param0, int param1, int param2, int * param3)
+BOOL ov8_0224C62C (FieldSystem * param0, int param1, int param2, int * param3)
 {
     if ((*param3) != 0) {
         return 0;
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index c8245324b4..5269cbbe56 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -595,7 +595,7 @@ typedef struct {
 } UnkStruct_ov9_0224CBD8;
 
 struct UnkStruct_ov9_02249B04_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_02071C5C * unk_04;
     NARC * unk_08;
     NARC * unk_0C;
@@ -733,7 +733,7 @@ typedef struct {
 
 struct UnkStruct_ov9_0224F6EC_t {
     UnkStruct_ov9_02249B04 * unk_00;
-    UnkStruct_0203CDB0 * unk_04;
+    FieldSystem * unk_04;
     UnkStruct_020508D4 * unk_08;
     UnkStruct_02061AB4 * unk_0C;
     u16 unk_10;
@@ -1176,7 +1176,7 @@ const UnkStruct_ov9_02251438 Unk_ov9_022513D8[];
 const UnkStruct_ov9_02252548 Unk_ov9_02252548[];
 const UnkStruct_ov9_02252EB4 Unk_ov9_02252EB4[];
 
-void ov9_02249960 (UnkStruct_0203CDB0 * param0)
+void ov9_02249960 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071C5C * v1;
@@ -1228,7 +1228,7 @@ void ov9_02249960 (UnkStruct_0203CDB0 * param0)
     v1->unk_00_0 = 1;
 }
 
-void ov9_02249A60 (UnkStruct_0203CDB0 * param0)
+void ov9_02249A60 (FieldSystem * param0)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
 
@@ -1487,7 +1487,7 @@ static u32 ov9_02249E44 (UnkStruct_ov9_02249B04 * param0)
     return v0->unk_00_25;
 }
 
-BOOL ov9_02249E50 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
+BOOL ov9_02249E50 (FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
     u32 v1 = ov9_022510D0(v0);
@@ -1594,7 +1594,7 @@ static void ov9_02249F98 (UnkStruct_ov9_02249B04 * param0)
     return;
 }
 
-void ov9_02249F9C (UnkStruct_0203CDB0 * param0)
+void ov9_02249F9C (FieldSystem * param0)
 {
     UnkStruct_ov115_0226527C v0;
     UnkStruct_ov9_02249B04 * v1 = param0->unk_04->unk_24;
@@ -1607,7 +1607,7 @@ void ov9_02249F9C (UnkStruct_0203CDB0 * param0)
     sub_020209D4(&v0, v2->unk_00);
 }
 
-void ov9_02249FD0 (UnkStruct_0203CDB0 * param0)
+void ov9_02249FD0 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071C5C * v1;
@@ -1988,7 +1988,7 @@ static void ov9_0224A4D0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 *
     GF_ASSERT(0);
 }
 
-int ov9_0224A520 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
+int ov9_0224A520 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
 {
     int v0 = 0;
     UnkStruct_ov9_02249B04 * v1 = param0->unk_04->unk_24;
@@ -2009,13 +2009,13 @@ int ov9_0224A520 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
     return 0;
 }
 
-void ov9_0224A558 (UnkStruct_0203CDB0 * param0, UnkStruct_020216E0 * param1, int param2)
+void ov9_0224A558 (FieldSystem * param0, UnkStruct_020216E0 * param1, int param2)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
     ov9_0224A3C4(v0, param1, param2);
 }
 
-void ov9_0224A564 (UnkStruct_0203CDB0 * param0, const UnkStruct_020216E0 * param1)
+void ov9_0224A564 (FieldSystem * param0, const UnkStruct_020216E0 * param1)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
     ov9_0224A408(v0, param1);
@@ -2051,7 +2051,7 @@ static void * ov9_0224A598 (UnkStruct_ov9_02249B04 * param0)
     return v1;
 }
 
-BOOL ov9_0224A59C (UnkStruct_0203CDB0 * param0, int param1)
+BOOL ov9_0224A59C (FieldSystem * param0, int param1)
 {
     UnkStruct_02027860 * v0;
 
@@ -2096,7 +2096,7 @@ BOOL ov9_0224A59C (UnkStruct_0203CDB0 * param0, int param1)
     return 0;
 }
 
-BOOL ov9_0224A67C (UnkStruct_0203CDB0 * param0, int param1)
+BOOL ov9_0224A67C (FieldSystem * param0, int param1)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
     u32 v1 = ov9_022510D0(v0);
@@ -2135,7 +2135,7 @@ BOOL ov9_0224A67C (UnkStruct_0203CDB0 * param0, int param1)
     return 0;
 }
 
-BOOL ov9_0224A71C (UnkStruct_0203CDB0 * param0)
+BOOL ov9_0224A71C (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
 
@@ -2183,7 +2183,7 @@ BOOL ov9_0224A71C (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-BOOL ov9_0224A800 (UnkStruct_0203CDB0 * param0, int param1)
+BOOL ov9_0224A800 (FieldSystem * param0, int param1)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
     u32 v1 = ov9_022510D0(v0);
@@ -2358,7 +2358,7 @@ static void ov9_0224AA34 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0
 
 static BOOL ov9_0224AAD4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov9_02249B04 * v1 = sub_02050A64(param0);
     UnkStruct_ov9_0224AC58 * v2 = ov9_0224A598(v1);
     UnkStruct_0205E884 * v3 = v0->unk_3C;
@@ -4370,7 +4370,7 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0)
 {
     int v0, v1;
     UnkStruct_ov9_0224C8E8 * v2 = &param0->unk_1E88;
-    UnkStruct_0203CDB0 * v3 = param0->unk_00;
+    FieldSystem * v3 = param0->unk_00;
     const UnkStruct_ov9_022530A4 * v4, * v5;
 
     v0 = ov9_022510D0(param0);
@@ -4472,13 +4472,13 @@ static void ov9_0224CA30 (UnkStruct_ov9_02249B04 * param0)
     }
 }
 
-void ov9_0224CA50 (UnkStruct_0203CDB0 * param0)
+void ov9_0224CA50 (FieldSystem * param0)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
     ov9_0224CA30(v0);
 }
 
-void ov9_0224CA5C (UnkStruct_0203CDB0 * param0)
+void ov9_0224CA5C (FieldSystem * param0)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
     UnkStruct_ov9_0224C8E8 * v1 = &v0->unk_1E88;
@@ -4543,7 +4543,7 @@ static void ov9_0224CB30 (UnkStruct_ov9_02249B04 * param0)
 {
     UnkStruct_ov9_0224CA5C * v0 = &param0->unk_1CB0;
     UnkStruct_ov9_0224C8E8 * v1 = &param0->unk_1E88;
-    UnkStruct_0203CDB0 * v2 = param0->unk_00;
+    FieldSystem * v2 = param0->unk_00;
 
     switch (v0->unk_01) {
     case 0:
@@ -4673,7 +4673,7 @@ static int ov9_0224CC90 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8
 
 static int ov9_0224CCB8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_00;
+    FieldSystem * v0 = param0->unk_00;
     UnkStruct_ov9_0224C8E8 * v1 = &param0->unk_1E88;
     const UnkStruct_ov9_022530A4 * v2;
 
@@ -4799,7 +4799,7 @@ static int ov9_0224CE80 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8
 
 static int ov9_0224CEBC (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_00;
+    FieldSystem * v0 = param0->unk_00;
     UnkStruct_ov9_0224C8E8 * v1 = &param0->unk_1E88;
     const UnkStruct_ov9_022530A4 * v2;
 
@@ -4863,7 +4863,7 @@ static int ov9_0224CEBC (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8
 
 static int ov9_0224CFE0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_00;
+    FieldSystem * v0 = param0->unk_00;
 
     ov5_021EA5E0(v0->unk_28, param1->unk_06, param1->unk_10[param1->unk_06]);
 
@@ -4878,7 +4878,7 @@ static int ov9_0224CFE0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8
 
 static int ov9_0224D008 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_00;
+    FieldSystem * v0 = param0->unk_00;
 
     ov5_021EA6F4(v0->unk_28, param1->unk_08, param1->unk_0A);
     ov9_02249C60(param0, param1->unk_0C);
@@ -6587,7 +6587,7 @@ static const UnkStruct_ov9_02252414 Unk_ov9_02252414[1] = {
     }
 };
 
-void ov9_0224E884 (UnkStruct_0203CDB0 * param0, u16 param1)
+void ov9_0224E884 (FieldSystem * param0, u16 param1)
 {
     UnkStruct_ov9_02249B04 * v0;
 
@@ -6596,7 +6596,7 @@ void ov9_0224E884 (UnkStruct_0203CDB0 * param0, u16 param1)
     ov9_0224E91C(v0, &Unk_ov9_02252414[param1]);
 }
 
-void ov9_0224E8A8 (UnkStruct_0203CDB0 * param0)
+void ov9_0224E8A8 (FieldSystem * param0)
 {
     UnkStruct_ov9_02249B04 * v0;
 
@@ -7305,7 +7305,7 @@ static UnkStruct_02061AB4 * ov9_0224F0D4 (UnkStruct_ov9_02249B04 * param0, u32 p
     return NULL;
 }
 
-void ov9_0224F158 (UnkStruct_0203CDB0 * param0, u16 param1)
+void ov9_0224F158 (FieldSystem * param0, u16 param1)
 {
     u32 v0 = param0->unk_1C->unk_00;
     UnkStruct_ov9_02249B04 * v1 = param0->unk_04->unk_24;
@@ -7313,7 +7313,7 @@ void ov9_0224F158 (UnkStruct_0203CDB0 * param0, u16 param1)
     ov9_0224F0D4(v1, v0, param1);
 }
 
-void ov9_0224F16C (UnkStruct_0203CDB0 * param0, u16 param1)
+void ov9_0224F16C (FieldSystem * param0, u16 param1)
 {
     int v0 = 0;
     UnkStruct_02061AB4 * v1;
@@ -7390,7 +7390,7 @@ BOOL ov9_0224F240 (const UnkStruct_02061AB4 * param0, int param1)
 {
     int v0, v1;
     u32 v2, v3;
-    UnkStruct_0203CDB0 * v4;
+    FieldSystem * v4;
 
     v4 = sub_02062C00(param0);
     v3 = v4->unk_1C->unk_00;
@@ -7406,7 +7406,7 @@ static BOOL ov9_0224F284 (const UnkStruct_02061AB4 * param0, u32 * param1)
 {
     int v0, v1;
     u32 v2;
-    UnkStruct_0203CDB0 * v3;
+    FieldSystem * v3;
 
     v3 = sub_02062C00(param0);
     v2 = v3->unk_1C->unk_00;
@@ -7422,7 +7422,7 @@ BOOL ov9_0224F2B0 (const UnkStruct_02061AB4 * param0)
     return ov9_0224F284(param0, &v0);
 }
 
-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)
 {
     UnkStruct_ov9_0224F6EC * v0;
 
@@ -8806,7 +8806,7 @@ static void ov9_0225074C (UnkStruct_ov9_0225074C * param0)
     }
 }
 
-void ov9_02250780 (UnkStruct_0203CDB0 * param0)
+void ov9_02250780 (FieldSystem * param0)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
 
@@ -9505,7 +9505,7 @@ static void ov9_02250F44 (UnkStruct_ov9_02249B04 * param0, int * param1, int * p
     *param3 = sub_02063040(v0);
 }
 
-BOOL ov9_02250F74 (UnkStruct_0203CDB0 * param0)
+BOOL ov9_02250F74 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
 
@@ -9518,7 +9518,7 @@ BOOL ov9_02250F74 (UnkStruct_0203CDB0 * param0)
     return 1;
 }
 
-BOOL ov9_02250F90 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+BOOL ov9_02250F90 (FieldSystem * param0, int param1, int param2, int param3)
 {
     u16 v0;
     UnkStruct_ov9_02249B04 * v1 = param0->unk_04->unk_24;
@@ -9538,7 +9538,7 @@ BOOL ov9_02250F90 (UnkStruct_0203CDB0 * param0, int param1, int param2, int para
     return 0;
 }
 
-BOOL ov9_02250FBC (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+BOOL ov9_02250FBC (FieldSystem * param0, int param1, int param2, int param3)
 {
     u16 v0;
     UnkStruct_ov9_02249B04 * v1 = param0->unk_04->unk_24;
@@ -9552,7 +9552,7 @@ BOOL ov9_02250FBC (UnkStruct_0203CDB0 * param0, int param1, int param2, int para
     return 1;
 }
 
-BOOL ov9_02250FD8 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+BOOL ov9_02250FD8 (FieldSystem * param0, int param1, int param2, int param3)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
     s16 v1 = ov9_0224C494(v0);
@@ -9560,7 +9560,7 @@ BOOL ov9_02250FD8 (UnkStruct_0203CDB0 * param0, int param1, int param2, int para
     return ov9_0224C324(v0, param1, param2, param3, v1);
 }
 
-void ov9_02251000 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+void ov9_02251000 (FieldSystem * param0, int param1, int param2, int param3)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
     s16 v1 = ov9_0224C494(v0);
@@ -9573,7 +9573,7 @@ void ov9_02251000 (UnkStruct_0203CDB0 * param0, int param1, int param2, int para
     GF_ASSERT(0);
 }
 
-BOOL ov9_02251044 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, u32 * param4)
+BOOL ov9_02251044 (FieldSystem * param0, int param1, int param2, int param3, u32 * param4)
 {
     UnkStruct_02027860 * v0;
 
@@ -9679,7 +9679,7 @@ static BOOL ov9_02251104 (UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param
     return 0;
 }
 
-BOOL ov9_022511A0 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3)
+BOOL ov9_022511A0 (FieldSystem * param0, int param1, int param2, int param3)
 {
     UnkStruct_ov9_02249B04 * v0 = param0->unk_04->unk_24;
 
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index a752ea17b5..6882970770 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -101,7 +101,7 @@ typedef struct {
     int unk_04;
     int unk_08;
     int unk_0C;
-    UnkStruct_0203CDB0 * unk_10;
+    FieldSystem * unk_10;
     int unk_14;
     void * unk_18[4];
     NNSG2dPaletteData * unk_28[4];
@@ -147,7 +147,7 @@ typedef struct {
 } UnkStruct_ov23_022412CC;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     BGL * unk_04;
     MATHRandContext32 unk_08;
     GraphicElementManager * unk_20;
@@ -194,7 +194,7 @@ static UnkStruct_ov23_0223E6F8 * ov23_0223E88C(u16 param0, u16 param1);
 static void ov23_0223EA38(SysTask * param0, void * param1);
 static void ov23_0223EE80(UnkStruct_ov23_0223EE80 * param0);
 static void ov23_0223EF98(void);
-static void ov23_0223F70C(UnkStruct_0203CDB0 * param0);
+static void ov23_0223F70C(FieldSystem * param0);
 static void ov23_0223FA3C(BGL * param0, int param1, UnkStruct_ov23_0223EE80 * param2);
 static void ov23_0223FF60(int param0, BGL * param1, int param2, UnkStruct_ov23_0223EE80 * param3);
 static void ov23_0223FF8C(BGL * param0);
@@ -618,7 +618,7 @@ static void ov23_0223E140 (void)
     }
 }
 
-void ov23_0223E1E4 (void * param0, UnkStruct_0203CDB0 * param1)
+void ov23_0223E1E4 (void * param0, FieldSystem * param1)
 {
     int v0, v1;
     UnkStruct_020298B0 * v2;
@@ -729,7 +729,7 @@ BOOL ov23_0223E354 (int param0, UnkStruct_ov23_0224271C * param1)
     return 0;
 }
 
-static BOOL ov23_0223E3AC (UnkStruct_0203CDB0 * param0, int param1, int param2)
+static BOOL ov23_0223E3AC (FieldSystem * param0, int param1, int param2)
 {
     if (ov23_02242E58(param1, param2)) {
         return 0;
@@ -1416,7 +1416,7 @@ static void ov23_0223F020 (UnkStruct_ov23_0223EE80 * param0)
 static void ov23_0223F118 (SysTask * param0, void * param1)
 {
     UnkStruct_ov23_0223EE80 * v0 = param1;
-    UnkStruct_0203CDB0 * v1 = v0->unk_10;
+    FieldSystem * v1 = v0->unk_10;
 
     switch (v0->unk_00) {
     case 0:
@@ -1675,7 +1675,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
     }
 }
 
-static void ov23_0223F70C (UnkStruct_0203CDB0 * param0)
+static void ov23_0223F70C (FieldSystem * param0)
 {
     UnkStruct_ov23_0223EE80 * v0;
     void * v1 = sub_0202BE14(11);
diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c
index 58b0abd944..6e9f221a63 100644
--- a/src/overlay023/ov23_022416A8.c
+++ b/src/overlay023/ov23_022416A8.c
@@ -52,7 +52,7 @@ typedef struct {
     u8 unk_454[8];
     SysTask * unk_45C;
     UnkStruct_ov23_02241E4C * unk_460;
-    UnkStruct_0203CDB0 * unk_464;
+    FieldSystem * unk_464;
     u8 unk_468[8];
     int unk_470;
     u8 unk_474;
@@ -83,7 +83,7 @@ static void ov23_022416B0 (int param0)
     }
 }
 
-void ov23_022416E0 (void * param0, UnkStruct_0203CDB0 * param1)
+void ov23_022416E0 (void * param0, FieldSystem * param1)
 {
     int v0;
     UnkStruct_020298B0 * v1;
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 69be0a98ec..6aa6ea2c17 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -67,7 +67,7 @@ typedef struct {
     void * unk_00;
     SysTask * unk_04;
     UnkFuncPtr_ov23_022431EC unk_08;
-    UnkStruct_0203CDB0 * unk_0C;
+    FieldSystem * unk_0C;
     UnkStruct_ov23_02253598 * unk_10;
     SysTask * unk_14;
     UnkStruct_ov23_0224271C unk_18;
@@ -125,7 +125,7 @@ static void ov23_02243310(SysTask * param0, void * param1);
 
 static UnkStruct_ov23_02257748 * Unk_ov23_02257748 = NULL;
 
-static void ov23_02241F74 (UnkStruct_ov23_02257748 * param0, UnkStruct_0203CDB0 * param1)
+static void ov23_02241F74 (UnkStruct_ov23_02257748 * param0, FieldSystem * param1)
 {
     u8 v0 = sub_02027AC0(sub_02025E44(param1->unk_0C));
     int v1;
@@ -771,7 +771,7 @@ void ov23_02242B14 (void)
     }
 }
 
-void ov23_02242BC0 (UnkStruct_0203CDB0 * param0)
+void ov23_02242BC0 (FieldSystem * param0)
 {
     void * v0;
 
@@ -844,7 +844,7 @@ void ov23_02242D08 (void)
     }
 }
 
-void ov23_02242D44 (UnkStruct_0203CDB0 * param0)
+void ov23_02242D44 (FieldSystem * param0)
 {
     void * v0;
 
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 34f0c5895b..abe79188e3 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -120,7 +120,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov23_02248A6C * unk_00[8];
     SysTask * unk_20[8];
-    UnkStruct_0203CDB0 * unk_40;
+    FieldSystem * unk_40;
     GraphicElementManager * unk_44;
     UnkStruct_0200C738 unk_48;
     UnkStruct_02009714 * unk_1D4[2][4];
@@ -170,7 +170,7 @@ typedef struct {
     u8 unk_113;
     u8 unk_114;
     int unk_118;
-    UnkStruct_0203CDB0 * unk_11C;
+    FieldSystem * unk_11C;
 } UnkStruct_ov23_02245ED4;
 
 typedef struct {
@@ -271,7 +271,7 @@ typedef struct {
     u16 unk_0A;
     int unk_0C;
     BGL * unk_10;
-    UnkStruct_0203CDB0 * unk_14;
+    FieldSystem * unk_14;
     u8 unk_18;
     u8 unk_19;
     int unk_1C;
@@ -280,7 +280,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     int unk_0C;
     int unk_10;
     int unk_14;
@@ -347,14 +347,14 @@ static void ov23_02246220(int param0, BOOL param1);
 static void ov23_0224590C(int param0, BOOL param1);
 static void ov23_02245938(int param0, BOOL param1);
 static UnkStruct_ov23_02243DA8 * ov23_02244EA0(UnkStruct_ov23_02243DA8 * param0);
-static void ov23_02244D80(UnkStruct_0203CDB0 * param0, int param1, int param2, BOOL param3);
-static void ov23_02244EA4(UnkStruct_0203CDB0 * param0, BOOL param1, int param2);
+static void ov23_02244D80(FieldSystem * param0, int param1, int param2, BOOL param3);
+static void ov23_02244EA4(FieldSystem * param0, BOOL param1, int param2);
 static BOOL ov23_02245064(UnkStruct_ov23_0224271C * param0, BGL * param1, UnkStruct_ov23_022451BC * param2);
 static BOOL ov23_022450D4(int param0, int param1, u8 * param2);
 static void ov23_022451C8(SysTask * param0, void * param1);
 static void ov23_022451BC(UnkStruct_ov23_022451BC * param0);
 static void ov23_02245A58(BOOL param0);
-static void ov23_022462A8(UnkStruct_0203CDB0 * param0, BOOL param1, int param2);
+static void ov23_022462A8(FieldSystem * param0, BOOL param1, int param2);
 static BOOL ov23_02246640(BGL * param0, UnkStruct_ov23_02245ED4 * param1);
 static void ov23_02246324(void);
 static void ov23_02246370(int param0);
@@ -640,7 +640,7 @@ static void ov23_0224340C (void)
     }
 }
 
-void ov23_022434BC (void * param0, UnkStruct_0203CDB0 * param1)
+void ov23_022434BC (void * param0, FieldSystem * param1)
 {
     int v0;
     UnkStruct_020298B0 * v1;
@@ -737,7 +737,7 @@ void ov23_022435DC (void)
     Unk_ov23_02257764 = NULL;
 }
 
-void ov23_02243670 (UnkStruct_0203CDB0 * param0)
+void ov23_02243670 (FieldSystem * param0)
 {
     int v0;
     UnkStruct_020298B0 * v1;
@@ -2083,7 +2083,7 @@ static void ov23_02244C70 (SysTask * param0, void * param1)
     }
 }
 
-static void ov23_02244D80 (UnkStruct_0203CDB0 * param0, int param1, int param2, BOOL param3)
+static void ov23_02244D80 (FieldSystem * param0, int param1, int param2, BOOL param3)
 {
     UnkStruct_ov23_02244C70 * v0;
 
@@ -2156,7 +2156,7 @@ static UnkStruct_ov23_02243DA8 * ov23_02244EA0 (UnkStruct_ov23_02243DA8 * param0
     return param0;
 }
 
-static void ov23_02244EA4 (UnkStruct_0203CDB0 * param0, BOOL param1, int param2)
+static void ov23_02244EA4 (FieldSystem * param0, BOOL param1, int param2)
 {
     UnkStruct_ov23_022451BC * v0;
 
@@ -3232,7 +3232,7 @@ static void ov23_02246220 (int param0, BOOL param1)
     }
 }
 
-static void ov23_022462A8 (UnkStruct_0203CDB0 * param0, BOOL param1, int param2)
+static void ov23_022462A8 (FieldSystem * param0, BOOL param1, int param2)
 {
     int v0;
     UnkStruct_ov23_02245ED4 * v1;
@@ -4868,7 +4868,7 @@ static void ov23_02248884 (SysTask * param0, void * param1)
     }
 }
 
-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)
 {
     int v0;
     UnkStruct_ov23_02248748 * v1;
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index d557153f04..aa1be15ba1 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -55,7 +55,7 @@ struct UnkStruct_ov23_0224942C_t {
     int unk_04[8][2];
     int unk_44[8][3];
     int unk_A4[17][4];
-    UnkStruct_0203CDB0 * unk_1B4;
+    FieldSystem * unk_1B4;
     BGL * unk_1B8;
     GraphicElementManager * unk_1BC;
     UnkStruct_0200C738 unk_1C0;
@@ -325,7 +325,7 @@ static void ov23_0224937C (int param0[][4], GraphicElementData * param1[])
     }
 }
 
-UnkStruct_ov23_0224942C * ov23_02249404 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov23_0224942C * ov23_02249404 (FieldSystem * param0)
 {
     UnkStruct_ov23_0224942C * v0;
     SysTask * v1;
diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c
index 1f4f17f71b..601258a30d 100644
--- a/src/overlay023/ov23_022499E4.c
+++ b/src/overlay023/ov23_022499E4.c
@@ -64,7 +64,7 @@ static void ov23_022499E4 (char * param0)
     return;
 }
 
-void ov23_022499E8 (UnkStruct_0203CDB0 * param0)
+void ov23_022499E8 (FieldSystem * param0)
 {
     UnkStruct_0205964C * v0 = sub_0205964C();
 
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index f4cc567026..3905418ccd 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -89,7 +89,7 @@ typedef struct {
 } UnkStruct_ov23_0224B844;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     SysTask * unk_04;
     UnkStruct_ov23_0224B144 unk_08[17];
     UnkStruct_ov23_0224B144 * unk_A00;
@@ -125,7 +125,7 @@ typedef struct {
 } UnkStruct_ov23_022577AC;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UIControlData * unk_04;
     SysTask * unk_08;
     int unk_0C;
@@ -145,7 +145,7 @@ typedef struct {
 } UnkStruct_ov23_0224BA48;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     SysTask * unk_04;
     UIControlData * unk_08;
     int unk_0C;
@@ -184,9 +184,9 @@ static void ov23_0224B39C(UnkStruct_02029894 * param0, u32 * param1);
 static void ov23_0224C448(void);
 static void ov23_0224C6E8(void);
 static void ov23_0224C588(int param0, int param1, int param2, int param3);
-static void ov23_0224CAF0(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, BOOL param5);
-static void ov23_0224BC5C(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, int param5);
-static void ov23_0224C090(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, int param5);
+static void ov23_0224CAF0(FieldSystem * param0, int param1, int param2, int param3, int param4, BOOL param5);
+static void ov23_0224BC5C(FieldSystem * param0, int param1, int param2, int param3, int param4, int param5);
+static void ov23_0224C090(FieldSystem * param0, int param1, int param2, int param3, int param4, int param5);
 static BOOL ov23_0224B79C(int param0, int param1);
 static void ov23_0224B844(int param0, int param1, BOOL param2);
 static void ov23_0224D238(void);
@@ -321,7 +321,7 @@ static void ov23_0224B128 (int param0, UnkStruct_ov23_0224B098 * param1)
     ov23_0224B0DC(v0, param1);
 }
 
-void ov23_0224B144 (void * param0, UnkStruct_0203CDB0 * param1)
+void ov23_0224B144 (void * param0, FieldSystem * param1)
 {
     int v0;
     UnkStruct_ov23_0224B144 * v1;
@@ -376,7 +376,7 @@ void ov23_0224B144 (void * param0, UnkStruct_0203CDB0 * param1)
     Unk_ov23_022577AC->unk_04 = SysTask_Start(ov23_0224C5B4, NULL, 100);
 }
 
-void ov23_0224B2C8 (UnkStruct_0203CDB0 * param0)
+void ov23_0224B2C8 (FieldSystem * param0)
 {
     UnkStruct_02029894 * v0;
     UnkStruct_0202855C * v1;
@@ -842,7 +842,7 @@ static void ov23_0224BA6C (SysTask * param0, void * param1)
 static void ov23_0224BAAC (SysTask * param0, void * param1)
 {
     UnkStruct_ov23_0224BA48 * v0 = param1;
-    UnkStruct_0203CDB0 * v1 = v0->unk_00;
+    FieldSystem * v1 = v0->unk_00;
     UnkStruct_02049FA8 v2;
     int v3 = 0, v4 = 0, v5, v6, v7 = 0;
     UnkStruct_ov23_0224B730 v8;
@@ -937,7 +937,7 @@ static void ov23_0224BAAC (SysTask * param0, void * param1)
     }
 }
 
-static void ov23_0224BC5C (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, int param5)
+static void ov23_0224BC5C (FieldSystem * param0, int param1, int param2, int param3, int param4, int param5)
 {
     UnkStruct_ov23_0224BA48 * v0 = NULL;
 
@@ -959,7 +959,7 @@ static void ov23_0224BC5C (UnkStruct_0203CDB0 * param0, int param1, int param2,
     sub_020594FC();
 }
 
-static UnkStruct_ov23_0224BA48 * ov23_0224BCC4 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, int param5)
+static UnkStruct_ov23_0224BA48 * ov23_0224BCC4 (FieldSystem * param0, int param1, int param2, int param3, int param4, int param5)
 {
     UnkStruct_ov23_0224BA48 * v0 = NULL;
 
@@ -1042,7 +1042,7 @@ static UIControlData * ov23_0224BD90 (BGL * param0, const UnkStruct_ov61_0222C88
 static void ov23_0224BE28 (SysTask * param0, void * param1)
 {
     UnkStruct_ov23_0224BA48 * v0 = param1;
-    UnkStruct_0203CDB0 * v1 = v0->unk_00;
+    FieldSystem * v1 = v0->unk_00;
     UnkStruct_02049FA8 v2;
     int v3 = 0, v4 = 0, v5, v6, v7 = 0;
     UnkStruct_ov23_0224B730 v8;
@@ -1170,7 +1170,7 @@ static void ov23_0224BE28 (SysTask * param0, void * param1)
     }
 }
 
-static void ov23_0224C090 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, int param5)
+static void ov23_0224C090 (FieldSystem * param0, int param1, int param2, int param3, int param4, int param5)
 {
     UnkStruct_ov23_0224BA48 * v0 = NULL;
 
@@ -1527,7 +1527,7 @@ static void ov23_0224C6E8 (void)
 
 static BOOL ov23_0224C708 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov23_0224BA48 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_10) {
@@ -1548,7 +1548,7 @@ static BOOL ov23_0224C708 (UnkStruct_020508D4 * param0)
 
 static BOOL ov23_0224C74C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov23_0224BA48 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_10) {
@@ -1569,7 +1569,7 @@ static BOOL ov23_0224C74C (UnkStruct_020508D4 * param0)
 
 static BOOL ov23_0224C790 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov23_0224BA48 * v1 = sub_02050A64(param0);
     UnkStruct_02049FA8 v2;
     int v3 = 0, v4 = 0;
@@ -1733,7 +1733,7 @@ static BOOL ov23_0224C790 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static void ov23_0224CAF0 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, BOOL param5)
+static void ov23_0224CAF0 (FieldSystem * param0, int param1, int param2, int param3, int param4, BOOL param5)
 {
     UnkStruct_ov23_0224BA48 * v0 = ov23_0224BCC4(param0, param1, param2, param3, param4, param4);
 
@@ -1746,7 +1746,7 @@ static void ov23_0224CAF0 (UnkStruct_0203CDB0 * param0, int param1, int param2,
 static void ov23_0224CB1C (SysTask * param0, void * param1)
 {
     UnkStruct_ov23_0224CB1C * v0 = param1;
-    UnkStruct_0203CDB0 * v1 = v0->unk_00;
+    FieldSystem * v1 = v0->unk_00;
     UnkStruct_02049FA8 v2;
     u32 v3;
     BOOL v4 = 0;
diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c
index 1802d6069f..727b86a656 100644
--- a/src/overlay023/ov23_0224DC40.c
+++ b/src/overlay023/ov23_0224DC40.c
@@ -65,7 +65,7 @@ typedef struct {
 typedef struct {
     SysTask * unk_00;
     UnkStruct_ov23_02250CD4 * unk_04;
-    UnkStruct_0203CDB0 * unk_08;
+    FieldSystem * unk_08;
     Window unk_0C;
     ResourceMetadata * unk_1C;
     UnkStruct_0200112C * unk_20;
@@ -87,7 +87,7 @@ typedef void (* UnkFuncPtr_ov23_0224E1E0)(UnkStruct_ov23_0224E280 *);
 
 typedef struct {
     SysTask * unk_00;
-    UnkStruct_0203CDB0 * unk_04;
+    FieldSystem * unk_04;
     Window unk_08;
     ResourceMetadata * unk_18;
     UnkStruct_0200112C * unk_1C;
@@ -211,7 +211,7 @@ static void ov23_0224DC90 (UnkStruct_ov23_022577B0 * param0, int param1)
     ov23_02253F40(ov23_0224219C(), v0, 0, NULL);
 }
 
-void ov23_0224DCB8 (int param0, UnkFuncPtr_ov23_0224DCB8 param1, UnkStruct_0203CDB0 * param2)
+void ov23_0224DCB8 (int param0, UnkFuncPtr_ov23_0224DCB8 param1, FieldSystem * param2)
 {
     UnkStruct_ov23_0224E280 * v0;
     UnkStruct_ov84_02240FA8 v1;
@@ -1275,7 +1275,7 @@ static void ov23_0224EC50 (SysTask * param0, void * param1)
     }
 }
 
-void ov23_0224F07C (int param0, int param1, UnkStruct_0203CDB0 * param2)
+void ov23_0224F07C (int param0, int param1, FieldSystem * param2)
 {
     UnkStruct_ov23_022577B0 * v0;
 
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index 712b5a8c58..5592c7f242 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -426,7 +426,7 @@ BOOL ov23_0224F744 (int param0)
     return sub_02028BC8(Unk_ov23_022577B8->unk_00, param0);
 }
 
-void ov23_0224F758 (UnkFuncPtr_ov23_0224F758 param0, UnkStruct_0203CDB0 * param1)
+void ov23_0224F758 (UnkFuncPtr_ov23_0224F758 param0, FieldSystem * param1)
 {
     UnkStruct_ov23_02250CD4 * v0;
     UnkStruct_ov84_02240FA8 v1;
@@ -1423,7 +1423,7 @@ static void ov23_02250A14 (UnkStruct_ov23_02250CD4 * param0)
     param0->unk_2AA = 10;
 }
 
-void ov23_02250A50 (UnkFuncPtr_ov23_0224F758 param0, UnkStruct_0203CDB0 * param1)
+void ov23_02250A50 (UnkFuncPtr_ov23_0224F758 param0, FieldSystem * param1)
 {
     UnkStruct_ov23_02250CD4 * v0;
     UnkStruct_ov84_02240FA8 v1;
@@ -1847,7 +1847,7 @@ static BOOL ov23_022510F0 (SysTask * param0, void * param1)
     return 1;
 }
 
-void * ov23_022511B0 (UnkFuncPtr_ov23_0224F758 param0, UnkStruct_0203CDB0 * param1)
+void * ov23_022511B0 (UnkFuncPtr_ov23_0224F758 param0, FieldSystem * param1)
 {
     UnkStruct_ov23_02250CD4 * v0;
     UnkStruct_ov84_02240FA8 v1;
diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c
index 8349d906ce..95f468af03 100644
--- a/src/overlay023/ov23_0225128C.c
+++ b/src/overlay023/ov23_0225128C.c
@@ -72,14 +72,14 @@ typedef struct {
 
 typedef struct {
     int unk_00;
-    UnkStruct_0203CDB0 * unk_04;
+    FieldSystem * unk_04;
     UIControlData * unk_08;
     UnkStruct_ov23_022513B0 unk_0C;
     SysTask * unk_10;
 } UnkStruct_ov23_02252038;
 
-static void ov23_022520E8(UnkStruct_0203CDB0 * param0, UnkStruct_ov23_022513B0 * param1);
-static void ov23_02251F94(UnkStruct_0203CDB0 * param0);
+static void ov23_022520E8(FieldSystem * param0, UnkStruct_ov23_022513B0 * param1);
+static void ov23_02251F94(FieldSystem * param0);
 static void ov23_022521C8(UnkStruct_ov23_02250CD4 * param0);
 
 static const UnkStruct_ov61_0222C884 Unk_ov23_022569C8 = {
@@ -199,7 +199,7 @@ static void ov23_022513A4 (int param0)
 void ov23_022513B0 (int param0, int param1, void * param2, void * param3)
 {
     UnkStruct_ov23_022513B0 * v0 = param2;
-    UnkStruct_0203CDB0 * v1 = param3;
+    FieldSystem * v1 = param3;
 
     if (!sub_02035EE0()) {
         return;
@@ -597,7 +597,7 @@ static BOOL ov23_02251A58 (UnkStruct_ov23_02250CD4 * param0)
     return 0;
 }
 
-static void ov23_02251A84 (BOOL param0, UnkStruct_0203CDB0 * param1)
+static void ov23_02251A84 (BOOL param0, FieldSystem * param1)
 {
     VecFx32 v0;
 
@@ -615,7 +615,7 @@ static void ov23_02251A84 (BOOL param0, UnkStruct_0203CDB0 * param1)
 
 static BOOL ov23_02251ACC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov23_02251ACC * v1 = sub_02050A64(param0);
     UnkStruct_02049FA8 v2;
     u32 v3;
@@ -840,7 +840,7 @@ static void ov23_02251C04 (SysTask * param0, void * param1)
     }
 }
 
-static void ov23_02251F94 (UnkStruct_0203CDB0 * param0)
+static void ov23_02251F94 (FieldSystem * param0)
 {
     UnkStruct_ov84_02240FA8 v0;
     UnkStruct_ov23_02250CD4 * v1;
@@ -916,7 +916,7 @@ static void ov23_022520C8 (SysTask * param0, void * param1)
     SysTask_Done(param0);
 }
 
-static void ov23_022520E8 (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_022513B0 * param1)
+static void ov23_022520E8 (FieldSystem * param0, UnkStruct_ov23_022513B0 * param1)
 {
     UnkStruct_ov23_02252038 * v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_02250CD4));
 
@@ -947,7 +947,7 @@ void ov23_0225215C (int param0, int param1, void * param2, void * param3)
 
 void ov23_02252178 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = param3;
+    FieldSystem * v0 = param3;
     UnkStruct_ov23_022513B0 * v1 = param2;
 
     if (CommSys_CurNetId() == v1->unk_00) {
diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c
index 0ce4516742..7f633540fe 100644
--- a/src/overlay023/ov23_022521F0.c
+++ b/src/overlay023/ov23_022521F0.c
@@ -514,7 +514,7 @@ static void ov23_02252C78 (UnkStruct_ov23_02250CD4 * param0)
     Heap_FreeToHeap(param0);
 }
 
-void * ov23_02252C98 (int param0, UnkStruct_0203CDB0 * param1, int param2)
+void * ov23_02252C98 (int param0, FieldSystem * param1, int param2)
 {
     UnkStruct_ov23_02250CD4 * v0 = NULL;
     return v0;
@@ -913,7 +913,7 @@ static void ov23_02252E70 (SysTask * param0, void * param1)
     }
 }
 
-void ov23_022534A0 (UnkStruct_0203CDB0 * param0)
+void ov23_022534A0 (FieldSystem * param0)
 {
     UnkStruct_ov84_02240FA8 v0;
     int v1 = sub_02058D88(CommSys_CurNetId());
diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c
index 235e7f35ab..8d059b2cd3 100644
--- a/src/overlay023/ov23_022542CC.c
+++ b/src/overlay023/ov23_022542CC.c
@@ -35,7 +35,7 @@
 #include "overlay023/ov23_022542CC.h"
 
 typedef struct UnkStruct_ov23_022542D8_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     Window unk_04;
     Window unk_14;
     ResourceMetadata * unk_24;
@@ -49,7 +49,7 @@ typedef struct UnkStruct_ov23_022542D8_t {
 };
 
 typedef struct UnkStruct_ov23_02254594_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_0206A844 * unk_04;
     Window unk_08;
     Window unk_18;
@@ -106,7 +106,7 @@ UnkStruct_ov23_022542D8 * ov23_022542CC (void)
     return v0;
 }
 
-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)
 {
     param0->unk_00 = param1;
     param0->unk_38 = 0;
@@ -278,7 +278,7 @@ UnkStruct_ov23_02254594 * ov23_02254588 (void)
     return v0;
 }
 
-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)
 {
     param0->unk_00 = param1;
     param0->unk_42 = 0;
diff --git a/src/overlay023/ov23_02254A14.c b/src/overlay023/ov23_02254A14.c
index d5682a31a6..405dd6d11f 100644
--- a/src/overlay023/ov23_02254A14.c
+++ b/src/overlay023/ov23_02254A14.c
@@ -97,7 +97,7 @@ typedef struct {
     UnkStruct_ov23_02256228 unk_4DC;
     UnkStruct_ov23_02256000 unk_4F0;
     UnkStruct_ov23_02255EC4 * unk_4FC;
-    UnkStruct_0203CDB0 * unk_500;
+    FieldSystem * unk_500;
     UnkStruct_ov23_022542D8 * unk_504;
     UnkStruct_ov23_02254594 * unk_508;
     UnkStruct_ov5_021D1BEC * unk_50C;
@@ -119,8 +119,8 @@ static BOOL ov23_02254DF8(UnkStruct_020508D4 * param0);
 static BOOL ov23_02255100(UnkStruct_020508D4 * param0);
 static BOOL ov23_02255580(UnkStruct_020508D4 * param0);
 static BOOL ov23_02255850(UnkStruct_020508D4 * param0);
-static void ov23_02254A14(UnkStruct_0203CDB0 * param0, const int param1, UnkStruct_ov23_02256098 * param2);
-static void ov23_02254A94(UnkStruct_0203CDB0 * param0, const int param1);
+static void ov23_02254A14(FieldSystem * param0, const int param1, UnkStruct_ov23_02256098 * param2);
+static void ov23_02254A94(FieldSystem * param0, const int param1);
 static void ov23_02254AA4(const int param0, UnkStruct_ov23_02256098 * param1);
 static BOOL ov23_02255A98(const UnkStruct_ov23_02255A98 * param0, const UnkStruct_ov23_02255BF4 * param1);
 static BOOL ov23_02255B14(const int param0, const int param1, const UnkStruct_ov23_02255BF4 * param2, int * param3);
@@ -130,11 +130,11 @@ static void ov23_02255BF4(const int param0, UnkStruct_ov23_02255BF4 * param1);
 static BOOL ov23_02255C30(const UnkStruct_ov23_02255C30 * param0, const UnkStruct_ov23_02255C30 * param1);
 static BOOL ov23_02255C58(const UnkStruct_ov23_02255C30 * param0, const int param1, const int param2);
 static BOOL ov23_02255B58(const UnkStruct_ov23_02255C30 * param0);
-static void ov23_02255C78(UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02256098 * param1, UnkStruct_ov23_02255BF4 * param2);
+static void ov23_02255C78(FieldSystem * param0, UnkStruct_ov23_02256098 * param1, UnkStruct_ov23_02255BF4 * param2);
 static void ov23_02255D1C(const int param0, const int param1, const int param2, const int param3, UnkStruct_ov23_02255BF4 * param4);
-static void ov23_02255D78(UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02255BF4 * param1);
-static void ov23_02255DDC(UnkStruct_0203CDB0 * param0, const UnkStruct_ov23_02255BF4 * param1);
-static const int ov23_02255E14(UnkStruct_0203CDB0 * param0, const int param1);
+static void ov23_02255D78(FieldSystem * param0, UnkStruct_ov23_02255BF4 * param1);
+static void ov23_02255DDC(FieldSystem * param0, const UnkStruct_ov23_02255BF4 * param1);
+static const int ov23_02255E14(FieldSystem * param0, const int param1);
 static void ov23_02255E2C(const int param0, UnkStruct_ov23_02256098 * param1);
 static void ov23_02255E8C(UnkStruct_ov23_02256098 * param0);
 static void ov23_02255EBC(const int param0, UnkStruct_ov23_02256098 * param1);
@@ -143,19 +143,19 @@ static void ov23_02255EF0(UnkStruct_ov23_02255EC4 * param0);
 static void ov23_02255EFC(UnkStruct_ov23_02255EC4 * param0);
 static void ov23_02255F04(const int param0, const int param1, UnkStruct_ov23_02255EC4 * param2);
 static void ov23_02255F20(UnkStruct_ov23_02255EC4 * param0);
-static BOOL ov23_02256098(UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0 * param1, BOOL * param2);
-static BOOL ov23_02256104(UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0 * param1, BOOL * param2);
-static BOOL ov23_02256174(UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0 * param1, BOOL * param2);
-static BOOL ov23_022561BC(UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0 * param1, BOOL * param2);
+static BOOL ov23_02256098(UnkStruct_ov23_02256098 * param0, FieldSystem * param1, BOOL * param2);
+static BOOL ov23_02256104(UnkStruct_ov23_02256098 * param0, FieldSystem * param1, BOOL * param2);
+static BOOL ov23_02256174(UnkStruct_ov23_02256098 * param0, FieldSystem * param1, BOOL * param2);
+static BOOL ov23_022561BC(UnkStruct_ov23_02256098 * param0, FieldSystem * param1, BOOL * param2);
 static void ov23_02256228(UnkStruct_ov23_02256228 * param0);
 static void ov23_0225623C(const int param0, const int param1, UnkStruct_ov23_02256228 * param2);
-static void ov23_0225624C(UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02256228 * param1);
-static void ov23_0225628C(UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02256228 * param1);
+static void ov23_0225624C(FieldSystem * param0, UnkStruct_ov23_02256228 * param1);
+static void ov23_0225628C(FieldSystem * param0, UnkStruct_ov23_02256228 * param1);
 static const int ov23_022562A8(UnkStruct_ov23_02256228 * param0);
-static void ov23_022562AC(UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2);
-static void ov23_022562B8(UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2);
-static void ov23_022562BC(UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2);
-static void ov23_022562C8(UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2);
+static void ov23_022562AC(UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2);
+static void ov23_022562B8(UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2);
+static void ov23_022562BC(UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2);
+static void ov23_022562C8(UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2);
 
 static const UnkStruct_ov6_0223E6EC Unk_ov23_02256B88 = {
     0x0,
@@ -166,7 +166,7 @@ static const UnkStruct_ov6_0223E6EC Unk_ov23_02256B88 = {
     ov23_022562C8
 };
 
-static void ov23_02254A14 (UnkStruct_0203CDB0 * param0, const int param1, UnkStruct_ov23_02256098 * param2)
+static void ov23_02254A14 (FieldSystem * param0, const int param1, UnkStruct_ov23_02256098 * param2)
 {
     UnkStruct_ov23_02255A98 * v0;
     VecFx32 v1;
@@ -190,7 +190,7 @@ static void ov23_02254A14 (UnkStruct_0203CDB0 * param0, const int param1, UnkStr
     v0->unk_14 = param1;
 }
 
-static void ov23_02254A94 (UnkStruct_0203CDB0 * param0, const int param1)
+static void ov23_02254A94 (FieldSystem * param0, const int param1)
 {
     ov5_021E1674(param1, param0->unk_A4);
 }
@@ -207,7 +207,7 @@ static void ov23_02254AA4 (const int param0, UnkStruct_ov23_02256098 * param1)
 
 static BOOL ov23_02254AD4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov23_02256098 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -277,7 +277,7 @@ static BOOL ov23_02254AD4 (UnkStruct_020508D4 * param0)
 static BOOL ov23_02254C84 (UnkStruct_020508D4 * param0)
 {
     BOOL v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov23_02256098 * v2 = sub_02050A64(param0);
 
     v0 = ov23_02254318(v2->unk_504);
@@ -336,7 +336,7 @@ static BOOL ov23_02254C84 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void ov23_02254D98 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1)
+void ov23_02254D98 (FieldSystem * param0, UnkStruct_020508D4 * param1)
 {
     UnkStruct_ov23_02256098 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov23_02256098));
 
@@ -356,7 +356,7 @@ static BOOL ov23_02254DF8 (UnkStruct_020508D4 * param0)
     UnkStruct_ov5_021E1890 * v2;
     BOOL v3;
     BOOL v4;
-    UnkStruct_0203CDB0 * v5 = sub_02050A60(param0);
+    FieldSystem * v5 = sub_02050A60(param0);
     UnkStruct_ov23_02256098 * v6 = sub_02050A64(param0);
 
     switch (v6->unk_04) {
@@ -536,7 +536,7 @@ static BOOL ov23_02255100 (UnkStruct_020508D4 * param0)
     fx32 v2, v3;
     BOOL v4;
     BOOL v5;
-    UnkStruct_0203CDB0 * v6 = sub_02050A60(param0);
+    FieldSystem * v6 = sub_02050A60(param0);
     UnkStruct_ov23_02256098 * v7 = sub_02050A64(param0);
 
     switch (v7->unk_04) {
@@ -773,7 +773,7 @@ static BOOL ov23_02255580 (UnkStruct_020508D4 * param0)
     fx32 v2, v3;
     BOOL v4;
     BOOL v5;
-    UnkStruct_0203CDB0 * v6 = sub_02050A60(param0);
+    FieldSystem * v6 = sub_02050A60(param0);
     UnkStruct_ov23_02256098 * v7 = sub_02050A64(param0);
 
     switch (v7->unk_04) {
@@ -925,7 +925,7 @@ static BOOL ov23_02255850 (UnkStruct_020508D4 * param0)
     UnkStruct_ov5_021E1890 * v2;
     BOOL v3;
     BOOL v4;
-    UnkStruct_0203CDB0 * v5 = sub_02050A60(param0);
+    FieldSystem * v5 = sub_02050A60(param0);
     UnkStruct_ov23_02256098 * v6 = sub_02050A64(param0);
 
     switch (v6->unk_04) {
@@ -1157,7 +1157,7 @@ static BOOL ov23_02255C58 (const UnkStruct_ov23_02255C30 * param0, const int par
     }
 }
 
-static void ov23_02255C78 (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02256098 * param1, UnkStruct_ov23_02255BF4 * param2)
+static void ov23_02255C78 (FieldSystem * param0, UnkStruct_ov23_02256098 * param1, UnkStruct_ov23_02255BF4 * param2)
 {
     int v0;
     int v1;
@@ -1209,7 +1209,7 @@ static void ov23_02255D1C (const int param0, const int param1, const int param2,
     param4[param0].unk_00 = 1;
 }
 
-static void ov23_02255D78 (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02255BF4 * param1)
+static void ov23_02255D78 (FieldSystem * param0, UnkStruct_ov23_02255BF4 * param1)
 {
     int v0;
     int v1, v2;
@@ -1238,7 +1238,7 @@ static void ov23_02255D78 (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02255BF4
     }
 }
 
-static void ov23_02255DDC (UnkStruct_0203CDB0 * param0, const UnkStruct_ov23_02255BF4 * param1)
+static void ov23_02255DDC (FieldSystem * param0, const UnkStruct_ov23_02255BF4 * param1)
 {
     int v0;
     int v1;
@@ -1262,7 +1262,7 @@ static void ov23_02255DDC (UnkStruct_0203CDB0 * param0, const UnkStruct_ov23_022
     }
 }
 
-static const int ov23_02255E14 (UnkStruct_0203CDB0 * param0, const int param1)
+static const int ov23_02255E14 (FieldSystem * param0, const int param1)
 {
     int v0;
 
@@ -1357,7 +1357,7 @@ static void ov23_02255F28 (const int param0, const int param1, UnkStruct_ov23_02
     }
 }
 
-static void ov23_02255F40 (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02255A98 * param1, UnkStruct_ov23_02256000 * param2)
+static void ov23_02255F40 (FieldSystem * param0, UnkStruct_ov23_02255A98 * param1, UnkStruct_ov23_02256000 * param2)
 {
     UnkStruct_ov23_02255C30 v0;
     VecFx32 v1;
@@ -1400,7 +1400,7 @@ static void ov23_02255F40 (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02255A98
     }
 }
 
-static void ov23_02256000 (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02256000 * param1, UnkStruct_ov23_02255EC4 * param2)
+static void ov23_02256000 (FieldSystem * param0, UnkStruct_ov23_02256000 * param1, UnkStruct_ov23_02255EC4 * param2)
 {
     UnkStruct_ov23_02255C30 v0;
     VecFx32 v1;
@@ -1431,7 +1431,7 @@ static void ov23_02256000 (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02256000
     }
 }
 
-static BOOL ov23_02256098 (UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0 * param1, BOOL * param2)
+static BOOL ov23_02256098 (UnkStruct_ov23_02256098 * param0, FieldSystem * param1, BOOL * param2)
 {
     VecFx32 v0;
     BOOL v1;
@@ -1462,7 +1462,7 @@ static BOOL ov23_02256098 (UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0
     return v1;
 }
 
-static BOOL ov23_02256104 (UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0 * param1, BOOL * param2)
+static BOOL ov23_02256104 (UnkStruct_ov23_02256098 * param0, FieldSystem * param1, BOOL * param2)
 {
     VecFx32 v0;
     BOOL v1;
@@ -1493,7 +1493,7 @@ static BOOL ov23_02256104 (UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0
     return v1;
 }
 
-static BOOL ov23_02256174 (UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0 * param1, BOOL * param2)
+static BOOL ov23_02256174 (UnkStruct_ov23_02256098 * param0, FieldSystem * param1, BOOL * param2)
 {
     VecFx32 v0;
     BOOL v1;
@@ -1516,7 +1516,7 @@ static BOOL ov23_02256174 (UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0
     return v1;
 }
 
-static BOOL ov23_022561BC (UnkStruct_ov23_02256098 * param0, UnkStruct_0203CDB0 * param1, BOOL * param2)
+static BOOL ov23_022561BC (UnkStruct_ov23_02256098 * param0, FieldSystem * param1, BOOL * param2)
 {
     VecFx32 v0;
     BOOL v1;
@@ -1565,7 +1565,7 @@ static void ov23_0225623C (const int param0, const int param1, UnkStruct_ov23_02
     param2->unk_10 = 1;
 }
 
-static void ov23_0225624C (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02256228 * param1)
+static void ov23_0225624C (FieldSystem * param0, UnkStruct_ov23_02256228 * param1)
 {
     UnkStruct_ov5_021E1890 * v0;
 
@@ -1583,7 +1583,7 @@ static void ov23_0225624C (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02256228
     }
 }
 
-static void ov23_0225628C (UnkStruct_0203CDB0 * param0, UnkStruct_ov23_02256228 * param1)
+static void ov23_0225628C (FieldSystem * param0, UnkStruct_ov23_02256228 * param1)
 {
     UnkStruct_ov5_021E1890 * v0;
 
@@ -1600,24 +1600,24 @@ static const int ov23_022562A8 (UnkStruct_ov23_02256228 * param0)
     return param0->unk_00;
 }
 
-static void ov23_022562AC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov23_022562AC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov23_02255EC4 * v0 = (UnkStruct_ov23_02255EC4 *)(param2);
     ov23_02255EC4(v0);
 }
 
-static void ov23_022562B8 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov23_022562B8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     return;
 }
 
-static void ov23_022562BC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov23_022562BC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov23_02255EC4 * v0 = (UnkStruct_ov23_02255EC4 *)(param2);
     ov23_02255EF0(v0);
 }
 
-static void ov23_022562C8 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
+static void ov23_022562C8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov23_02255EC4 * v0 = (UnkStruct_ov23_02255EC4 *)(param2);
 
diff --git a/src/overlay025/ov25_02253CE0.c b/src/overlay025/ov25_02253CE0.c
index 0b6643478e..1e51d219da 100644
--- a/src/overlay025/ov25_02253CE0.c
+++ b/src/overlay025/ov25_02253CE0.c
@@ -100,7 +100,7 @@ typedef struct UnkStruct_ov25_02253CE0_t {
     NNSG2dOamManagerInstance * unk_50;
     SaveData * unk_54;
     PoketchData * unk_58;
-    UnkStruct_0203CDB0 * unk_5C;
+    FieldSystem * unk_5C;
     int unk_60;
 } UnkStruct_ov25_02253CE0;
 
@@ -164,7 +164,7 @@ static UnkStruct_ov25_02253CE0 * ov25_02253CE0 (void)
     return sub_0203D158();
 }
 
-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)
 {
     UnkStruct_ov25_02253CE0 * v0;
 
@@ -806,7 +806,7 @@ BOOL ov25_02254538 (const UnkStruct_ov25_0225424C * param0)
     return param0->unk_07;
 }
 
-UnkStruct_0203CDB0 * ov25_0225453C (const UnkStruct_ov25_0225424C * param0)
+FieldSystem * ov25_0225453C (const UnkStruct_ov25_0225424C * param0)
 {
     return param0->unk_5C;
 }
diff --git a/src/overlay052/ov52_022561C0.c b/src/overlay052/ov52_022561C0.c
index 6ccc64ca74..6c2c5b21fc 100644
--- a/src/overlay052/ov52_022561C0.c
+++ b/src/overlay052/ov52_022561C0.c
@@ -170,7 +170,7 @@ static BOOL ov52_022562F8 (UnkStruct_ov52_0225621C * param0)
     case 0:
         if (ov52_02256554(param0)) {
             if (ov52_02256684(param0)) {
-                UnkStruct_0203CDB0 * v0 = ov25_0225453C(param0->unk_18);
+                FieldSystem * v0 = ov25_0225453C(param0->unk_18);
 
                 ov52_022567A4(param0->unk_14, 3);
 
diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c
index 46c8c8b7cb..f2e9ff3653 100644
--- a/src/overlay053/ov53_022561C0.c
+++ b/src/overlay053/ov53_022561C0.c
@@ -89,7 +89,7 @@ static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, UnkStruct_ov25_0225
             (48 + (48 / 2))
         }
     };
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
     int v2;
 
     v1 = ov25_0225453C(param1);
@@ -203,7 +203,7 @@ static BOOL ov53_02256370 (UnkStruct_ov53_0225621C * param0)
     }
 
     {
-        UnkStruct_0203CDB0 * v0;
+        FieldSystem * v0;
         int v1;
 
         v0 = ov25_0225453C(param0->unk_30);
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index e3329eb36c..2eec848ce9 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -80,7 +80,7 @@ struct UnkStruct_ov56_02256468_t {
     int unk_00;
     UnkStruct_0205C22C * unk_04;
     UnkStruct_0205B43C * unk_08;
-    UnkStruct_0203CDB0 * unk_0C;
+    FieldSystem * unk_0C;
     TrainerInfo * unk_10;
     BGL * unk_14;
     StringFormatter * unk_18;
@@ -234,7 +234,7 @@ static void ov56_022563E8 (UnkStruct_ov56_022562EC * param0)
     }
 }
 
-UnkStruct_ov56_02256468 * ov56_02256410 (UnkStruct_0203CDB0 * param0)
+UnkStruct_ov56_02256468 * ov56_02256410 (FieldSystem * param0)
 {
     UnkStruct_ov56_02256468 * v0;
     SysTask * v1;
diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c
index 15267e596e..0944a8a848 100644
--- a/src/overlay104/ov104_02239C58.c
+++ b/src/overlay104/ov104_02239C58.c
@@ -28,10 +28,10 @@ UnkStruct_0209BBA4 * ov104_02239C58(SaveData * param0);
 void ov104_02239C7C(UnkStruct_0209BBA4 * param0);
 BOOL ov104_02239C88(UnkStruct_0209BBA4 * param0, u16 param1, u16 param2, u16 param3);
 void ov104_02239CD0(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, u16 param2);
-static void ov104_02239D1C(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, UnkStruct_0203CDB0 * param2, int param3);
-static void ov104_02239F38(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, UnkStruct_0203CDB0 * param2, int param3);
-static void ov104_02239FB0(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, UnkStruct_0203CDB0 * param2, int param3);
-static void ov104_0223A090(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, UnkStruct_0203CDB0 * param2, int param3);
+static void ov104_02239D1C(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * param2, int param3);
+static void ov104_02239F38(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * param2, int param3);
+static void ov104_02239FB0(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * param2, int param3);
+static void ov104_0223A090(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * param2, int param3);
 
 UnkStruct_0209BBA4 * ov104_02239C58 (SaveData * param0)
 {
@@ -83,7 +83,7 @@ BOOL ov104_02239C88 (UnkStruct_0209BBA4 * param0, u16 param1, u16 param2, u16 pa
 
 void ov104_02239CD0 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, u16 param2)
 {
-    UnkStruct_0203CDB0 * v0 = param1->unk_98;
+    FieldSystem * v0 = param1->unk_98;
 
     switch (param2) {
     case 0:
@@ -105,7 +105,7 @@ void ov104_02239CD0 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, u
     return;
 }
 
-static void ov104_02239D1C (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, UnkStruct_0203CDB0 * param2, int param3)
+static void ov104_02239D1C (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * param2, int param3)
 {
     u8 v0;
 
@@ -161,7 +161,7 @@ static void ov104_02239D1C (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * pa
     return;
 }
 
-static void ov104_02239F38 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, UnkStruct_0203CDB0 * param2, int param3)
+static void ov104_02239F38 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * param2, int param3)
 {
     int v0;
 
@@ -189,7 +189,7 @@ static void ov104_02239F38 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * pa
     return;
 }
 
-static void ov104_02239FB0 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, UnkStruct_0203CDB0 * param2, int param3)
+static void ov104_02239FB0 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * param2, int param3)
 {
     static const u8 v0[] = {
         0, 1, 2, 4, 3, 5, 6, 7, 8
@@ -216,7 +216,7 @@ static void ov104_02239FB0 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * pa
     return;
 }
 
-static void ov104_0223A090 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, UnkStruct_0203CDB0 * param2, int param3)
+static void ov104_0223A090 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * param2, int param3)
 {
     param1->unk_9F = param1->unk_AC->pos;
     Heap_FreeToHeap(param1->unk_AC);
diff --git a/src/pokeradar.c b/src/pokeradar.c
index becb5d61ee..1b43b9882b 100644
--- a/src/pokeradar.c
+++ b/src/pokeradar.c
@@ -55,10 +55,10 @@ typedef struct RadarChain {
     u8 unk_D0;
 } RadarChain;
 
-static BOOL CheckTileIsGrass(UnkStruct_0203CDB0 *param0, const fx32 param1, const int param2, const int param3, const u8 param4, const u8 param5, GrassPatch *patch);
+static BOOL CheckTileIsGrass(FieldSystem *param0, const fx32 param1, const int param2, const int param3, const u8 param4, const u8 param5, GrassPatch *patch);
 static BOOL sub_020698AC(const RadarChain *chain, const int param1, const int param2, u8 *param3);
-static void sub_020698E4(UnkStruct_0203CDB0 *param0, RadarChain *chain);
-static u8 sub_0206994C(UnkStruct_0203CDB0 *param0);
+static void sub_020698E4(FieldSystem *param0, RadarChain *chain);
+static u8 sub_0206994C(FieldSystem *param0);
 static BOOL CheckPatchContinueChain(const u8 patchRing, const int battleResult);
 static BOOL CheckPatchShiny(const int param0);
 static void IncWithCap(int *param0);
@@ -88,7 +88,7 @@ void RadarChain_Clear (RadarChain *chain) {
     }
 }
 
-BOOL RadarSpawnPatches (UnkStruct_0203CDB0 *param0, const int param1, const int param2, RadarChain *chain) {
+BOOL RadarSpawnPatches (FieldSystem *param0, const int param1, const int param2, RadarChain *chain) {
     u8 v1, v2;
     u8 v3;
     u8 v4;
@@ -140,7 +140,7 @@ BOOL RadarSpawnPatches (UnkStruct_0203CDB0 *param0, const int param1, const int
     return chain->active;
 }
 
-void SetupGrassPatches (UnkStruct_0203CDB0 *param0, const int param1, RadarChain *chain) {
+void SetupGrassPatches (FieldSystem *param0, const int param1, RadarChain *chain) {
     for (u8 patchRing = 0; patchRing < NUM_GRASS_PATCHES; patchRing++) {
         if (chain->patch[patchRing].active) {
             chain->patch[patchRing].continueChain = CheckPatchContinueChain(patchRing, param1);
@@ -159,7 +159,7 @@ void SetupGrassPatches (UnkStruct_0203CDB0 *param0, const int param1, RadarChain
     }
 }
 
-void sub_02069638 (UnkStruct_0203CDB0 *param0, RadarChain *chain) {
+void sub_02069638 (FieldSystem *param0, RadarChain *chain) {
     for (u8 patchRing = 0; patchRing < NUM_GRASS_PATCHES; patchRing++) {
         if (chain->patch[patchRing].active) {
             int v1 = chain->patch[patchRing].unk_00;
@@ -201,7 +201,7 @@ BOOL sub_02069690 (RadarChain *chain) {
     return FALSE;
 }
 
-BOOL sub_020696DC (const int param0, const int param1, UnkStruct_0203CDB0 *param2, RadarChain *chain, int *param4, BOOL *param5, BOOL *param6) {
+BOOL sub_020696DC (const int param0, const int param1, FieldSystem *param2, RadarChain *chain, int *param4, BOOL *param5, BOOL *param6) {
     u8 patchRing;
     *param5 = 0;
     *param6 = 0;
@@ -250,7 +250,7 @@ const BOOL sub_02069798 (const RadarChain *chain) {
     return chain->unk_18;
 }
 
-void sub_0206979C (UnkStruct_0203CDB0 *param0) {
+void sub_0206979C (FieldSystem *param0) {
     BOOL v0;
     GrassPatch *patch;
     int patchRing;
@@ -285,7 +285,7 @@ BOOL GetRadarChainActive (const RadarChain *chain) {
     return chain->active;
 }
 
-static BOOL CheckTileIsGrass (UnkStruct_0203CDB0 *param0, const fx32 param1, const int param2, const int param3, const u8 param4, const u8 param5, GrassPatch *patch) {
+static BOOL CheckTileIsGrass (FieldSystem *param0, const fx32 param1, const int param2, const int param3, const u8 param4, const u8 param5, GrassPatch *patch) {
     int v0 = (param2 - (9 / 2)) + param4;
     int v1 = (param3 - (9 / 2)) + param5;
     patch->unk_00 = v0;
@@ -330,7 +330,7 @@ static BOOL sub_020698AC (const RadarChain *chain, const int param1, const int p
     return FALSE;
 }
 
-static void sub_020698E4 (UnkStruct_0203CDB0 *param0, RadarChain *chain) {
+static void sub_020698E4 (FieldSystem *param0, RadarChain *chain) {
     UnkStruct_020698E4 *v0 = sub_0202D830(sub_0202D834(param0->unk_0C));
     int v1 = v0->unk_00[chain->unk_D0].unk_02;
 
@@ -350,7 +350,7 @@ static void sub_020698E4 (UnkStruct_0203CDB0 *param0, RadarChain *chain) {
     }
 }
 
-static u8 sub_0206994C (UnkStruct_0203CDB0 *param0) {
+static u8 sub_0206994C (FieldSystem *param0) {
     u8 v1;
     BOOL v2;
     UnkStruct_020698E4 *v0 = sub_0202D830(sub_0202D834(param0->unk_0C));
@@ -395,7 +395,7 @@ static BOOL CheckPatchContinueChain (const u8 patchRing, const int battleResult)
 }
 
 BOOL RefreshRadarChain (UnkStruct_020508D4 *param0) {
-    UnkStruct_0203CDB0 *v0 = sub_02050A60(param0);
+    FieldSystem *v0 = sub_02050A60(param0);
     int *v1 = sub_02050A64(param0);
 
     switch (*v1) {
@@ -461,16 +461,16 @@ static BOOL CheckPatchShiny (const int chainCount) {
     }
 }
 
-void sub_02069B74 (UnkStruct_0203CDB0 *param0) {
+void sub_02069B74 (FieldSystem *param0) {
     IncWithCap(&(param0->chain->count));
     sub_020698E4(param0, param0->chain);
 }
 
-int GetChainCount (UnkStruct_0203CDB0 *param0) {
+int GetChainCount (FieldSystem *param0) {
     return param0->chain->count;
 }
 
-void RadarChargeStep (UnkStruct_0203CDB0 *param0) {
+void RadarChargeStep (FieldSystem *param0) {
     u8 *v0;
 
     if (sub_0207D688(sub_0207D990(param0->unk_0C), 431, 1, 4) == 1) {
diff --git a/src/unk_0203A378.c b/src/unk_0203A378.c
index c24d0fa541..946a8b51ed 100644
--- a/src/unk_0203A378.c
+++ b/src/unk_0203A378.c
@@ -33,14 +33,14 @@ struct UnkStruct_0203A3E8_t {
 static void sub_0203A3E8(UnkStruct_0203A3E8 * param0, int param1);
 static void sub_0203A5B0(UnkStruct_0203A3E8 * param0);
 static void sub_0203A64C(UnkStruct_0203A3E8 * param0, int param1);
-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);
+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_0203A378 (UnkStruct_0203CDB0 * param0, int param1)
+void sub_0203A378 (FieldSystem * param0, int param1)
 {
     UnkStruct_0203A3E8 * v0;
 
@@ -48,13 +48,13 @@ void sub_0203A378 (UnkStruct_0203CDB0 * param0, int param1)
     param0->unk_14 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0203A3E8));
 }
 
-void sub_0203A398 (UnkStruct_0203CDB0 * param0)
+void sub_0203A398 (FieldSystem * param0)
 {
     GF_ASSERT(param0->unk_14 != NULL);
     Heap_FreeToHeap(param0->unk_14);
 }
 
-void sub_0203A3B0 (UnkStruct_0203CDB0 * param0, int param1)
+void sub_0203A3B0 (FieldSystem * param0, int param1)
 {
     GF_ASSERT(param0->unk_14 != NULL);
 
@@ -73,7 +73,7 @@ static void sub_0203A3E8 (UnkStruct_0203A3E8 * param0, int param1)
     NARC_ReadWholeMemberByIndexPair(param0->unk_20, 32, v0);
 }
 
-void sub_0203A418 (UnkStruct_0203CDB0 * param0)
+void sub_0203A418 (FieldSystem * param0)
 {
     int v0 = param0->unk_14->unk_04;
 
@@ -84,17 +84,17 @@ void sub_0203A418 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-const UnkStruct_0203A594 * sub_0203A440 (const UnkStruct_0203CDB0 * param0)
+const UnkStruct_0203A594 * sub_0203A440 (const FieldSystem * param0)
 {
     return param0->unk_14->unk_10;
 }
 
-int sub_0203A448 (const UnkStruct_0203CDB0 * param0)
+int sub_0203A448 (const FieldSystem * param0)
 {
     return param0->unk_14->unk_00;
 }
 
-const UnkStruct_0203A55C * sub_0203A450 (const UnkStruct_0203CDB0 * param0, int param1)
+const UnkStruct_0203A55C * sub_0203A450 (const FieldSystem * param0, int param1)
 {
     if (param1 >= param0->unk_14->unk_08) {
         return NULL;
@@ -103,7 +103,7 @@ const UnkStruct_0203A55C * sub_0203A450 (const UnkStruct_0203CDB0 * param0, int
     return &param0->unk_14->unk_18[param1];
 }
 
-int sub_0203A468 (const UnkStruct_0203CDB0 * param0, int param1, int param2)
+int sub_0203A468 (const FieldSystem * param0, int param1, int param2)
 {
     int v0;
 
@@ -116,27 +116,27 @@ int sub_0203A468 (const UnkStruct_0203CDB0 * param0, int param1, int param2)
     return -1;
 }
 
-int sub_0203A4A4 (const UnkStruct_0203CDB0 * param0)
+int sub_0203A4A4 (const FieldSystem * param0)
 {
     return param0->unk_14->unk_0C;
 }
 
-const UnkStruct_0203A4AC * sub_0203A4AC (const UnkStruct_0203CDB0 * param0)
+const UnkStruct_0203A4AC * sub_0203A4AC (const FieldSystem * param0)
 {
     return param0->unk_14->unk_1C;
 }
 
-u32 sub_0203A4B4 (const UnkStruct_0203CDB0 * param0)
+u32 sub_0203A4B4 (const FieldSystem * param0)
 {
     return param0->unk_14->unk_04;
 }
 
-const UnkStruct_020619DC * sub_0203A4BC (const UnkStruct_0203CDB0 * param0)
+const UnkStruct_020619DC * sub_0203A4BC (const FieldSystem * param0)
 {
     return param0->unk_14->unk_14;
 }
 
-BOOL sub_0203A4C4 (UnkStruct_0203CDB0 * param0, int param1, u16 param2, u16 param3)
+BOOL sub_0203A4C4 (FieldSystem * param0, int param1, u16 param2, u16 param3)
 {
     int v0;
     UnkStruct_020619DC * v1 = (UnkStruct_020619DC *)param0->unk_14->unk_14;
@@ -154,7 +154,7 @@ BOOL sub_0203A4C4 (UnkStruct_0203CDB0 * param0, int param1, u16 param2, u16 para
     return 0;
 }
 
-BOOL sub_0203A4FC (UnkStruct_0203CDB0 * param0, int param1, int param2)
+BOOL sub_0203A4FC (FieldSystem * param0, int param1, int param2)
 {
     int v0;
     UnkStruct_020619DC * v1 = (UnkStruct_020619DC *)param0->unk_14->unk_14;
@@ -171,7 +171,7 @@ BOOL sub_0203A4FC (UnkStruct_0203CDB0 * param0, int param1, int param2)
     return 0;
 }
 
-BOOL sub_0203A52C (UnkStruct_0203CDB0 * param0, int param1, int param2)
+BOOL sub_0203A52C (FieldSystem * param0, int param1, int param2)
 {
     int v0;
     UnkStruct_020619DC * v1 = (UnkStruct_020619DC *)param0->unk_14->unk_14;
@@ -188,7 +188,7 @@ BOOL sub_0203A52C (UnkStruct_0203CDB0 * param0, int param1, int param2)
     return 0;
 }
 
-BOOL sub_0203A55C (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2, u16 param3)
+BOOL sub_0203A55C (FieldSystem * param0, u16 param1, u16 param2, u16 param3)
 {
     UnkStruct_0203A55C * v0 = (UnkStruct_0203A55C *)param0->unk_14->unk_18;
 
@@ -198,7 +198,7 @@ BOOL sub_0203A55C (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2, u16 para
     return 1;
 }
 
-BOOL sub_0203A574 (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2)
+BOOL sub_0203A574 (FieldSystem * param0, u16 param1, u16 param2)
 {
     UnkStruct_0203A55C * v0 = (UnkStruct_0203A55C *)param0->unk_14->unk_18;
 
@@ -206,7 +206,7 @@ BOOL sub_0203A574 (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2)
     return 1;
 }
 
-BOOL sub_0203A584 (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2)
+BOOL sub_0203A584 (FieldSystem * param0, u16 param1, u16 param2)
 {
     UnkStruct_0203A55C * v0 = (UnkStruct_0203A55C *)param0->unk_14->unk_18;
 
@@ -214,7 +214,7 @@ BOOL sub_0203A584 (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2)
     return 1;
 }
 
-BOOL sub_0203A594 (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2, u16 param3)
+BOOL sub_0203A594 (FieldSystem * param0, u16 param1, u16 param2, u16 param3)
 {
     UnkStruct_0203A594 * v0 = (UnkStruct_0203A594 *)sub_0203A440(param0);
 
@@ -288,7 +288,7 @@ void sub_0203A614 (UnkStruct_ov6_02242634 * param0, int param1)
     }
 }
 
-const UnkStruct_ov6_02242634 * sub_0203A640 (const UnkStruct_0203CDB0 * param0)
+const UnkStruct_ov6_02242634 * sub_0203A640 (const FieldSystem * param0)
 {
     return &param0->unk_14->unk_920;
 }
@@ -305,13 +305,13 @@ static void sub_0203A64C (UnkStruct_0203A3E8 * param0, int param1)
     NARC_ReadWholeMemberByIndexPair(param0->unk_820, NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ, v0);
 }
 
-void * sub_0203A68C (const UnkStruct_0203CDB0 * param0)
+void * sub_0203A68C (const FieldSystem * param0)
 {
     GF_ASSERT(param0->unk_14 != NULL);
     return &param0->unk_14->unk_820;
 }
 
-BOOL sub_0203A6A4 (const UnkStruct_0203CDB0 * param0, u16 param1, u16 param2)
+BOOL sub_0203A6A4 (const FieldSystem * param0, u16 param1, u16 param2)
 {
     const UnkStruct_0203A3E8 * v0 = param0->unk_14;
     u32 v1;
diff --git a/src/unk_0203A6DC.c b/src/unk_0203A6DC.c
index ad367f6588..33aa957c9b 100644
--- a/src/unk_0203A6DC.c
+++ b/src/unk_0203A6DC.c
@@ -171,7 +171,7 @@ UnkStruct_0203A79C * sub_0203A79C (SaveData * param0)
     return v0;
 }
 
-void sub_0203A7A8 (UnkStruct_0203CDB0 * param0)
+void sub_0203A7A8 (FieldSystem * param0)
 {
     UnkStruct_02061D3C * v0;
 
@@ -179,7 +179,7 @@ void sub_0203A7A8 (UnkStruct_0203CDB0 * param0)
     sub_02061CA8(param0, param0->unk_38, v0, 64);
 }
 
-void sub_0203A7C0 (UnkStruct_0203CDB0 * param0)
+void sub_0203A7C0 (FieldSystem * param0)
 {
     UnkStruct_02061D3C * v0;
 
diff --git a/src/unk_0203A7D8.c b/src/unk_0203A7D8.c
index 938e03d9b8..9f23afd6bd 100644
--- a/src/unk_0203A7D8.c
+++ b/src/unk_0203A7D8.c
@@ -128,7 +128,7 @@ int sub_0203A8A0 (int param0, int param1, int param2)
     return v3;
 }
 
-void sub_0203A8E8 (UnkStruct_0203CDB0 * param0, int param1)
+void sub_0203A8E8 (FieldSystem * param0, int param1)
 {
     int v0;
 
@@ -140,7 +140,7 @@ void sub_0203A8E8 (UnkStruct_0203CDB0 * param0, int param1)
     }
 }
 
-BOOL sub_0203A920 (UnkStruct_0203CDB0 * param0, int param1)
+BOOL sub_0203A920 (FieldSystem * param0, int param1)
 {
     int v0 = sub_0203A7D8(param1);
     return inline_0208BE68(SaveData_Events(param0->unk_0C), Unk_020E97B4[v0].unk_0E);
diff --git a/src/unk_0203A944.c b/src/unk_0203A944.c
index 6b339dc7df..a653254f9c 100644
--- a/src/unk_0203A944.c
+++ b/src/unk_0203A944.c
@@ -1846,7 +1846,7 @@ static const u8 Unk_020E98F4[] = {
 };
 
 
-int sub_0203A944 (UnkStruct_0203CDB0 * param0, int param1)
+int sub_0203A944 (FieldSystem * param0, int param1)
 {
     int v0;
 
diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c
index 6ef660545d..9dc88e06f1 100644
--- a/src/unk_0203A9C8.c
+++ b/src/unk_0203A9C8.c
@@ -131,12 +131,12 @@ typedef struct {
 } UnkStruct_0203BF6C;
 
 static UnkStruct_020708E0 * sub_0203ABB4(void);
-static u32 sub_0203ABD0(UnkStruct_0203CDB0 * param0);
-static u32 sub_0203AC24(UnkStruct_0203CDB0 * param0);
-static u32 sub_0203AC28(UnkStruct_0203CDB0 * param0);
-static u32 sub_0203AC2C(UnkStruct_0203CDB0 * param0);
-static u32 sub_0203AC34(UnkStruct_0203CDB0 * param0);
-static u32 sub_0203AC3C(UnkStruct_0203CDB0 * param0);
+static u32 sub_0203ABD0(FieldSystem * param0);
+static u32 sub_0203AC24(FieldSystem * param0);
+static u32 sub_0203AC28(FieldSystem * param0);
+static u32 sub_0203AC2C(FieldSystem * param0);
+static u32 sub_0203AC34(FieldSystem * param0);
+static u32 sub_0203AC3C(FieldSystem * param0);
 static void sub_0203B318(UnkStruct_020708E0 * param0, u8 * param1, u32 param2, u8 param3);
 static void sub_0203B4E8(UnkStruct_020708E0 * param0);
 static void sub_0203B520(UnkStruct_020708E0 * param0);
@@ -149,7 +149,7 @@ static void sub_0203ADFC(UnkStruct_020508D4 * param0);
 static BOOL sub_0203B244(UnkStruct_020508D4 * param0);
 static u32 sub_0203AFCC(UnkStruct_020708E0 * param0, u8 * param1);
 static void sub_0203B078(UnkStruct_020708E0 * param0);
-static void sub_0203B2EC(UnkStruct_020708E0 * param0, UnkStruct_0203CDB0 * param1);
+static void sub_0203B2EC(UnkStruct_020708E0 * param0, FieldSystem * param1);
 static void sub_0203B094(UnkStruct_020508D4 * param0);
 static void sub_0203B200(UnkStruct_020508D4 * param0);
 static void sub_0203B610(UnkStruct_020508D4 * param0);
@@ -251,7 +251,7 @@ static const u8 Unk_020EA01C[] = {
     0x8
 };
 
-BOOL sub_0203A9C8 (UnkStruct_0203CDB0 * param0)
+BOOL sub_0203A9C8 (FieldSystem * param0)
 {
     if (MapHeader_GetMapLabelTextID(param0->unk_1C->unk_00) == 0) {
         return 0;
@@ -260,7 +260,7 @@ BOOL sub_0203A9C8 (UnkStruct_0203CDB0 * param0)
     return 1;
 }
 
-void sub_0203A9E0 (UnkStruct_0203CDB0 * param0)
+void sub_0203A9E0 (FieldSystem * param0)
 {
     UnkStruct_020708E0 * v0 = sub_0203ABB4();
 
@@ -283,7 +283,7 @@ void sub_0203A9E0 (UnkStruct_0203CDB0 * param0)
     sub_02050904(param0, sub_0203AC44, v0);
 }
 
-void sub_0203AA78 (UnkStruct_0203CDB0 * param0)
+void sub_0203AA78 (FieldSystem * param0)
 {
     UnkStruct_020708E0 * v0 = sub_0203ABB4();
 
@@ -297,7 +297,7 @@ void sub_0203AA78 (UnkStruct_0203CDB0 * param0)
     sub_02050904(param0, sub_0203AC44, v0);
 }
 
-void sub_0203AABC (UnkStruct_0203CDB0 * param0)
+void sub_0203AABC (FieldSystem * param0)
 {
     UnkStruct_020708E0 * v0 = sub_0203ABB4();
 
@@ -311,7 +311,7 @@ void sub_0203AABC (UnkStruct_0203CDB0 * param0)
     sub_02050904(param0, sub_0203AC44, v0);
 }
 
-void sub_0203AB00 (UnkStruct_0203CDB0 * param0)
+void sub_0203AB00 (FieldSystem * param0)
 {
     UnkStruct_020708E0 * v0;
 
@@ -351,7 +351,7 @@ static UnkStruct_020708E0 * sub_0203ABB4 (void)
     return v0;
 }
 
-static u32 sub_0203ABD0 (UnkStruct_0203CDB0 * param0)
+static u32 sub_0203ABD0 (FieldSystem * param0)
 {
     u32 v0 = 0;
 
@@ -378,34 +378,34 @@ static u32 sub_0203ABD0 (UnkStruct_0203CDB0 * param0)
     return v0;
 }
 
-static u32 sub_0203AC24 (UnkStruct_0203CDB0 * param0)
+static u32 sub_0203AC24 (FieldSystem * param0)
 {
     return 0x10 | 0x80;
 }
 
-static u32 sub_0203AC28 (UnkStruct_0203CDB0 * param0)
+static u32 sub_0203AC28 (FieldSystem * param0)
 {
     return 0x10 | 0x80 | 0x4;
 }
 
-static u32 sub_0203AC2C (UnkStruct_0203CDB0 * param0)
+static u32 sub_0203AC2C (FieldSystem * param0)
 {
     return 0x1 | 0x4 | 0x10 | 0x80 | 0x100;
 }
 
-static u32 sub_0203AC34 (UnkStruct_0203CDB0 * param0)
+static u32 sub_0203AC34 (FieldSystem * param0)
 {
     return 0x10 | 0x100;
 }
 
-static u32 sub_0203AC3C (UnkStruct_0203CDB0 * param0)
+static u32 sub_0203AC3C (FieldSystem * param0)
 {
     return 0x10 | 0x1 | 0x80 | 0x100;
 }
 
 static BOOL sub_0203AC44 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -510,7 +510,7 @@ static BOOL sub_0203AC44 (UnkStruct_020508D4 * param0)
 
 static void sub_0203ADFC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     MessageLoader * v2;
     UnkStruct_02081CF4 v3;
@@ -641,7 +641,7 @@ static void sub_0203B078 (UnkStruct_020708E0 * param0)
 
 static void sub_0203B094 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     MessageLoader * v2;
     StringFormatter * v3;
@@ -701,7 +701,7 @@ static void sub_0203B094 (UnkStruct_020508D4 * param0)
 
 static void sub_0203B200 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -717,7 +717,7 @@ static void sub_0203B200 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203B244 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     u16 v2;
 
@@ -755,7 +755,7 @@ static BOOL sub_0203B244 (UnkStruct_020508D4 * param0)
     return 1;
 }
 
-static void sub_0203B2EC (UnkStruct_020708E0 * param0, UnkStruct_0203CDB0 * param1)
+static void sub_0203B2EC (UnkStruct_020708E0 * param0, FieldSystem * param1)
 {
     if (sub_02033E1C()) {
         if (param0->unk_228) {
@@ -877,7 +877,7 @@ static void sub_0203B5E8 (GraphicElementData * param0)
 
 static void sub_0203B610 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     if (ScreenWipe_Done() == 0) {
@@ -897,7 +897,7 @@ static void sub_0203B610 (UnkStruct_020508D4 * param0)
 
 static void sub_0203B64C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -932,7 +932,7 @@ static BOOL sub_0203B680 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203B6A4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_ov21_021D0D80 * v2;
     PokedexData * v3;
@@ -965,7 +965,7 @@ static BOOL sub_0203B6A4 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203B738 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -998,7 +998,7 @@ static BOOL sub_0203B768 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203B78C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1012,7 +1012,7 @@ static BOOL sub_0203B78C (UnkStruct_020508D4 * param0)
 
 BOOL sub_0203B7C0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     PartyManagementData * v2;
 
@@ -1259,7 +1259,7 @@ static BOOL sub_0203BBF4 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203BC18 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1276,7 +1276,7 @@ static BOOL sub_0203BC18 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203BC5C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_0207CB08 * v2;
 
@@ -1404,7 +1404,7 @@ static BOOL sub_0203BE8C (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203BEB0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1421,7 +1421,7 @@ static BOOL sub_0203BEB0 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203BF00 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1454,7 +1454,7 @@ static BOOL sub_0203BF38 (UnkStruct_020508D4 * param0)
 static void sub_0203BF6C (UnkStruct_020508D4 * param0)
 {
     UnkStruct_020708E0 * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_0203BF6C * v2;
 
     if (SaveData_OverwriteCheck(v1->unk_0C)) {
@@ -1472,7 +1472,7 @@ static void sub_0203BF6C (UnkStruct_020508D4 * param0)
 
 static void sub_0203BFC0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020708E0 * v1 = sub_02050A64(param0);
     UnkStruct_0203BF6C * v2 = v1->unk_25C;
 
@@ -1505,7 +1505,7 @@ static BOOL sub_0203C000 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203C024 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1519,7 +1519,7 @@ static BOOL sub_0203C024 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203C050 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1549,7 +1549,7 @@ static BOOL sub_0203C07C (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203C0A0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     Sentence v2;
 
@@ -1570,7 +1570,7 @@ static BOOL sub_0203C0A0 (UnkStruct_020508D4 * param0)
 static BOOL sub_0203C0F8 (UnkStruct_020508D4 * param0)
 {
     Sentence v0;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
     UnkStruct_020708E0 * v2;
 
     v1 = sub_02050A60(param0);
@@ -1598,7 +1598,7 @@ static BOOL sub_0203C0F8 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203C164 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1622,7 +1622,7 @@ static BOOL sub_0203C164 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0203C1C8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     PokemonSummary * v2;
 
@@ -1683,7 +1683,7 @@ static BOOL sub_0203C1C8 (UnkStruct_020508D4 * param0)
 
 static void sub_0203C2D8 (UnkStruct_020508D4 * param0, u16 param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_0207D3C0 * v2;
     u8 v3;
@@ -1715,7 +1715,7 @@ static void sub_0203C2D8 (UnkStruct_020508D4 * param0, u16 param1)
 
 static BOOL sub_0203C390 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     u8 v2, v3;
 
@@ -1734,7 +1734,7 @@ static BOOL sub_0203C390 (UnkStruct_020508D4 * param0)
 
 BOOL sub_0203C3F4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1749,7 +1749,7 @@ BOOL sub_0203C3F4 (UnkStruct_020508D4 * param0)
 
 BOOL sub_0203C434 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_0203D8AC * v2;
     u32 v3;
@@ -1789,7 +1789,7 @@ BOOL sub_0203C434 (UnkStruct_020508D4 * param0)
 
 BOOL sub_0203C50C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1801,7 +1801,7 @@ BOOL sub_0203C50C (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static void sub_0203C668(UnkStruct_0203CDB0 * param0, UnkStruct_020708E0 * param1, u8 param2);
+static void sub_0203C668(FieldSystem * param0, UnkStruct_020708E0 * param1, u8 param2);
 
 void * sub_0203C540 (u16 param0, u8 param1, u8 param2)
 {
@@ -1816,7 +1816,7 @@ void * sub_0203C540 (u16 param0, u8 param1, u8 param2)
 
 BOOL sub_0203C558 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_0203C540 * v2;
 
@@ -1859,7 +1859,7 @@ BOOL sub_0203C558 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static void sub_0203C668 (UnkStruct_0203CDB0 * param0, UnkStruct_020708E0 * param1, u8 param2)
+static void sub_0203C668 (FieldSystem * param0, UnkStruct_020708E0 * param1, u8 param2)
 {
     UnkStruct_0203C540 * v0;
     PartyManagementData * v1;
@@ -1889,7 +1889,7 @@ static void sub_0203C668 (UnkStruct_0203CDB0 * param0, UnkStruct_020708E0 * para
 
 BOOL sub_0203C710 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1905,7 +1905,7 @@ BOOL sub_0203C710 (UnkStruct_020508D4 * param0)
 
 BOOL sub_0203C750 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1919,7 +1919,7 @@ BOOL sub_0203C750 (UnkStruct_020508D4 * param0)
 
 BOOL sub_0203C784 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
@@ -1933,7 +1933,7 @@ BOOL sub_0203C784 (UnkStruct_020508D4 * param0)
 
 static void sub_0203C7B8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_0203C7B8 * v2;
     Party * v3;
@@ -1971,7 +1971,7 @@ static void sub_0203C7B8 (UnkStruct_020508D4 * param0)
 
 static void sub_0203C8CC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0);
diff --git a/src/unk_0203C954.c b/src/unk_0203C954.c
index ff138aa2c9..a74c4c7804 100644
--- a/src/unk_0203C954.c
+++ b/src/unk_0203C954.c
@@ -15,10 +15,10 @@
 #include "unk_0205E7D0.h"
 #include "unk_02061804.h"
 
-static u8 sub_0203CB18(UnkStruct_0203CDB0 * param0, const UnkStruct_0203A594 * param1);
-static u8 sub_0203CAEC(UnkStruct_0203CDB0 * param0, const UnkStruct_0203A594 * param1);
+static u8 sub_0203CB18(FieldSystem * param0, const UnkStruct_0203A594 * param1);
+static u8 sub_0203CAEC(FieldSystem * param0, const UnkStruct_0203A594 * param1);
 
-static int sub_0203C954 (UnkStruct_0203CDB0 * param0, int * param1, int * param2)
+static int sub_0203C954 (FieldSystem * param0, int * param1, int * param2)
 {
     int v0 = sub_0205EA78(param0->unk_3C);
 
@@ -54,7 +54,7 @@ static u8 sub_0203C9B0 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1
     return 0;
 }
 
-void sub_0203C9D4 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1)
+void sub_0203C9D4 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
 {
     int v0, v1;
     int v2;
@@ -83,7 +83,7 @@ void sub_0203C9D4 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1)
     *param1 = sub_0206326C(param0->unk_38, v0, v1, 0);
 }
 
-u8 sub_0203CA40 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1)
+u8 sub_0203CA40 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
 {
     sub_0203C9D4(param0, param1);
 
@@ -96,7 +96,7 @@ u8 sub_0203CA40 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1)
     return 0;
 }
 
-u16 sub_0203CA6C (UnkStruct_0203CDB0 * param0, void * param1, int param2)
+u16 sub_0203CA6C (FieldSystem * param0, void * param1, int param2)
 {
     const UnkStruct_0203A594 * v0;
     int v1, v2;
@@ -123,7 +123,7 @@ u16 sub_0203CA6C (UnkStruct_0203CDB0 * param0, void * param1, int param2)
     return 0xffff;
 }
 
-static u8 sub_0203CAEC (UnkStruct_0203CDB0 * param0, const UnkStruct_0203A594 * param1)
+static u8 sub_0203CAEC (FieldSystem * param0, const UnkStruct_0203A594 * param1)
 {
     if (param1->unk_02 != 2) {
         return 0;
@@ -136,7 +136,7 @@ static u8 sub_0203CAEC (UnkStruct_0203CDB0 * param0, const UnkStruct_0203A594 *
     return 1;
 }
 
-static u8 sub_0203CB18 (UnkStruct_0203CDB0 * param0, const UnkStruct_0203A594 * param1)
+static u8 sub_0203CB18 (FieldSystem * param0, const UnkStruct_0203A594 * param1)
 {
     if (param1->unk_10 == 4) {
         return 1;
@@ -168,7 +168,7 @@ static u8 sub_0203CB18 (UnkStruct_0203CDB0 * param0, const UnkStruct_0203A594 *
     return 0;
 }
 
-u16 sub_0203CB80 (UnkStruct_0203CDB0 * param0, void * param1, int param2)
+u16 sub_0203CB80 (FieldSystem * param0, void * param1, int param2)
 {
     const UnkStruct_0203A594 * v0;
     int v1, v2;
@@ -190,7 +190,7 @@ u16 sub_0203CB80 (UnkStruct_0203CDB0 * param0, void * param1, int param2)
     return 0xffff;
 }
 
-u8 sub_0203CBE0 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1)
+u8 sub_0203CBE0 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
 {
     if (sub_0205EA78(param0->unk_3C) != 0) {
         return 0;
@@ -207,7 +207,7 @@ u8 sub_0203CBE0 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 ** param1)
     return 0;
 }
 
-u16 sub_0203CC14 (UnkStruct_0203CDB0 * param0, void * param1, int param2)
+u16 sub_0203CC14 (FieldSystem * param0, void * param1, int param2)
 {
     const UnkStruct_0203A4AC * v0;
     int v1, v2;
diff --git a/src/unk_0203CC84.c b/src/unk_0203CC84.c
index f09f2b012d..bbc139ff77 100644
--- a/src/unk_0203CC84.c
+++ b/src/unk_0203CC84.c
@@ -52,12 +52,12 @@ typedef struct UnkStruct_0203CDB0_sub1_t {
     BOOL unk_0C;
 };
 
-static UnkStruct_0203CDB0 * sub_0203CDB0(UnkStruct_020067E8 * param0);
-static BOOL sub_0203CEEC(UnkStruct_0203CDB0 * param0);
+static FieldSystem * sub_0203CDB0(UnkStruct_020067E8 * param0);
+static BOOL sub_0203CEEC(FieldSystem * param0);
 static void sub_0203CE6C(UnkStruct_020067E8 * param0);
-static void sub_0203CF5C(UnkStruct_0203CDB0 * param0);
+static void sub_0203CF5C(FieldSystem * param0);
 
-static UnkStruct_0203CDB0 * Unk_021C07DC;
+static FieldSystem * Unk_021C07DC;
 
 static int sub_0203CC84 (UnkStruct_020067E8 * param0, int * param1)
 {
@@ -84,7 +84,7 @@ static int sub_0203CCB4 (UnkStruct_020067E8 * param0, int * param1)
 
 static int sub_0203CCCC (UnkStruct_020067E8 * param0, int * param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_0200682C(param0);
+    FieldSystem * v0 = sub_0200682C(param0);
 
     if (sub_0203CEEC(v0)) {
         return 1;
@@ -114,7 +114,7 @@ const UnkStruct_0208BE5C Unk_020EA11C = {
     0xffffffff
 };
 
-void sub_0203CD00 (UnkStruct_0203CDB0 * param0)
+void sub_0203CD00 (FieldSystem * param0)
 {
     GF_ASSERT(param0->unk_00->unk_04 == NULL);
     GF_ASSERT(param0->unk_00->unk_00 == NULL);
@@ -125,17 +125,17 @@ void sub_0203CD00 (UnkStruct_0203CDB0 * param0)
     param0->unk_00->unk_00 = sub_020067E8(&Unk_ov5_021F89B0, param0, 11);
 }
 
-void sub_0203CD44 (UnkStruct_0203CDB0 * param0)
+void sub_0203CD44 (FieldSystem * param0)
 {
     param0->unk_68 = 0;
 }
 
-BOOL sub_0203CD4C (UnkStruct_0203CDB0 * param0)
+BOOL sub_0203CD4C (FieldSystem * param0)
 {
     return param0->unk_00->unk_00 != NULL;
 }
 
-BOOL sub_0203CD5C (UnkStruct_0203CDB0 * param0)
+BOOL sub_0203CD5C (FieldSystem * param0)
 {
     if ((param0->unk_00->unk_00 != NULL) && param0->unk_68) {
         return 1;
@@ -144,29 +144,29 @@ BOOL sub_0203CD5C (UnkStruct_0203CDB0 * param0)
     }
 }
 
-BOOL sub_0203CD74 (UnkStruct_0203CDB0 * param0)
+BOOL sub_0203CD74 (FieldSystem * param0)
 {
     return param0->unk_00->unk_04 != NULL;
 }
 
-void sub_0203CD84 (UnkStruct_0203CDB0 * param0, const UnkStruct_0208BE5C * param1, void * param2)
+void sub_0203CD84 (FieldSystem * param0, const UnkStruct_0208BE5C * param1, void * param2)
 {
     GF_ASSERT(param0->unk_00->unk_04 == NULL);
     sub_0203CD44(param0);
     param0->unk_00->unk_04 = sub_020067E8(param1, param2, 11);
 }
 
-static UnkStruct_0203CDB0 * sub_0203CDB0 (UnkStruct_020067E8 * param0)
+static FieldSystem * sub_0203CDB0 (UnkStruct_020067E8 * param0)
 {
     UnkStruct_0203CC84 * v0;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
 
     Heap_Create(3, 11, 0x1c000);
     Heap_Create(3, 32, 0x4000);
     Heap_Create(0, 91, 0x300);
 
-    v1 = sub_0200681C(param0, sizeof(UnkStruct_0203CDB0), 11);
-    MI_CpuClear8(v1, sizeof(UnkStruct_0203CDB0));
+    v1 = sub_0200681C(param0, sizeof(FieldSystem), 11);
+    MI_CpuClear8(v1, sizeof(FieldSystem));
 
     v1->unk_00 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203CDB0_sub1));
     v1->unk_00->unk_00 = NULL;
@@ -196,7 +196,7 @@ static UnkStruct_0203CDB0 * sub_0203CDB0 (UnkStruct_020067E8 * param0)
 
 static void sub_0203CE6C (UnkStruct_020067E8 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_0200682C(param0);
+    FieldSystem * v0 = sub_0200682C(param0);
 
     sub_02039DE4(v0->unk_2C);
     sub_0203A398(v0);
@@ -222,7 +222,7 @@ static void sub_0203CECC (UnkStruct_020067E8 ** param0)
     }
 }
 
-BOOL sub_0203CEEC (UnkStruct_0203CDB0 * param0)
+BOOL sub_0203CEEC (FieldSystem * param0)
 {
     BOOL v0;
 
@@ -250,7 +250,7 @@ BOOL sub_0203CEEC (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-void sub_0203CF5C (UnkStruct_0203CDB0 * param0)
+void sub_0203CF5C (FieldSystem * param0)
 {
     int v0;
     UnkStruct_ov5_021D1CAC v1;
@@ -382,11 +382,11 @@ struct UnkStruct_ov25_02253CE0_t * sub_0203D158 (void)
 
 BGL * sub_0203D170 (void * param0)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param0;
+    FieldSystem * v0 = (FieldSystem *)param0;
     return v0->unk_08;
 }
 
 SaveData * sub_0203D174 (void * param0)
 {
-    return ((UnkStruct_0203CDB0 *)param0)->unk_0C;
+    return ((FieldSystem *)param0)->unk_0C;
 }
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index 4fd2305ee4..f0e60ea093 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -267,7 +267,7 @@ const UnkStruct_0208BE5C Unk_020EA358 = {
     FS_OVERLAY_ID(overlay16)
 };
 
-void sub_0203D1D4 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
+void sub_0203D1D4 (FieldSystem * param0, BattleParams * param1)
 {
     sub_0203CD84(param0, &Unk_020EA358, param1);
 }
@@ -284,7 +284,7 @@ static const u8 Unk_020EA164[] = {
     0xff
 };
 
-void sub_0203D1E4 (UnkStruct_0203CDB0 * param0, void * param1)
+void sub_0203D1E4 (FieldSystem * param0, void * param1)
 {
     FS_EXTERN_OVERLAY(overlay84);
 
@@ -298,7 +298,7 @@ void sub_0203D1E4 (UnkStruct_0203CDB0 * param0, void * param1)
     sub_0203CD84(param0, &Unk_ov84_02241130, param1);
 }
 
-void * sub_0203D20C (UnkStruct_0203CDB0 * param0, UnkStruct_020684D0 * param1)
+void * sub_0203D20C (FieldSystem * param0, UnkStruct_020684D0 * param1)
 {
     UnkStruct_0207D3C0 * v0;
     void * v1;
@@ -319,7 +319,7 @@ void * sub_0203D20C (UnkStruct_0203CDB0 * param0, UnkStruct_020684D0 * param1)
     return v1;
 }
 
-void * sub_0203D264 (UnkStruct_0203CDB0 * param0, int param1)
+void * sub_0203D264 (FieldSystem * param0, int param1)
 {
     void * v0;
     static const u8 * v1;
@@ -359,7 +359,7 @@ u16 sub_0203D2C4 (void * param0)
     return v0;
 }
 
-void sub_0203D2E4 (UnkStruct_0203CDB0 * param0, void * param1)
+void sub_0203D2E4 (FieldSystem * param0, void * param1)
 {
     FS_EXTERN_OVERLAY(overlay85);
 
@@ -373,7 +373,7 @@ void sub_0203D2E4 (UnkStruct_0203CDB0 * param0, void * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-void sub_0203D30C (UnkStruct_0203CDB0 * param0, void * param1)
+void sub_0203D30C (FieldSystem * param0, void * param1)
 {
     FS_EXTERN_OVERLAY(overlay81);
 
@@ -387,12 +387,12 @@ void sub_0203D30C (UnkStruct_0203CDB0 * param0, void * param1)
     sub_0203CD84(param0, &v0, param0->unk_0C);
 }
 
-void sub_0203D334 (UnkStruct_0203CDB0 * param0, void * param1)
+void sub_0203D334 (FieldSystem * param0, void * param1)
 {
     sub_0203CD84(param0, &Unk_020F410C, param1);
 }
 
-static PartyManagementData * sub_0203D344 (int param0, UnkStruct_0203CDB0 * param1, int param2, int param3)
+static PartyManagementData * sub_0203D344 (int param0, FieldSystem * param1, int param2, int param3)
 {
     PartyManagementData * v0 = Heap_AllocFromHeap(param0, sizeof(PartyManagementData));
 
@@ -409,7 +409,7 @@ static PartyManagementData * sub_0203D344 (int param0, UnkStruct_0203CDB0 * para
     return v0;
 }
 
-void * sub_0203D390 (UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1, u8 param2)
+void * sub_0203D390 (FieldSystem * param0, UnkStruct_02070950 * param1, u8 param2)
 {
     PartyManagementData * v0 = sub_0203D344(11, param0, 0, 0);
 
@@ -421,7 +421,7 @@ void * sub_0203D390 (UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1, u
     return v0;
 }
 
-void * sub_0203D3C0 (int param0, UnkStruct_0203CDB0 * param1)
+void * sub_0203D3C0 (int param0, FieldSystem * param1)
 {
     PartyManagementData * v0 = sub_0203D344(11, param1, 0, 3);
 
@@ -429,7 +429,7 @@ void * sub_0203D3C0 (int param0, UnkStruct_0203CDB0 * param1)
     return v0;
 }
 
-void * sub_0203D3E4 (int param0, UnkStruct_0203CDB0 * param1)
+void * sub_0203D3E4 (int param0, FieldSystem * param1)
 {
     PartyManagementData * v0 = sub_0203D344(11, param1, 0, 19);
 
@@ -443,7 +443,7 @@ int sub_0203D408 (void * param0)
     return v0->unk_22;
 }
 
-void * sub_0203D410 (int param0, UnkStruct_0203CDB0 * param1, int param2)
+void * sub_0203D410 (int param0, FieldSystem * param1, int param2)
 {
     PartyManagementData * v0 = sub_0203D344(11, param1, 0, 18);
 
@@ -467,7 +467,7 @@ int sub_0203D440 (void * param0)
 
 static BOOL sub_0203D444 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_0203D444 * v1;
     int * v2;
 
@@ -520,7 +520,7 @@ void * sub_0203D50C (UnkStruct_020508D4 * param0, int param1)
 {
     UnkStruct_0203D444 * v0;
     PartyManagementData * v1;
-    UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
+    FieldSystem * v2 = sub_02050A60(param0);
 
     v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0203D444));
     v0->unk_00 = param1;
@@ -536,7 +536,7 @@ void * sub_0203D50C (UnkStruct_020508D4 * param0, int param1)
     return v1;
 }
 
-void * sub_0203D578 (int param0, UnkStruct_0203CDB0 * param1, int param2, int param3, int param4, int param5)
+void * sub_0203D578 (int param0, FieldSystem * param1, int param2, int param3, int param4, int param5)
 {
     PartyManagementData * v0 = sub_0203D344(11, param1, 0, 13);
 
@@ -555,7 +555,7 @@ void * sub_0203D578 (int param0, UnkStruct_0203CDB0 * param1, int param2, int pa
     return v0;
 }
 
-void * sub_0203D5C8 (int param0, UnkStruct_0203CDB0 * param1, int param2)
+void * sub_0203D5C8 (int param0, FieldSystem * param1, int param2)
 {
     PokemonSummary * v0 = Heap_AllocFromHeap(11, sizeof(PokemonSummary));
 
@@ -578,7 +578,7 @@ void * sub_0203D5C8 (int param0, UnkStruct_0203CDB0 * param1, int param2)
     return v0;
 }
 
-void * sub_0203D644 (UnkStruct_0203CDB0 * param0, int param1)
+void * sub_0203D644 (FieldSystem * param0, int param1)
 {
     PartyManagementData * v0 = sub_0203D344(11, param0, 0, 21);
 
@@ -588,7 +588,7 @@ void * sub_0203D644 (UnkStruct_0203CDB0 * param0, int param1)
     return v0;
 }
 
-PokemonSummary * sub_0203D670 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+PokemonSummary * sub_0203D670 (FieldSystem * param0, int param1, int param2)
 {
     PokemonSummary * v0;
     SaveData * v1;
@@ -624,7 +624,7 @@ static const u8 Unk_020EA160[] = {
     0x8
 };
 
-void * sub_0203D6E4 (int param0, UnkStruct_0203CDB0 * param1, u8 param2)
+void * sub_0203D6E4 (int param0, FieldSystem * param1, u8 param2)
 {
     PokemonSummary * v0 = Heap_AllocFromHeap(param0, sizeof(PokemonSummary));
 
@@ -653,7 +653,7 @@ int sub_0203D750 (void * param0)
     return v0->selectedSlot;
 }
 
-void sub_0203D754 (UnkStruct_0203CDB0 * param0, UnkStruct_02042434 * param1)
+void sub_0203D754 (FieldSystem * param0, UnkStruct_02042434 * param1)
 {
     FS_EXTERN_OVERLAY(overlay19);
 
@@ -671,7 +671,7 @@ static BOOL sub_0203D764 (UnkStruct_020508D4 * param0)
 {
     int * v0 = sub_02050A68(param0);
     UnkStruct_0203D764 * v1 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
+    FieldSystem * v2 = sub_02050A60(param0);
 
     switch (*v0) {
     case 0:
@@ -712,7 +712,7 @@ static BOOL sub_0203D764 (UnkStruct_020508D4 * param0)
 void sub_0203D80C (UnkStruct_020508D4 * param0, u16 * param1, u16 * param2, u16 * param3)
 {
     UnkStruct_0203D764 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203D764));
     v0->unk_00 = param1;
@@ -730,7 +730,7 @@ void sub_0203D80C (UnkStruct_020508D4 * param0, u16 * param1, u16 * param2, u16
     sub_02050944(param0, sub_0203D764, v0);
 }
 
-void sub_0203D874 (UnkStruct_0203CDB0 * param0, UnkStruct_0209747C * param1)
+void sub_0203D874 (FieldSystem * param0, UnkStruct_0209747C * param1)
 {
     FS_EXTERN_OVERLAY(overlay20);
 
@@ -744,7 +744,7 @@ void sub_0203D874 (UnkStruct_0203CDB0 * param0, UnkStruct_0209747C * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-void sub_0203D884 (UnkStruct_0203CDB0 * param0, UnkStruct_0203D8AC * param1)
+void sub_0203D884 (FieldSystem * param0, UnkStruct_0203D8AC * param1)
 {
     FS_EXTERN_OVERLAY(overlay80);
 
@@ -758,7 +758,7 @@ void sub_0203D884 (UnkStruct_0203CDB0 * param0, UnkStruct_0203D8AC * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-void * sub_0203D8AC (UnkStruct_0203CDB0 * param0)
+void * sub_0203D8AC (FieldSystem * param0)
 {
     UnkStruct_0203D8AC * v0;
     TrainerInfo * v1;
@@ -773,7 +773,7 @@ void * sub_0203D8AC (UnkStruct_0203CDB0 * param0)
     return v0;
 }
 
-static void sub_0203D8DC (UnkStruct_0203CDB0 * param0, Options * param1)
+static void sub_0203D8DC (FieldSystem * param0, Options * param1)
 {
     FS_EXTERN_OVERLAY(overlay74);
 
@@ -787,7 +787,7 @@ static void sub_0203D8DC (UnkStruct_0203CDB0 * param0, Options * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-void * sub_0203D8EC (UnkStruct_0203CDB0 * param0)
+void * sub_0203D8EC (FieldSystem * param0)
 {
     UnkStruct_0203D8EC * v0;
     Options * v1;
@@ -802,12 +802,12 @@ void * sub_0203D8EC (UnkStruct_0203CDB0 * param0)
 
 extern const UnkStruct_0208BE5C Unk_020F64B0;
 
-static void sub_0203D910 (UnkStruct_0203CDB0 * param0, UnkStruct_02097728 * param1)
+static void sub_0203D910 (FieldSystem * param0, UnkStruct_02097728 * param1)
 {
     sub_0203CD84(param0, &Unk_020F64B0, param1);
 }
 
-UnkStruct_02097728 * sub_0203D920 (UnkStruct_0203CDB0 * param0, int param1, u8 param2, u8 param3, int param4)
+UnkStruct_02097728 * sub_0203D920 (FieldSystem * param0, int param1, u8 param2, u8 param3, int param4)
 {
     UnkStruct_02097728 * v0;
 
@@ -817,7 +817,7 @@ UnkStruct_02097728 * sub_0203D920 (UnkStruct_0203CDB0 * param0, int param1, u8 p
     return v0;
 }
 
-UnkStruct_02097728 * sub_0203D94C (UnkStruct_0203CDB0 * param0, int param1, u8 param2, int param3)
+UnkStruct_02097728 * sub_0203D94C (FieldSystem * param0, int param1, u8 param2, int param3)
 {
     UnkStruct_02097728 * v0;
 
@@ -832,7 +832,7 @@ UnkStruct_02097728 * sub_0203D94C (UnkStruct_0203CDB0 * param0, int param1, u8 p
     return v0;
 }
 
-UnkStruct_02097728 * sub_0203D984 (UnkStruct_0203CDB0 * param0, Pokemon * param1, int param2)
+UnkStruct_02097728 * sub_0203D984 (FieldSystem * param0, Pokemon * param1, int param2)
 {
     UnkStruct_02097728 * v0;
 
@@ -842,12 +842,12 @@ UnkStruct_02097728 * sub_0203D984 (UnkStruct_0203CDB0 * param0, Pokemon * param1
     return v0;
 }
 
-static void sub_0203D9A8 (UnkStruct_0203CDB0 * param0, UnkStruct_0203D9B8 * param1)
+static void sub_0203D9A8 (FieldSystem * param0, UnkStruct_0203D9B8 * param1)
 {
     sub_0203CD84(param0, &Unk_020F6890, param1);
 }
 
-UnkStruct_0203D9B8 * sub_0203D9B8 (UnkStruct_0203CDB0 * param0, int param1)
+UnkStruct_0203D9B8 * sub_0203D9B8 (FieldSystem * param0, int param1)
 {
     UnkStruct_0203D9B8 * v0;
 
@@ -857,7 +857,7 @@ UnkStruct_0203D9B8 * sub_0203D9B8 (UnkStruct_0203CDB0 * param0, int param1)
     return v0;
 }
 
-void sub_0203D9D8 (UnkStruct_0203CDB0 * param0, UnkStruct_ov90_021D0D80 * param1)
+void sub_0203D9D8 (FieldSystem * param0, UnkStruct_ov90_021D0D80 * param1)
 {
     FS_EXTERN_OVERLAY(overlay90);
 
@@ -903,7 +903,7 @@ static UnkStruct_0203DA00 * sub_0203DA00 (int param0, SaveData * param1, int par
 
 static BOOL sub_0203DA64 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0203DA64 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -943,7 +943,7 @@ void sub_0203DAC0 (UnkStruct_020508D4 * param0, u16 * param1, SaveData * param2,
     sub_02050944(param0, sub_0203DA64, v0);
 }
 
-BOOL sub_0203DB10 (UnkStruct_0203CDB0 * param0, void * param1)
+BOOL sub_0203DB10 (FieldSystem * param0, void * param1)
 {
     FS_EXTERN_OVERLAY(overlay22);
 
@@ -959,7 +959,7 @@ BOOL sub_0203DB10 (UnkStruct_0203CDB0 * param0, void * param1)
     return 1;
 }
 
-BOOL sub_0203DB24 (UnkStruct_0203CDB0 * param0, void * param1)
+BOOL sub_0203DB24 (FieldSystem * param0, void * param1)
 {
     FS_EXTERN_OVERLAY(overlay22);
 
@@ -991,7 +991,7 @@ static const UnkStruct_0208BE5C Unk_020EA268 = {
     FS_OVERLAY_ID(overlay95)
 };
 
-static void sub_0203DB38 (UnkStruct_ov88_0223C370 * param0, UnkStruct_0203CDB0 * param1)
+static void sub_0203DB38 (UnkStruct_ov88_0223C370 * param0, FieldSystem * param1)
 {
     param0->unk_04 = SaveData_GetTrainerInfo(param1->unk_0C);
     param0->unk_08 = Party_GetFromSavedata(param1->unk_0C);
@@ -1031,7 +1031,7 @@ static void sub_0203DBC0 (UnkStruct_ov88_0223C370 * param0)
 BOOL sub_0203DBF0 (UnkStruct_020508D4 * param0)
 {
     int v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_0203DBF0 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -1152,7 +1152,7 @@ const UnkStruct_0208BE5C Unk_020EA248 = {
     FS_OVERLAY_ID(overlay59)
 };
 
-void sub_0203DDFC (UnkStruct_0203CDB0 * param0)
+void sub_0203DDFC (FieldSystem * param0)
 {
     UnkStruct_0203DDFC * v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203DDFC));
 
@@ -1163,7 +1163,7 @@ void sub_0203DDFC (UnkStruct_0203CDB0 * param0)
     sub_0203CD84(param0, &Unk_020EA258, v0);
 }
 
-void * sub_0203DE34 (UnkStruct_0203CDB0 * param0)
+void * sub_0203DE34 (FieldSystem * param0)
 {
     UnkStruct_0203DE34 * v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203DE34));
 
@@ -1186,12 +1186,12 @@ const UnkStruct_0208BE5C Unk_020EA238 = {
     FS_OVERLAY_ID(overlay64)
 };
 
-void sub_0203DE78 (UnkStruct_0203CDB0 * param0, SaveData * param1)
+void sub_0203DE78 (FieldSystem * param0, SaveData * param1)
 {
     sub_0203CD84(param0, &Unk_020EA238, param1);
 }
 
-void sub_0203DE88 (UnkStruct_0203CDB0 * param0, SaveData * param1)
+void sub_0203DE88 (FieldSystem * param0, SaveData * param1)
 {
     sub_0203CD84(param0, &Unk_020F2FCC, param0);
 }
@@ -1199,7 +1199,7 @@ void sub_0203DE88 (UnkStruct_0203CDB0 * param0, SaveData * param1)
 static BOOL sub_0203DE98 (UnkStruct_020508D4 * param0)
 {
     int v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_0203DE98 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -1249,7 +1249,7 @@ static BOOL sub_0203DE98 (UnkStruct_020508D4 * param0)
 
 static void sub_0203DF68 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0203DE98 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_0C->unk_00) {
@@ -1288,7 +1288,7 @@ static void sub_0203DF68 (UnkStruct_020508D4 * param0)
 void sub_0203DFE8 (UnkStruct_020508D4 * param0, int param1, int param2, int param3, int param4, const u16 * param5, u16 * param6)
 {
     Pokemon * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_0203DE98 * v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0203DE98));
 
     v2->unk_00 = 0;
@@ -1320,7 +1320,7 @@ void sub_0203DFE8 (UnkStruct_020508D4 * param0, int param1, int param2, int para
     sub_02050944(param0, sub_0203DE98, v2);
 }
 
-void sub_0203E09C (UnkStruct_0203CDB0 * param0, UnkStruct_02072014 * param1)
+void sub_0203E09C (FieldSystem * param0, UnkStruct_02072014 * param1)
 {
     FS_EXTERN_OVERLAY(overlay71);
 
@@ -1334,7 +1334,7 @@ void sub_0203E09C (UnkStruct_0203CDB0 * param0, UnkStruct_02072014 * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-BOOL sub_0203E0AC (UnkStruct_0203CDB0 * param0, void * param1)
+BOOL sub_0203E0AC (FieldSystem * param0, void * param1)
 {
     FS_EXTERN_OVERLAY(overlay21);
 
@@ -1349,7 +1349,7 @@ BOOL sub_0203E0AC (UnkStruct_0203CDB0 * param0, void * param1)
     return 1;
 }
 
-void sub_0203E0C0 (UnkStruct_0203CDB0 * param0, UnkStruct_020425E0 * param1)
+void sub_0203E0C0 (FieldSystem * param0, UnkStruct_020425E0 * param1)
 {
     FS_EXTERN_OVERLAY(overlay78);
 
@@ -1363,7 +1363,7 @@ void sub_0203E0C0 (UnkStruct_0203CDB0 * param0, UnkStruct_020425E0 * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-void sub_0203E0D0 (UnkStruct_0203CDB0 * param0)
+void sub_0203E0D0 (FieldSystem * param0)
 {
     UnkStruct_0202C834 * v0 = sub_0202C834(param0->unk_0C);
 
@@ -1379,7 +1379,7 @@ void sub_0203E0D0 (UnkStruct_0203CDB0 * param0)
     sub_0203CD84(param0, &v1, param0->unk_0C);
 }
 
-void sub_0203E0FC (UnkStruct_0203CDB0 * param0, int param1)
+void sub_0203E0FC (FieldSystem * param0, int param1)
 {
     UnkStruct_0203E0FC * v0;
 
@@ -1415,7 +1415,7 @@ void sub_0203E0FC (UnkStruct_0203CDB0 * param0, int param1)
     sub_0203CD84(param0, &v1, v0);
 }
 
-void * sub_0203E1AC (UnkStruct_0203CDB0 * param0, int param1, int param2)
+void * sub_0203E1AC (FieldSystem * param0, int param1, int param2)
 {
     UnkStruct_0206BC70 * v0;
 
@@ -1454,12 +1454,12 @@ static const UnkStruct_0208BE5C Unk_020EA328 = {
     FS_OVERLAY_ID(overlay92)
 };
 
-void sub_0203E224 (UnkStruct_0203CDB0 * param0)
+void sub_0203E224 (FieldSystem * param0)
 {
     sub_0203CD84(param0, &Unk_020EA328, param0->unk_0C);
 }
 
-void sub_0203E234 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E234 * param1)
+void sub_0203E234 (FieldSystem * param0, UnkStruct_0203E234 * param1)
 {
     FS_EXTERN_OVERLAY(overlay86);
 
@@ -1474,7 +1474,7 @@ void sub_0203E234 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E234 * param1)
 }
 
 
-void * sub_0203E244 (UnkStruct_0203CDB0 * param0)
+void * sub_0203E244 (FieldSystem * param0)
 {
     static const UnkStruct_0208BE5C v0 = {
         ov87_021D0D80, ov87_021D0E2C, ov87_021D0DFC, FS_OVERLAY_ID(overlay87),
@@ -1493,7 +1493,7 @@ void * sub_0203E244 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void sub_0203E274 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E274 * param1)
+void sub_0203E274 (FieldSystem * param0, UnkStruct_0203E274 * param1)
 {
     FS_EXTERN_OVERLAY(overlay99);
 
@@ -1507,7 +1507,7 @@ void sub_0203E274 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E274 * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-void sub_0203E284 (UnkStruct_0203CDB0 * param0, UnkStruct_020997B8 * param1)
+void sub_0203E284 (FieldSystem * param0, UnkStruct_020997B8 * param1)
 {
     FS_EXTERN_OVERLAY(overlay91);
 
@@ -1521,7 +1521,7 @@ void sub_0203E284 (UnkStruct_0203CDB0 * param0, UnkStruct_020997B8 * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-void sub_0203E2AC (UnkStruct_0203CDB0 * param0, void * param1)
+void sub_0203E2AC (FieldSystem * param0, void * param1)
 {
     FS_EXTERN_OVERLAY(overlay93);
 
@@ -1535,7 +1535,7 @@ void sub_0203E2AC (UnkStruct_0203CDB0 * param0, void * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-void sub_0203E2D4 (UnkStruct_0203CDB0 * param0, void * param1)
+void sub_0203E2D4 (FieldSystem * param0, void * param1)
 {
     FS_EXTERN_OVERLAY(overlay93);
 
@@ -1546,7 +1546,7 @@ void sub_0203E2D4 (UnkStruct_0203CDB0 * param0, void * param1)
     sub_0203CD84(param0, &v0, param1);
 }
 
-void sub_0203E2FC (UnkStruct_0203CDB0 * param0)
+void sub_0203E2FC (FieldSystem * param0)
 {
     UnkStruct_0203E2FC v0;
     Party * v1 = Party_GetFromSavedata(param0->unk_0C);
@@ -1563,7 +1563,7 @@ void sub_0203E2FC (UnkStruct_0203CDB0 * param0)
     sub_020985AC(param0->unk_10, &v0);
 }
 
-BOOL sub_0203E348 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E348 * param1)
+BOOL sub_0203E348 (FieldSystem * param0, UnkStruct_0203E348 * param1)
 {
     FS_EXTERN_OVERLAY(overlay101);
 
@@ -1580,7 +1580,7 @@ BOOL sub_0203E348 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E348 * param1)
 
 static BOOL sub_0203E35C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020507E4 * v1 = SaveData_Events(v0->unk_0C);
     UnkStruct_0203E35C * v2 = sub_02050A64(param0);
     int * v3 = sub_02050A68(param0);
@@ -1616,7 +1616,7 @@ static BOOL sub_0203E35C (UnkStruct_020508D4 * param0)
 
 void sub_0203E414 (UnkStruct_020508D4 * param0, int param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     Options * v1 = sub_02025E44(v0->unk_0C);
     UnkStruct_0203E35C * v2 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203E35C));
 
@@ -1674,13 +1674,13 @@ static BOOL sub_0203E4F8 (UnkStruct_020508D4 * param0)
 
 void sub_0203E518 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov7_0224BEFC * v1 = ov7_0224BE9C(4, v0->unk_0C, v0->unk_08);
 
     sub_02050944(param0, sub_0203E4F8, v1);
 }
 
-void * sub_0203E53C (UnkStruct_0203CDB0 * param0, int param1, int param2)
+void * sub_0203E53C (FieldSystem * param0, int param1, int param2)
 {
     FS_EXTERN_OVERLAY(overlay102);
 
@@ -1699,7 +1699,7 @@ void * sub_0203E53C (UnkStruct_0203CDB0 * param0, int param1, int param2)
     return v1;
 }
 
-void * sub_0203E564 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3, int param4)
+void * sub_0203E564 (FieldSystem * param0, u8 param1, u8 param2, u16 param3, int param4)
 {
     UnkStruct_0203E564 * v0;
 
@@ -1724,7 +1724,7 @@ void * sub_0203E564 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 para
     return v0;
 }
 
-PartyManagementData * sub_0203E598 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+PartyManagementData * sub_0203E598 (FieldSystem * param0, int param1, int param2)
 {
     PartyManagementData * v0;
 
@@ -1748,7 +1748,7 @@ PartyManagementData * sub_0203E598 (UnkStruct_0203CDB0 * param0, int param1, int
     return v0;
 }
 
-void * sub_0203E608 (UnkStruct_0203CDB0 * param0, int param1)
+void * sub_0203E608 (FieldSystem * param0, int param1)
 {
     UnkStruct_0203E608 * v0;
 
@@ -1776,7 +1776,7 @@ static const u8 Unk_020EA15C[] = {
     0x8
 };
 
-void * sub_0203E63C (int param0, UnkStruct_0203CDB0 * param1, u16 param2, u16 param3)
+void * sub_0203E63C (int param0, FieldSystem * param1, u16 param2, u16 param3)
 {
     PokemonSummary * v0;
 
@@ -1801,7 +1801,7 @@ void * sub_0203E63C (int param0, UnkStruct_0203CDB0 * param1, u16 param2, u16 pa
     return v0;
 }
 
-void sub_0203E6C0 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+void sub_0203E6C0 (FieldSystem * param0, int param1, int param2)
 {
     UnkStruct_0203E6C0 * v0;
 
@@ -1833,7 +1833,7 @@ static const UnkStruct_0208BE5C Unk_020EA348 = {
     FS_OVERLAY_ID(overlay120)
 };
 
-void sub_0203E704 (UnkStruct_0203CDB0 * param0)
+void sub_0203E704 (FieldSystem * param0)
 {
     sub_0203CD84(param0, &Unk_020EA348, param0->unk_0C);
 }
@@ -1846,7 +1846,7 @@ static const UnkStruct_0208BE5C Unk_020EA368 = {
     FS_OVERLAY_ID(overlay121)
 };
 
-void sub_0203E714 (UnkStruct_0203CDB0 * param0)
+void sub_0203E714 (FieldSystem * param0)
 {
     sub_0203CD84(param0, &Unk_020EA368, param0->unk_0C);
 }
diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c
index 59dd8ecd60..19877b25a6 100644
--- a/src/unk_0203E880.c
+++ b/src/unk_0203E880.c
@@ -40,7 +40,7 @@
 #include "unk_02061804.h"
 #include "trainer_data.h"
 
-typedef void (* UnkFuncPtr_0203E950)(UnkStruct_0203CDB0 *);
+typedef void (* UnkFuncPtr_0203E950)(FieldSystem *);
 
 typedef struct {
     int unk_00;
@@ -88,50 +88,50 @@ struct UnkStruct_0203EF60_t {
 
 #include "data/field/hidden_items.h"
 
-void sub_0203E880(UnkStruct_0203CDB0 * param0, u16 param1, UnkStruct_02061AB4 * param2);
+void sub_0203E880(FieldSystem * param0, u16 param1, UnkStruct_02061AB4 * param2);
 void sub_0203E8E0(UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2, void * param3);
 static BOOL sub_0203E950(UnkStruct_020508D4 * param0);
 static UnkStruct_0203EF60 * sub_0203EA28();
 static void sub_0203EA50(UnkStruct_0203E724 * param0);
-static void sub_0203EA68(UnkStruct_0203CDB0 * param0, UnkStruct_0203EF60 * param1, u16 param2, UnkStruct_02061AB4 * param3, void * param4);
-UnkStruct_0203E724 * sub_0203EAB8(UnkStruct_0203CDB0 * param0, u16 param1);
-static void sub_0203EAF4(UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * param1, u16 param2, u8 param3);
-static u16 sub_0203EB20(UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * param1, u16 param2);
-static void sub_0203EF14(UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * param1, int param2, u32 param3);
-static void sub_0203EF38(UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * param1);
+static void sub_0203EA68(FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, UnkStruct_02061AB4 * param3, void * param4);
+UnkStruct_0203E724 * sub_0203EAB8(FieldSystem * param0, u16 param1);
+static void sub_0203EAF4(FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2, u8 param3);
+static u16 sub_0203EB20(FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2);
+static void sub_0203EF14(FieldSystem * param0, UnkStruct_0203E724 * param1, int param2, u32 param3);
+static void sub_0203EF38(FieldSystem * param0, UnkStruct_0203E724 * param1);
 void * sub_0203EF60(UnkStruct_0203EF60 * param0, u32 param1);
-void * sub_0203F098(UnkStruct_0203CDB0 * param0, u32 param1);
-void sub_0203F0C0(UnkStruct_0203CDB0 * param0);
+void * sub_0203F098(FieldSystem * param0, u32 param1);
+void sub_0203F0C0(FieldSystem * param0);
 static void sub_0203F0E4(UnkStruct_0203E724 * param0, u16 param1);
 static void * sub_0203F0FC(int param0);
 static u32 sub_0203F110(int param0);
-u16 * sub_0203F118(UnkStruct_0203CDB0 * param0, u16 param1);
-u16 sub_0203F150(UnkStruct_0203CDB0 * param0, u16 param1);
-u16 sub_0203F164(UnkStruct_0203CDB0 * param0, u16 param1);
-BOOL sub_0203F188(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F19C(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F1B0(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F1C4(UnkStruct_0203CDB0 * param0);
-void sub_0203F1FC(UnkStruct_0203CDB0 * param0);
+u16 * sub_0203F118(FieldSystem * param0, u16 param1);
+u16 sub_0203F150(FieldSystem * param0, u16 param1);
+u16 sub_0203F164(FieldSystem * param0, u16 param1);
+BOOL sub_0203F188(FieldSystem * param0, u16 param1);
+void sub_0203F19C(FieldSystem * param0, u16 param1);
+void sub_0203F1B0(FieldSystem * param0, u16 param1);
+void sub_0203F1C4(FieldSystem * param0);
+void sub_0203F1FC(FieldSystem * param0);
 u16 sub_0203F254(u16 param0);
 BOOL sub_0203F278(u16 param0);
 BOOL sub_0203F28C(u16 param0);
-BOOL sub_0203F2A0(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F2BC(UnkStruct_0203CDB0 * param0, u16 param1);
-void sub_0203F2D8(UnkStruct_0203CDB0 * param0, u16 param1);
+BOOL sub_0203F2A0(FieldSystem * param0, u16 param1);
+void sub_0203F2BC(FieldSystem * param0, u16 param1);
+void sub_0203F2D8(FieldSystem * param0, u16 param1);
 u16 sub_0203F2F4(u16 param0);
 u16 sub_0203F304(u16 param0);
 u8 sub_0203F3C8(u16 param0);
 static BOOL sub_0203F404(UnkStruct_0203EF60 * param0, u16 param1);
-void sub_0203F310(UnkStruct_0203CDB0 * param0);
-void sub_0203F598(UnkStruct_0203CDB0 * param0);
-void sub_0203F5A4(UnkStruct_0203CDB0 * param0, u16 param1);
-BOOL sub_0203F5C0(UnkStruct_0203CDB0 * param0, u8 param1);
+void sub_0203F310(FieldSystem * param0);
+void sub_0203F598(FieldSystem * param0);
+void sub_0203F5A4(FieldSystem * param0, u16 param1);
+BOOL sub_0203F5C0(FieldSystem * param0, u8 param1);
 static u16 sub_0203F610(const u8 * param0, u8 param1);
-static u16 sub_0203F638(UnkStruct_0203CDB0 * param0, const u8 * param1, u8 param2);
-UnkStruct_0203F478 * sub_0203F478(UnkStruct_0203CDB0 * param0, int param1);
+static u16 sub_0203F638(FieldSystem * param0, const u8 * param1, u8 param2);
+UnkStruct_0203F478 * sub_0203F478(FieldSystem * param0, int param1);
 
-void sub_0203E880 (UnkStruct_0203CDB0 * param0, u16 param1, UnkStruct_02061AB4 * param2)
+void sub_0203E880 (FieldSystem * param0, u16 param1, UnkStruct_02061AB4 * param2)
 {
     UnkStruct_0203EF60 * v0 = sub_0203EA28();
 
@@ -141,7 +141,7 @@ void sub_0203E880 (UnkStruct_0203CDB0 * param0, u16 param1, UnkStruct_02061AB4 *
     return;
 }
 
-void sub_0203E8B0 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, int param2, int param3, int param4, int param5, int param6, int param7)
+void sub_0203E8B0 (FieldSystem * param0, UnkStruct_02061AB4 * param1, int param2, int param3, int param4, int param5, int param6, int param7)
 {
     UnkStruct_0203EF60 * v0 = sub_02050A64(param0->unk_10);
     UnkStruct_0203E8B0 * v1 = &v0->unk_50[param7];
@@ -156,7 +156,7 @@ void sub_0203E8B0 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, int
 
 void sub_0203E8E0 (UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0203EF60 * v1 = sub_0203EA28();
 
     sub_0203EA68(v0, v1, param1, param2, param3);
@@ -167,7 +167,7 @@ void sub_0203E8E0 (UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 *
 
 void sub_0203E918 (UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0203EF60 * v1 = sub_0203EA28();
 
     sub_0203EA68(v0, v1, param1, param2, NULL);
@@ -182,7 +182,7 @@ static BOOL sub_0203E950 (UnkStruct_020508D4 * param0)
     UnkFuncPtr_0203E950 v1;
     UnkStruct_0203E724 * v2 = NULL;
     UnkStruct_0203EF60 * v3 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v4 = sub_02050A60(param0);
+    FieldSystem * v4 = sub_02050A60(param0);
 
     switch (v3->unk_04) {
     case 0:
@@ -257,7 +257,7 @@ static void sub_0203EA50 (UnkStruct_0203E724 * param0)
     return;
 }
 
-static void sub_0203EA68 (UnkStruct_0203CDB0 * param0, UnkStruct_0203EF60 * param1, u16 param2, UnkStruct_02061AB4 * param3, void * param4)
+static void sub_0203EA68 (FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, UnkStruct_02061AB4 * param3, void * param4)
 {
     u16 * v0 = sub_0203EF60(param1, 54);
 
@@ -277,7 +277,7 @@ static void sub_0203EA68 (UnkStruct_0203CDB0 * param0, UnkStruct_0203EF60 * para
     return;
 }
 
-UnkStruct_0203E724 * sub_0203EAB8 (UnkStruct_0203CDB0 * param0, u16 param1)
+UnkStruct_0203E724 * sub_0203EAB8 (FieldSystem * param0, u16 param1)
 {
     UnkStruct_0203E724 * v0 = NULL;
 
@@ -293,7 +293,7 @@ UnkStruct_0203E724 * sub_0203EAB8 (UnkStruct_0203CDB0 * param0, u16 param1)
     return v0;
 }
 
-static void sub_0203EAF4 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * param1, u16 param2, u8 param3)
+static void sub_0203EAF4 (FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2, u8 param3)
 {
     u16 v0;
 
@@ -307,7 +307,7 @@ static void sub_0203EAF4 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * para
     return;
 }
 
-static u16 sub_0203EB20 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * param1, u16 param2)
+static u16 sub_0203EB20 (FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2)
 {
     u16 v0 = param2;
 
@@ -412,7 +412,7 @@ static u16 sub_0203EB20 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * param
     return v0;
 }
 
-static void sub_0203EF14 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * param1, int param2, u32 param3)
+static void sub_0203EF14 (FieldSystem * param0, UnkStruct_0203E724 * param1, int param2, u32 param3)
 {
     u8 * v0 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ, param2, 11);
 
@@ -422,7 +422,7 @@ static void sub_0203EF14 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * para
     return;
 }
 
-static void sub_0203EF38 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * param1)
+static void sub_0203EF38 (FieldSystem * param0, UnkStruct_0203E724 * param1)
 {
     u8 * v0 = sub_0203F0FC(param0->unk_1C->unk_00);
 
@@ -555,7 +555,7 @@ void * sub_0203EF60 (UnkStruct_0203EF60 * param0, u32 param1)
     return NULL;
 }
 
-void * sub_0203F098 (UnkStruct_0203CDB0 * param0, u32 param1)
+void * sub_0203F098 (FieldSystem * param0, u32 param1)
 {
     UnkStruct_0203EF60 * v0 = sub_02050A64(param0->unk_10);
 
@@ -566,7 +566,7 @@ void * sub_0203F098 (UnkStruct_0203CDB0 * param0, u32 param1)
     return sub_0203EF60(v0, param1);
 }
 
-void sub_0203F0C0 (UnkStruct_0203CDB0 * param0)
+void sub_0203F0C0 (FieldSystem * param0)
 {
     UnkStruct_0203EF60 * v0 = sub_02050A64(param0->unk_10);
 
@@ -595,7 +595,7 @@ static u32 sub_0203F110 (int param0)
     return MapHeader_GetMsgArchiveID(param0);
 }
 
-u16 * sub_0203F118 (UnkStruct_0203CDB0 * param0, u16 param1)
+u16 * sub_0203F118 (FieldSystem * param0, u16 param1)
 {
     UnkStruct_020507E4 * v0;
 
@@ -612,7 +612,7 @@ u16 * sub_0203F118 (UnkStruct_0203CDB0 * param0, u16 param1)
     return sub_0203F098(param0, (41 + param1 - 0x8000));
 }
 
-u16 sub_0203F150 (UnkStruct_0203CDB0 * param0, u16 param1)
+u16 sub_0203F150 (FieldSystem * param0, u16 param1)
 {
     u16 * v0 = sub_0203F118(param0, param1);
 
@@ -623,30 +623,30 @@ u16 sub_0203F150 (UnkStruct_0203CDB0 * param0, u16 param1)
     return *v0;
 }
 
-u16 sub_0203F164 (UnkStruct_0203CDB0 * param0, u16 param1)
+u16 sub_0203F164 (FieldSystem * param0, u16 param1)
 {
     GF_ASSERT((param1 < 16));
     return sub_0203F150(param0, (((0 + 0x4000) + 32) + param1));
 }
 
-BOOL sub_0203F188 (UnkStruct_0203CDB0 * param0, u16 param1)
+BOOL sub_0203F188 (FieldSystem * param0, u16 param1)
 {
     return sub_020507F0(SaveData_Events(param0->unk_0C), param1);
 }
 
-void sub_0203F19C (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0203F19C (FieldSystem * param0, u16 param1)
 {
     sub_0205081C(SaveData_Events(param0->unk_0C), param1);
     return;
 }
 
-void sub_0203F1B0 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0203F1B0 (FieldSystem * param0, u16 param1)
 {
     sub_02050844(SaveData_Events(param0->unk_0C), param1);
     return;
 }
 
-void sub_0203F1C4 (UnkStruct_0203CDB0 * param0)
+void sub_0203F1C4 (FieldSystem * param0)
 {
     int v0;
     UnkStruct_020507E4 * v1;
@@ -659,7 +659,7 @@ void sub_0203F1C4 (UnkStruct_0203CDB0 * param0)
     return;
 }
 
-void sub_0203F1FC (UnkStruct_0203CDB0 * param0)
+void sub_0203F1FC (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0;
 
@@ -669,7 +669,7 @@ void sub_0203F1FC (UnkStruct_0203CDB0 * param0)
     return;
 }
 
-void sub_0203F21C (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2, u16 param3, u16 param4)
+void sub_0203F21C (FieldSystem * param0, u16 param1, u16 param2, u16 param3, u16 param4)
 {
     *(u16 *)sub_0203F098(param0, 41) = param1;
     *(u16 *)sub_0203F098(param0, 42) = param2;
@@ -704,18 +704,18 @@ BOOL sub_0203F28C (u16 param0)
     return 1;
 }
 
-BOOL sub_0203F2A0 (UnkStruct_0203CDB0 * param0, u16 param1)
+BOOL sub_0203F2A0 (FieldSystem * param0, u16 param1)
 {
     return sub_020507F0(SaveData_Events(param0->unk_0C), 1360 + param1);
 }
 
-void sub_0203F2BC (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0203F2BC (FieldSystem * param0, u16 param1)
 {
     sub_0205081C(SaveData_Events(param0->unk_0C), 1360 + param1);
     return;
 }
 
-void sub_0203F2D8 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0203F2D8 (FieldSystem * param0, u16 param1)
 {
     sub_02050844(SaveData_Events(param0->unk_0C), 1360 + param1);
     return;
@@ -747,7 +747,7 @@ static u16 Unk_02100AD4[] = {
     0xDE
 };
 
-void sub_0203F310 (UnkStruct_0203CDB0 * param0)
+void sub_0203F310 (FieldSystem * param0)
 {
     u8 v0;
 
@@ -827,7 +827,7 @@ static BOOL sub_0203F404 (UnkStruct_0203EF60 * param0, u16 param1)
     return 1;
 }
 
-UnkStruct_0203F478 * sub_0203F478 (UnkStruct_0203CDB0 * param0, int param1)
+UnkStruct_0203F478 * sub_0203F478 (FieldSystem * param0, int param1)
 {
     UnkStruct_0203F478 * v0;
     const UnkStruct_0203A594 * v1;
@@ -890,13 +890,13 @@ UnkStruct_0203F478 * sub_0203F478 (UnkStruct_0203CDB0 * param0, int param1)
     return v0;
 }
 
-void sub_0203F598 (UnkStruct_0203CDB0 * param0)
+void sub_0203F598 (FieldSystem * param0)
 {
     sub_0203F5A4(param0, 9600);
     return;
 }
 
-void sub_0203F5A4 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0203F5A4 (FieldSystem * param0, u16 param1)
 {
     UnkStruct_0203E724 * v0 = sub_0203EAB8(param0, param1);
 
@@ -908,7 +908,7 @@ void sub_0203F5A4 (UnkStruct_0203CDB0 * param0, u16 param1)
     return;
 }
 
-BOOL sub_0203F5C0 (UnkStruct_0203CDB0 * param0, u8 param1)
+BOOL sub_0203F5C0 (FieldSystem * param0, u8 param1)
 {
     u16 v0;
     const u8 * v1;
@@ -956,7 +956,7 @@ static u16 sub_0203F610 (const u8 * param0, u8 param1)
     return 0xffff;
 }
 
-static u16 sub_0203F638 (UnkStruct_0203CDB0 * param0, const u8 * param1, u8 param2)
+static u16 sub_0203F638 (FieldSystem * param0, const u8 * param1, u8 param2)
 {
     u16 v0, v1;
     u32 v2;
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 23ba345c63..d01e62c728 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -242,7 +242,7 @@ typedef struct {
     SysTask * unk_00;
     SysTask * unk_04;
     UnkStruct_ov5_021F8E3C * unk_08;
-    UnkStruct_0203CDB0 * unk_0C;
+    FieldSystem * unk_0C;
 } UnkStruct_02040F28;
 
 static BOOL sub_0203F6C4(UnkStruct_0203E724 * param0);
@@ -271,7 +271,7 @@ static BOOL sub_0203F99C(UnkStruct_0203E724 * param0);
 static BOOL sub_0203F9EC(UnkStruct_0203E724 * param0);
 static BOOL sub_0203FA08(UnkStruct_0203E724 * param0);
 static BOOL sub_0203FA1C(UnkStruct_0203E724 * param0);
-static UnkStruct_02061AB4 * sub_02040ED4(UnkStruct_0203CDB0 * param0, int param1);
+static UnkStruct_02061AB4 * sub_02040ED4(FieldSystem * param0, int param1);
 static BOOL sub_0203FA34(UnkStruct_0203E724 * param0);
 static BOOL sub_0203FA6C(UnkStruct_0203E724 * param0);
 static BOOL sub_0203FA9C(UnkStruct_0203E724 * param0);
@@ -380,7 +380,7 @@ static BOOL sub_02041E28(UnkStruct_0203E724 * param0);
 static BOOL sub_02041E34(UnkStruct_0203E724 * param0);
 static BOOL sub_02041E64(UnkStruct_0203E724 * param0);
 static BOOL sub_02041E84(UnkStruct_0203E724 * param0);
-static void sub_020451B4(UnkStruct_0203CDB0 * param0, u16 param1);
+static void sub_020451B4(FieldSystem * param0, u16 param1);
 static BOOL sub_02041FAC(UnkStruct_0203E724 * param0);
 static BOOL sub_02042028(UnkStruct_0203E724 * param0);
 static BOOL sub_0204205C(UnkStruct_0203E724 * param0);
@@ -751,7 +751,7 @@ static BOOL sub_0204698C(UnkStruct_0203E724 * param0);
 static BOOL sub_020469D0(UnkStruct_0203E724 * param0);
 static BOOL sub_02046A4C(UnkStruct_0203E724 * param0);
 static BOOL sub_02040F0C(UnkStruct_0203E724 * param0);
-static void sub_02040F28(UnkStruct_0203CDB0 * param0, SysTask * param1, UnkStruct_ov5_021F8E3C * param2);
+static void sub_02040F28(FieldSystem * param0, SysTask * param1, UnkStruct_ov5_021F8E3C * param2);
 static void sub_02040F5C(SysTask * param0, void * param1);
 static u32 sub_0204676C(SaveData * param0);
 
@@ -1637,7 +1637,7 @@ static BOOL sub_0203F6CC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203F6D8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = sub_0203E838(param0);
     u16 v2 = sub_0203E838(param0);
     u16 * v3 = sub_0203F118(v0, v2);
@@ -1652,7 +1652,7 @@ static BOOL sub_0203F6D8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203F70C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F118(v0, param0->unk_18[0]);
 
     (*v1)--;
@@ -1854,7 +1854,7 @@ static BOOL sub_0203F92C (UnkStruct_0203E724 * param0)
 static BOOL sub_0203F964 (UnkStruct_0203E724 * param0)
 {
     u16 v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     u8 * v2 = sub_0203F098(v1, 7);
     UnkStruct_0203E724 ** v3 = sub_0203F098(v1, 14);
 
@@ -1868,7 +1868,7 @@ static BOOL sub_0203F964 (UnkStruct_0203E724 * param0)
 static BOOL sub_0203F99C (UnkStruct_0203E724 * param0)
 {
     u16 v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     u8 * v2 = sub_0203F098(v1, 5);
     u8 * v3 = sub_0203F098(v1, 7);
     UnkStruct_0203E724 ** v4 = sub_0203F098(v1, 14);
@@ -1884,7 +1884,7 @@ static BOOL sub_0203F99C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203F9EC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 * v1 = sub_0203F098(v0, 5);
 
     if (*v1 == 0) {
@@ -1896,7 +1896,7 @@ static BOOL sub_0203F9EC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FA08 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 * v1 = sub_0203F098(v0, 5);
 
     *v1 = 0;
@@ -1918,7 +1918,7 @@ static BOOL sub_0203FA34 (UnkStruct_0203E724 * param0)
     u8 v0;
     s32 v1;
     UnkStruct_02061AB4 ** v2;
-    UnkStruct_0203CDB0 * v3 = param0->unk_34;
+    FieldSystem * v3 = param0->unk_34;
 
     v2 = sub_0203F098(v3, 10);
     v0 = (*((param0)->unk_08++));
@@ -1953,7 +1953,7 @@ static BOOL sub_0203FA9C (UnkStruct_0203E724 * param0)
     u8 v0;
     s32 v1;
     int * v2;
-    UnkStruct_0203CDB0 * v3 = param0->unk_34;
+    FieldSystem * v3 = param0->unk_34;
 
     v2 = sub_0203F098(v3, 9);
     v0 = (*((param0)->unk_08++));
@@ -2012,7 +2012,7 @@ static BOOL sub_0203FB28 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FB5C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = sub_0203E838(param0);
 
     sub_0203F19C(v0, v1);
@@ -2021,7 +2021,7 @@ static BOOL sub_0203FB5C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FB74 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = sub_0203E838(param0);
 
     sub_0203F1B0(v0, v1);
@@ -2030,7 +2030,7 @@ static BOOL sub_0203FB74 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FB8C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = sub_0203E838(param0);
 
     param0->unk_02 = sub_0203F188(v0, v1);
@@ -2039,7 +2039,7 @@ static BOOL sub_0203FB8C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FBA8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -2049,7 +2049,7 @@ static BOOL sub_0203FBA8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FBE4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
 
     sub_0203F19C(v0, (*v1));
@@ -2058,7 +2058,7 @@ static BOOL sub_0203FBE4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FC0C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
 
     sub_0203F2BC(v0, v1);
@@ -2067,7 +2067,7 @@ static BOOL sub_0203FC0C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FC30 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
 
     sub_0203F2D8(v0, v1);
@@ -2076,7 +2076,7 @@ static BOOL sub_0203FC30 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FC54 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
 
     param0->unk_02 = sub_0203F2A0(v0, v1);
@@ -2226,7 +2226,7 @@ static BOOL sub_0203FEAC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0203FF34 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 v1 = (*((param0)->unk_08++));
     u16 v2 = inline_02049538(param0);
     u16 v3 = sub_0203E838(param0);
@@ -2270,7 +2270,7 @@ static BOOL sub_0203FFE8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040014 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 * v1 = sub_0203F098(v0, 3);
 
     return sub_0205DA04(*v1);
@@ -2430,7 +2430,7 @@ static BOOL sub_02040294 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020402B4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 * v1 = sub_0203F098(v0, 6);
 
     sub_0205D8F4(v0->unk_08, sub_0203F098(v0, 1), 3);
@@ -2442,7 +2442,7 @@ static BOOL sub_020402B4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020402FC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Window * v1 = sub_0203F098(v0, 1);
     u8 * v2 = sub_0203F098(v0, 6);
 
@@ -2455,7 +2455,7 @@ static BOOL sub_020402FC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204032C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Window * v1 = sub_0203F098(v0, 1);
     u8 * v2 = sub_0203F098(v0, 6);
 
@@ -2467,7 +2467,7 @@ static BOOL sub_0204032C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040354 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F098(v0, 49);
     u16 * v2 = sub_0203F098(v0, 45);
     u16 * v3 = sub_0203F098(v0, 50);
@@ -2489,7 +2489,7 @@ static BOOL sub_02040354 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020403EC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F098(v0, 49);
     u16 * v2 = sub_0203F098(v0, 50);
     u16 * v3 = sub_0203F098(v0, 51);
@@ -2530,7 +2530,7 @@ static BOOL sub_020403EC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020404A4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     Strbuf ** v1;
     Strbuf ** v2;
     StringFormatter ** v3;
@@ -2567,7 +2567,7 @@ static BOOL sub_020404A4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040554 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     u16 v1;
     u8 v2;
 
@@ -2583,7 +2583,7 @@ static BOOL sub_02040554 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040580 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     u8 v1;
 
     v0 = param0->unk_34;
@@ -2596,7 +2596,7 @@ static BOOL sub_02040580 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204059C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     if (ov5_021E1B58(v0->unk_64) == 1) {
         return 0;
@@ -2608,7 +2608,7 @@ static BOOL sub_0204059C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020405C4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     if (ov5_021E1B58(v0->unk_64) == 1) {
         return 1;
@@ -2619,7 +2619,7 @@ static BOOL sub_020405C4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020405DC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 * v1 = sub_0203F098(v0, 3);
     Strbuf ** v2 = sub_0203F098(v0, 17);
     Strbuf ** v3 = sub_0203F098(v0, 16);
@@ -2640,7 +2640,7 @@ static BOOL sub_020405DC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040670 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 * v1 = sub_0203F098(v0, 3);
     u16 * v2 = sub_0203F118(v0, param0->unk_18[0]);
     u8 v3 = ov5_021E1B54(v0->unk_64);
@@ -2689,7 +2689,7 @@ static BOOL sub_02040714 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040730 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F118(v0, param0->unk_18[0]);
     int v2 = 0xffff;
 
@@ -2724,7 +2724,7 @@ static BOOL sub_02040730 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020407B4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_0203F0C0(v0);
     return 0;
@@ -2732,7 +2732,7 @@ static BOOL sub_020407B4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020407C4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UIControlData ** v1 = sub_0203F098(v0, 2);
     u16 v2 = sub_0203E838(param0);
 
@@ -2749,7 +2749,7 @@ static BOOL sub_020407C4 (UnkStruct_0203E724 * param0)
 static BOOL sub_02040824 (UnkStruct_0203E724 * param0)
 {
     u32 v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     UIControlData ** v2 = sub_0203F098(v1, 2);
     u16 * v3 = sub_0203F118(v1, param0->unk_18[0]);
 
@@ -2791,7 +2791,7 @@ static BOOL sub_02040898 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020408B0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
     StringFormatter ** v2 = sub_0203F098(v0, 15);
     u8 v3 = (*((param0)->unk_08++));
@@ -2808,7 +2808,7 @@ static BOOL sub_020408B0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040938 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
     StringFormatter ** v2 = sub_0203F098(v0, 15);
     u8 v3 = (*((param0)->unk_08++));
@@ -2826,7 +2826,7 @@ static BOOL sub_02040938 (UnkStruct_0203E724 * param0)
 static BOOL sub_020409C0 (UnkStruct_0203E724 * param0)
 {
     u8 v0, v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v3 = sub_0203F098(v2, 0);
 
     v0 = (*((param0)->unk_08++));
@@ -2839,7 +2839,7 @@ static BOOL sub_020409C0 (UnkStruct_0203E724 * param0)
 static BOOL sub_020409E8 (UnkStruct_0203E724 * param0)
 {
     u16 v0, v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v3 = sub_0203F098(v2, 0);
 
     v0 = inline_02049538(param0);
@@ -2851,7 +2851,7 @@ static BOOL sub_020409E8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040A2C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
 
     ov5_021DC1AC(*v1);
@@ -2862,7 +2862,7 @@ static BOOL sub_02040A2C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040A50 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F118(v0, param0->unk_18[0]);
 
     if (*v1 == 0xeeee) {
@@ -2874,7 +2874,7 @@ static BOOL sub_02040A50 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040A78 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
 
     ov5_021DC1AC(*v1);
@@ -2885,7 +2885,7 @@ static BOOL sub_02040A78 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040A9C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F118(v0, param0->unk_18[0]);
     UnkStruct_ov5_021DC1A4 ** v2 = sub_0203F098(v0, 0);
 
@@ -2904,7 +2904,7 @@ static BOOL sub_02040A9C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040AE8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
     StringFormatter ** v2 = sub_0203F098(v0, 15);
     u8 v3 = (*((param0)->unk_08++));
@@ -2921,7 +2921,7 @@ static BOOL sub_02040AE8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040B70 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
     StringFormatter ** v2 = sub_0203F098(v0, 15);
     u8 v3 = (*((param0)->unk_08++));
@@ -2949,7 +2949,7 @@ static BOOL sub_02040BF8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040C58 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
 
     ov5_021DC4B8(*v1);
@@ -2960,7 +2960,7 @@ static BOOL sub_02040C58 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040C7C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
     u16 v2 = inline_02049538(param0);
 
@@ -2972,7 +2972,7 @@ static BOOL sub_02040C7C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040CB8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
     u16 * v2 = inline_0204FCAC(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -2985,7 +2985,7 @@ static BOOL sub_02040CB8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040D08 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
     u8 v2 = (*((param0)->unk_08++));
 
@@ -2997,7 +2997,7 @@ static BOOL sub_02040D08 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040D34 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
     u8 v2 = (*((param0)->unk_08++));
 
@@ -3007,7 +3007,7 @@ static BOOL sub_02040D34 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040D54 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0);
     u8 v2 = (*((param0)->unk_08++));
 
@@ -3099,7 +3099,7 @@ static BOOL sub_02040DD8 (UnkStruct_0203E724 * param0)
     return 0;
 }
 
-static UnkStruct_02061AB4 * sub_02040ED4 (UnkStruct_0203CDB0 * param0, int param1)
+static UnkStruct_02061AB4 * sub_02040ED4 (FieldSystem * param0, int param1)
 {
     UnkStruct_02061AB4 ** v0;
     UnkStruct_02061AB4 * v1;
@@ -3124,7 +3124,7 @@ static BOOL sub_02040EFC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02040F0C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 * v1 = sub_0203F098(v0, 4);
 
     if (*v1 == 0) {
@@ -3134,7 +3134,7 @@ static BOOL sub_02040F0C (UnkStruct_0203E724 * param0)
     return 0;
 }
 
-static void sub_02040F28 (UnkStruct_0203CDB0 * param0, SysTask * param1, UnkStruct_ov5_021F8E3C * param2)
+static void sub_02040F28 (FieldSystem * param0, SysTask * param1, UnkStruct_ov5_021F8E3C * param2)
 {
     UnkStruct_02040F28 * v0 = NULL;
 
@@ -3185,7 +3185,7 @@ static void sub_02040F5C (SysTask * param0, void * param1)
 static BOOL sub_02040FA4 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061830 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     UnkStruct_02061AB4 ** v2 = sub_0203F098(v1, 10);
 
     if (*v2 == NULL) {
@@ -3234,7 +3234,7 @@ static inline void inline_020410F4_3 (int mask)
 
 static BOOL sub_02041004 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
 
@@ -3275,7 +3275,7 @@ static BOOL sub_02041004 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020410CC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_02061AB4 * v1 = sub_02062570(v0->unk_38, 0x30);
 
     if (sub_02062D1C(v1) == 0) {
@@ -3288,7 +3288,7 @@ static BOOL sub_020410CC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020410F4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
     UnkStruct_02061AB4 * v3 = sub_02062570(v0->unk_38, 0x30);
@@ -3331,7 +3331,7 @@ static BOOL sub_020410F4 (UnkStruct_0203E724 * param0)
 static BOOL sub_020411C4 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061830 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = v1->unk_38;
     sub_02062C78(v0);
@@ -3342,7 +3342,7 @@ static BOOL sub_020411C4 (UnkStruct_0203E724 * param0)
 static BOOL sub_020411D4 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, sub_0203E838(param0));
     sub_02062DD0(v0);
@@ -3353,7 +3353,7 @@ static BOOL sub_020411D4 (UnkStruct_0203E724 * param0)
 static BOOL sub_020411F0 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, sub_0203E838(param0));
     sub_02062DDC(v0);
@@ -3364,7 +3364,7 @@ static BOOL sub_020411F0 (UnkStruct_0203E724 * param0)
 static BOOL sub_0204120C (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     u16 v2 = inline_02049538(param0);
 
     v0 = sub_02061A74(v1->unk_38, v2, sub_0203A4B4(v1), v1->unk_1C->unk_00, sub_0203A4BC(v1));
@@ -3379,7 +3379,7 @@ static BOOL sub_0204120C (UnkStruct_0203E724 * param0)
 static BOOL sub_02041254 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, inline_02049538(param0));
 
@@ -3462,10 +3462,10 @@ static BOOL sub_020413F0 (UnkStruct_0203E724 * param0)
 {
     int v0;
     UnkStruct_02061AB4 ** v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
 
     {
-        UnkStruct_0203CDB0 * v3;
+        FieldSystem * v3;
         UnkStruct_0205E884 * v4;
 
         v3 = param0->unk_34;
@@ -3488,7 +3488,7 @@ static BOOL sub_020413F0 (UnkStruct_0203E724 * param0)
 static BOOL sub_02041420 (UnkStruct_0203E724 * param0)
 {
     u16 * v0, * v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
 
     v0 = inline_0204FCAC(param0);
     v1 = inline_0204FCAC(param0);
@@ -3502,7 +3502,7 @@ static BOOL sub_02041464 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061AB4 * v0;
     u16 * v1, * v2;
-    UnkStruct_0203CDB0 * v3 = param0->unk_34;
+    FieldSystem * v3 = param0->unk_34;
 
     v0 = sub_0206251C(v3->unk_38, inline_02049538(param0));
     v1 = inline_0204FCAC(param0);
@@ -3527,7 +3527,7 @@ static BOOL sub_020414EC (UnkStruct_0203E724 * param0)
 {
     u16 v0, v1, v2;
     VecFx32 v3;
-    UnkStruct_0203CDB0 * v4 = param0->unk_34;
+    FieldSystem * v4 = param0->unk_34;
 
     v0 = inline_02049538(param0);
     v1 = inline_02049538(param0);
@@ -3960,7 +3960,7 @@ static BOOL sub_02041CC4 (UnkStruct_0203E724 * param0)
 BOOL sub_02041CC8 (UnkStruct_0203E724 * param0)
 {
     void ** v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0203F098(param0->unk_34, 19);
 
@@ -3977,7 +3977,7 @@ BOOL sub_02041CC8 (UnkStruct_0203E724 * param0)
 static BOOL sub_02041CF4 (UnkStruct_0203E724 * param0)
 {
     void ** v0;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
     UnkStruct_02042434 * v2;
 
     v1 = param0->unk_34;
@@ -4004,7 +4004,7 @@ static BOOL sub_02041CF4 (UnkStruct_0203E724 * param0)
 static BOOL sub_02041D3C (UnkStruct_0203E724 * param0)
 {
     void ** v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0203F098(param0->unk_34, 19);
 
@@ -4019,7 +4019,7 @@ static BOOL sub_02041D3C (UnkStruct_0203E724 * param0)
 
 BOOL sub_02041D60 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     if (sub_020509B4(v0)) {
         return 0;
@@ -4040,7 +4040,7 @@ static BOOL sub_02041D88 (UnkStruct_0203E724 * param0)
     return 1;
 }
 
-static BOOL sub_02041D98 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+static BOOL sub_02041D98 (FieldSystem * param0, int param1, int param2)
 {
     UnkStruct_0202A750 * v0 = sub_0202A750(param0->unk_0C);
 
@@ -4057,7 +4057,7 @@ static BOOL sub_02041D98 (UnkStruct_0203CDB0 * param0, int param1, int param2)
     return 1;
 }
 
-static UnkStruct_02041DC8 * sub_02041DC8 (int param0, UnkStruct_0203CDB0 * param1, int param2, int param3)
+static UnkStruct_02041DC8 * sub_02041DC8 (int param0, FieldSystem * param1, int param2, int param3)
 {
     UnkStruct_02041DC8 * v0;
     UnkStruct_02029C68 * v1;
@@ -4163,7 +4163,7 @@ static BOOL sub_02041FC4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02041FDC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = sub_0203E838(param0);
 
     param0->unk_18[0] = v1;
@@ -4428,7 +4428,7 @@ static BOOL sub_02042434 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02042480 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_0203DDFC(v0);
     sub_0203E764(param0, sub_02041D60);
@@ -4583,7 +4583,7 @@ static BOOL sub_020426A8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020426E8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_0203DFE8(param0->unk_28, 0, 0, 7, 0, NULL, inline_0204FCAC(param0));
     return 1;
@@ -4593,7 +4593,7 @@ static BOOL sub_02042718 (UnkStruct_0203E724 * param0)
 {
     u16 v0[10 * 2];
     Pokemon * v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
     u16 v3 = inline_02049538(param0);
 
     v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v2->unk_0C), v3);
@@ -4706,7 +4706,7 @@ static BOOL sub_02042984 (UnkStruct_0203E724 * param0)
 {
     u16 v0, v1, v2, v3;
     s16 v4;
-    UnkStruct_0203CDB0 * v5 = param0->unk_34;
+    FieldSystem * v5 = param0->unk_34;
 
     v0 = inline_02049538(param0);
     v4 = sub_0203E838(param0);
@@ -4723,7 +4723,7 @@ static BOOL sub_020429F4 (UnkStruct_0203E724 * param0)
 {
     u16 v0, v1, v2, v3;
     s16 v4;
-    UnkStruct_0203CDB0 * v5 = param0->unk_34;
+    FieldSystem * v5 = param0->unk_34;
 
     v0 = sub_0203E838(param0);
     v4 = sub_0203E838(param0);
@@ -4941,7 +4941,7 @@ static BOOL sub_02042E38 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02042E64 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F098(v0, 8);
     Strbuf ** v2 = sub_0203F098(v0, 16);
     u8 * v3 = sub_0203F098(v0, 6);
@@ -4960,7 +4960,7 @@ static BOOL sub_02042E64 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02042F04 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -4976,7 +4976,7 @@ static BOOL sub_02042F04 (UnkStruct_0203E724 * param0)
 static BOOL sub_02042F74 (UnkStruct_0203E724 * param0)
 {
     u32 v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     u16 * v2 = sub_0203F118(v1, param0->unk_18[0]);
 
     v0 = ov7_0224B460();
@@ -4991,7 +4991,7 @@ static BOOL sub_02042F74 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02042F9C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -5007,7 +5007,7 @@ static BOOL sub_02042F9C (UnkStruct_0203E724 * param0)
 static BOOL sub_0204300C (UnkStruct_0203E724 * param0)
 {
     u32 v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     u16 * v2 = sub_0203F118(v1, param0->unk_18[0]);
 
     v0 = ov7_0224B4C8();
@@ -5022,7 +5022,7 @@ static BOOL sub_0204300C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043034 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = sub_0203E838(param0);
 
     return 1;
@@ -5030,7 +5030,7 @@ static BOOL sub_02043034 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043040 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = sub_0203E838(param0);
 
     return 1;
@@ -5084,7 +5084,7 @@ static BOOL sub_02043100 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043130 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u8 v3 = (*((param0)->unk_08++));
@@ -5133,7 +5133,7 @@ static BOOL sub_02043220 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043250 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     return 0;
 }
@@ -5201,7 +5201,7 @@ static BOOL sub_020433D8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204342C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     BOOL * v1 = sub_0203F098(v0, 23);
     u16 v2 = inline_02049538(param0);
 
@@ -5217,7 +5217,7 @@ static BOOL sub_02043460 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204346C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     ov5_021EFBDC(v0);
     return 0;
@@ -5225,7 +5225,7 @@ static BOOL sub_0204346C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204347C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
 
     *v1 = ov5_021EFB94(v0);
@@ -5234,7 +5234,7 @@ static BOOL sub_0204347C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020434A4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     BOOL * v1 = sub_0203F098(v0, 23);
 
     sub_0205120C(param0->unk_28, v1);
@@ -5243,7 +5243,7 @@ static BOOL sub_020434A4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020434C0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     ov5_021EFC90(v0);
     return 0;
@@ -5276,7 +5276,7 @@ static BOOL sub_020434EC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043540 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
 
     *v1 = ov5_021E200C(v0);
@@ -5314,7 +5314,7 @@ static BOOL sub_020435AC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020435DC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
 
     PoketchData_RegisterApp(SaveData_PoketchData(v0->unk_0C), v1);
@@ -5323,7 +5323,7 @@ static BOOL sub_020435DC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043608 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -5364,7 +5364,7 @@ static BOOL sub_02043694 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020436A0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -5375,7 +5375,7 @@ static BOOL sub_020436A0 (UnkStruct_0203E724 * param0)
 static BOOL sub_020436D0 (UnkStruct_0203E724 * param0)
 {
     u16 * v0 = inline_0204FCAC(param0);
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     StringFormatter ** v2 = sub_0203F098(v1, 15);
 
     *v0 = sub_0205BF44(param0->unk_34->unk_7C, *v2);
@@ -5426,7 +5426,7 @@ static BOOL sub_020437B4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020437C4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_0205C2B0(v0->unk_80);
     sub_02036AC4();
@@ -5470,7 +5470,7 @@ static BOOL sub_02043854 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043894 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -5480,7 +5480,7 @@ static BOOL sub_02043894 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020438CC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -5501,7 +5501,7 @@ static BOOL sub_0204391C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043938 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u32 v1 = sub_0205B8D8(v0->unk_7C);
     u16 * v2 = sub_0203F118(v0, param0->unk_18[0]);
 
@@ -5515,7 +5515,7 @@ static BOOL sub_02043938 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043964 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_0205C22C * v1 = v0->unk_80;
 
     sub_0205C820(v0->unk_38, v1);
@@ -5539,7 +5539,7 @@ static BOOL sub_02043988 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204399C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
 
@@ -5662,7 +5662,7 @@ static BOOL sub_02043BD4 (UnkStruct_0203E724 * param0)
 static BOOL sub_02043BE0 (UnkStruct_0203E724 * param0)
 {
     u16 v0 = inline_02049538(param0);
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     sub_0203A764(sub_0203A790(v1->unk_0C), v0);
     return 0;
@@ -5679,7 +5679,7 @@ static BOOL sub_02043C0C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043C3C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0->unk_28);
+    FieldSystem * v0 = sub_02050A60(param0->unk_28);
 
     HealAllPokemonInParty(Party_GetFromSavedata(v0->unk_0C));
     return 0;
@@ -5835,7 +5835,7 @@ static BOOL sub_02043F6C (UnkStruct_0203E724 * param0)
     u16 v2, v3;
     int v4, v5;
     u8 v6;
-    UnkStruct_0203CDB0 * v7;
+    FieldSystem * v7;
 
     v0 = sub_0203E838(param0);
     v1 = sub_0203E838(param0);
@@ -5854,7 +5854,7 @@ static BOOL sub_02043F6C (UnkStruct_0203E724 * param0)
 static BOOL sub_02043FC4 (UnkStruct_0203E724 * param0)
 {
     u8 v0;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
 
     v0 = (*((param0)->unk_08++));
     v1 = param0->unk_34;
@@ -5866,7 +5866,7 @@ static BOOL sub_02043FC4 (UnkStruct_0203E724 * param0)
 static BOOL sub_02043FDC (UnkStruct_0203E724 * param0)
 {
     u8 v0;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
 
     v0 = (*((param0)->unk_08++));
     v1 = param0->unk_34;
@@ -5878,7 +5878,7 @@ static BOOL sub_02043FDC (UnkStruct_0203E724 * param0)
 static BOOL sub_02043FF4 (UnkStruct_0203E724 * param0)
 {
     u8 v0;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
 
     v0 = (*((param0)->unk_08++));
     v1 = param0->unk_34;
@@ -5890,7 +5890,7 @@ static BOOL sub_02043FF4 (UnkStruct_0203E724 * param0)
 static BOOL sub_0204400C (UnkStruct_0203E724 * param0)
 {
     u8 v0;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
 
     v0 = (*((param0)->unk_08++));
     v1 = param0->unk_34;
@@ -5901,7 +5901,7 @@ static BOOL sub_0204400C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044024 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_02071B10(v0);
     return 0;
@@ -5909,7 +5909,7 @@ static BOOL sub_02044024 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044034 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     ov8_0224997C(v0);
     return 1;
@@ -5917,7 +5917,7 @@ static BOOL sub_02044034 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044044 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_02071C18(v0);
     return 0;
@@ -5925,7 +5925,7 @@ static BOOL sub_02044044 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044054 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     ov8_02249FB8(v0);
     return 1;
@@ -5933,7 +5933,7 @@ static BOOL sub_02044054 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044064 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_02071B30(v0);
     return 0;
@@ -5941,7 +5941,7 @@ static BOOL sub_02044064 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044074 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_02071BF8(v0);
     return 0;
@@ -5949,7 +5949,7 @@ static BOOL sub_02044074 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044084 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 v1 = (*((param0)->unk_08++));
 
     sub_02071B6C(v0, v1);
@@ -5958,7 +5958,7 @@ static BOOL sub_02044084 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020440A0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 v1 = (*((param0)->unk_08++));
 
     ov8_0224AD34(v0, v1);
@@ -5967,7 +5967,7 @@ static BOOL sub_020440A0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020440BC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_02071BD0(v0);
     return 0;
@@ -5975,7 +5975,7 @@ static BOOL sub_020440BC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020440CC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_02071C34(v0);
     return 0;
@@ -5983,7 +5983,7 @@ static BOOL sub_020440CC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020440DC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_02071C5C(v0);
     return 0;
@@ -5992,7 +5992,7 @@ static BOOL sub_020440DC (UnkStruct_0203E724 * param0)
 static BOOL sub_020440EC (UnkStruct_0203E724 * param0)
 {
     u16 * v0, * v1, * v2;
-    UnkStruct_0203CDB0 * v3 = param0->unk_34;
+    FieldSystem * v3 = param0->unk_34;
 
     v0 = inline_0204FCAC(param0);
     v2 = inline_0204FCAC(param0);
@@ -6091,7 +6091,7 @@ static BOOL sub_020442B0 (UnkStruct_0203E724 * param0)
 static BOOL sub_020442B4 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, inline_02049538(param0));
 
@@ -6106,7 +6106,7 @@ static BOOL sub_020442B4 (UnkStruct_0203E724 * param0)
 static BOOL sub_020442E8 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, inline_02049538(param0));
 
@@ -6126,7 +6126,7 @@ static BOOL sub_0204431C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044328 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
     UnkStruct_02028430 * v2 = sub_02028430(v0->unk_0C);
 
@@ -6152,7 +6152,7 @@ static BOOL sub_02044374 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044398 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
     u16 v2 = inline_02049538(param0);
 
@@ -6163,7 +6163,7 @@ static BOOL sub_02044398 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020443D0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
     u16 v2 = inline_02049538(param0);
 
@@ -6174,7 +6174,7 @@ static BOOL sub_020443D0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044408 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
     u16 v2 = inline_02049538(param0);
 
@@ -6185,7 +6185,7 @@ static BOOL sub_02044408 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044444 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 v2 = inline_02049538(param0);
 
@@ -6196,7 +6196,7 @@ static BOOL sub_02044444 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044468 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -6207,7 +6207,7 @@ static BOOL sub_02044468 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020444BC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -6218,7 +6218,7 @@ static BOOL sub_020444BC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044510 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_0206B0C4(SaveData_Events(v0->unk_0C), 0x8200);
     return 0;
@@ -6226,7 +6226,7 @@ static BOOL sub_02044510 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02044528 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     inline_02044528(SaveData_Events(v0->unk_0C));
     v0->unk_9C = sub_0202B634(sub_0202B628(v0->unk_0C), 1);
@@ -6820,7 +6820,7 @@ static BOOL sub_0204504C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045068 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     TrainerInfo * v1 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
     u16 * v2 = inline_0204FCAC(param0);
     PCBoxes * v3 = SaveData_PCBoxes(v0->unk_0C);
@@ -6849,7 +6849,7 @@ static BOOL sub_02045068 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045134 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_0202855C * v2;
     u16 * v3 = inline_0204FCAC(param0);
@@ -6862,7 +6862,7 @@ static BOOL sub_02045134 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045160 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     u8 v1;
 
     v0 = param0->unk_34;
@@ -6875,7 +6875,7 @@ static BOOL sub_02045160 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204517C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     u8 v1;
 
     v0 = param0->unk_34;
@@ -6887,7 +6887,7 @@ static BOOL sub_0204517C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045198 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     u8 v1;
 
     v0 = param0->unk_34;
@@ -6897,7 +6897,7 @@ static BOOL sub_02045198 (UnkStruct_0203E724 * param0)
     return 0;
 }
 
-static void sub_020451B4 (UnkStruct_0203CDB0 * param0, u16 param1)
+static void sub_020451B4 (FieldSystem * param0, u16 param1)
 {
     PokedexData * v0 = sub_02027560(param0->unk_0C);
     Pokemon * v1 = Pokemon_New(32);
@@ -7237,7 +7237,7 @@ static BOOL sub_02045760 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045798 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_020507E4 * v1 = SaveData_Events(param0->unk_34->unk_0C);
     u16 * v2 = inline_0204FCAC(param0);
     u32 v3;
@@ -7277,7 +7277,7 @@ static BOOL sub_020457FC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045840 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_02050568(v0);
     return 1;
@@ -7285,7 +7285,7 @@ static BOOL sub_02045840 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045850 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
 
     sub_0206B334(v1);
@@ -7338,7 +7338,7 @@ static BOOL sub_020458CC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045900 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_020507E4 * v1 = SaveData_Events(param0->unk_34->unk_0C);
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3;
@@ -7357,7 +7357,7 @@ static BOOL sub_02045900 (UnkStruct_0203E724 * param0)
 static BOOL sub_02045938 (UnkStruct_0203E724 * param0)
 {
     u16 * v0 = inline_0204FCAC(param0);
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     UnkStruct_02025CCC * v2;
 
     v2 = sub_02025CCC(param0->unk_34->unk_0C);
@@ -7386,7 +7386,7 @@ static BOOL sub_020459BC (UnkStruct_0203E724 * param0)
     u16 v2, v3, v4;
     u16 v5 = inline_02049538(param0);
     u16 v6 = inline_02049538(param0);
-    UnkStruct_0203CDB0 * v7 = param0->unk_34;
+    FieldSystem * v7 = param0->unk_34;
     static const u16 v8[] = {
         0x10F,
         0x110,
@@ -7667,7 +7667,7 @@ static BOOL sub_02045DB0 (UnkStruct_0203E724 * param0)
 {
     u16 v0 = inline_02049538(param0);
     u16 * v1 = inline_0204FCAC(param0);
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
 
     switch (v0) {
     case 0:
@@ -7753,7 +7753,7 @@ static BOOL sub_02045F04 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045F48 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -7783,7 +7783,7 @@ static BOOL sub_02045F48 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02046038 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_02025CCC * v1;
 
     v1 = sub_02025CCC(param0->unk_34->unk_0C);
@@ -7794,7 +7794,7 @@ static BOOL sub_02046038 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02046050 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
     StringFormatter ** v2 = sub_0203F098(v0, 15);
 
@@ -7855,7 +7855,7 @@ static BOOL sub_02046108 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02046144 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
 
     *v1 = sub_02071F28(v0);
@@ -7864,7 +7864,7 @@ static BOOL sub_02046144 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204616C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021E1FF4 ** v1 = sub_0203F098(v0, 40);
 
     if (!SaveData_OverwriteCheck(v0->unk_0C)) {
@@ -7877,7 +7877,7 @@ static BOOL sub_0204616C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204619C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_ov5_021E1FF4 ** v1 = sub_0203F098(v0, 40);
 
     if (!SaveData_OverwriteCheck(v0->unk_0C)) {
@@ -7926,7 +7926,7 @@ static BOOL sub_020461E0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02046294 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Strbuf ** v1 = sub_0203F098(v0, 16);
     Window * v2 = sub_0203F098(v0, 1);
 
@@ -7936,7 +7936,7 @@ static BOOL sub_02046294 (UnkStruct_0203E724 * param0)
 
 static void sub_020462C0 (SysTask * param0, void * param1)
 {
-    UnkStruct_0203CDB0 * v0 = param1;
+    FieldSystem * v0 = param1;
 
     if (v0->unk_04->unk_0C) {
         ov5_021D5F24(v0->unk_04->unk_0C, 26);
@@ -7946,7 +7946,7 @@ static void sub_020462C0 (SysTask * param0, void * param1)
 
 static BOOL sub_020462DC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     SysTask_Start(sub_020462C0, v0, 128);
     return 1;
@@ -7954,7 +7954,7 @@ static BOOL sub_020462DC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020462F4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = sub_0203A74C(sub_0203A790(v0->unk_0C));
 
     ov5_021D5F24(v0->unk_04->unk_0C, v1);
@@ -8045,7 +8045,7 @@ BOOL sub_020463B4 (UnkStruct_0203E724 * param0)
 BOOL sub_020463E4 (UnkStruct_0203E724 * param0)
 {
     void ** v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0203F098(param0->unk_34, 19);
     Heap_FreeToHeap(*v0);
@@ -8058,7 +8058,7 @@ BOOL sub_02046400 (UnkStruct_0203E724 * param0)
 {
     void ** v0;
     UnkStruct_0203E608 * v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
     u16 v3 = inline_02049538(param0);
     u16 * v4 = inline_0204FCAC(param0);
     u16 * v5 = inline_0204FCAC(param0);
@@ -8239,7 +8239,7 @@ static BOOL sub_0204666C (UnkStruct_0203E724 * param0)
 static BOOL sub_020466A4 (UnkStruct_0203E724 * param0)
 {
     u32 v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     u16 * v2 = inline_0204FCAC(param0);
     u16 * v3 = inline_0204FCAC(param0);
     u16 * v4 = inline_0204FCAC(param0);
@@ -8348,7 +8348,7 @@ static BOOL sub_02046868 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02046888 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
 
     ov9_0224F158(v0, v1);
@@ -8357,7 +8357,7 @@ static BOOL sub_02046888 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020468AC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
 
     ov9_0224F16C(v0, v1);
@@ -8366,7 +8366,7 @@ static BOOL sub_020468AC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020468D0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     ov9_02249FD0(v0);
     return 0;
@@ -8378,7 +8378,7 @@ u32 Unk_021C07EC;
 
 static BOOL sub_020468E0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u32 v2, v3, v4;
 
@@ -8413,7 +8413,7 @@ static BOOL sub_0204693C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02046958 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
 
     ov9_0224E884(v0, v1);
@@ -8422,7 +8422,7 @@ static BOOL sub_02046958 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204697C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     ov9_0224E8A8(v0);
     return 0;
@@ -8430,7 +8430,7 @@ static BOOL sub_0204697C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204698C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
     s64 v2;
     s64 v3;
@@ -8449,7 +8449,7 @@ static BOOL sub_0204698C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020469D0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Party * v1;
     u16 v2 = inline_02049538(param0);
 
diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c
index 34ff1f9954..a74d4028ed 100644
--- a/src/unk_020474B8.c
+++ b/src/unk_020474B8.c
@@ -43,7 +43,7 @@ static Strbuf* sub_02047998(u16 param0, u32 param1);
 
 BOOL sub_020474B8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u8 v3 = inline_02049538(param0);
@@ -54,7 +54,7 @@ BOOL sub_020474B8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_020474F4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
 
@@ -64,7 +64,7 @@ BOOL sub_020474F4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047528 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
 
@@ -74,7 +74,7 @@ BOOL sub_02047528 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204754C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
 
@@ -85,7 +85,7 @@ BOOL sub_0204754C (UnkStruct_0203E724 * param0)
 BOOL sub_02047570 (UnkStruct_0203E724 * param0)
 {
     Pokemon * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     StringFormatter ** v2 = sub_0203F098(v1, 15);
     u8 v3 = (*((param0)->unk_08++));
     u16 v4 = inline_02049538(param0);
@@ -98,7 +98,7 @@ BOOL sub_02047570 (UnkStruct_0203E724 * param0)
 
 BOOL sub_020475B8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -109,7 +109,7 @@ BOOL sub_020475B8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_020475F0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -120,7 +120,7 @@ BOOL sub_020475F0 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047628 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -132,7 +132,7 @@ BOOL sub_02047628 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047660 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -146,7 +146,7 @@ BOOL sub_02047660 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204769C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -157,7 +157,7 @@ BOOL sub_0204769C (UnkStruct_0203E724 * param0)
 
 BOOL sub_020476D4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -168,7 +168,7 @@ BOOL sub_020476D4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204771C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -185,7 +185,7 @@ BOOL sub_0204771C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204777C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u32 v3 = sub_0203E850(param0);
@@ -203,7 +203,7 @@ BOOL sub_0204777C (UnkStruct_0203E724 * param0)
 BOOL sub_020477D0 (UnkStruct_0203E724 * param0)
 {
     Pokemon * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     StringFormatter ** v2 = sub_0203F098(v1, 15);
     u8 v3 = (*((param0)->unk_08++));
     u16 v4 = inline_02049538(param0);
@@ -217,7 +217,7 @@ BOOL sub_020477D0 (UnkStruct_0203E724 * param0)
 BOOL sub_02047818 (UnkStruct_0203E724 * param0)
 {
     BoxPokemon * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     PCBoxes * v2 = SaveData_PCBoxes(v1->unk_0C);
     StringFormatter ** v3 = sub_0203F098(v1, 15);
     u8 v4 = (*((param0)->unk_08++));
@@ -235,7 +235,7 @@ BOOL sub_02047818 (UnkStruct_0203E724 * param0)
 BOOL sub_02047874 (UnkStruct_0203E724 * param0)
 {
     Pokemon * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     StringFormatter ** v2 = sub_0203F098(v1, 15);
     u8 v3 = (*((param0)->unk_08++));
     u16 v4 = inline_02049538(param0);
@@ -246,7 +246,7 @@ BOOL sub_02047874 (UnkStruct_0203E724 * param0)
 
 BOOL sub_020478AC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -258,7 +258,7 @@ BOOL sub_020478AC (UnkStruct_0203E724 * param0)
 BOOL sub_020478E4 (UnkStruct_0203E724 * param0)
 {
     int v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     TrainerInfo * v2 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
     StringFormatter ** v3 = sub_0203F098(v1, 15);
     u8 v4 = (*((param0)->unk_08++));
@@ -271,7 +271,7 @@ BOOL sub_020478E4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047930 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -338,7 +338,7 @@ BOOL sub_02047A60 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047AB0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -349,7 +349,7 @@ BOOL sub_02047AB0 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047AE8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -360,7 +360,7 @@ BOOL sub_02047AE8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047B20 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -409,7 +409,7 @@ BOOL sub_02047C30 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047C68 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -421,7 +421,7 @@ BOOL sub_02047C68 (UnkStruct_0203E724 * param0)
 BOOL sub_02047CA0 (UnkStruct_0203E724 * param0)
 {
     Strbuf* v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     StringFormatter ** v2 = sub_0203F098(v1, 15);
     u8 v3 = (*((param0)->unk_08++));
 
@@ -436,7 +436,7 @@ BOOL sub_02047CA0 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047D00 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     StringFormatter ** v2 = sub_0203F098(v0, 15);
     u8 v3 = (*((param0)->unk_08++));
@@ -453,7 +453,7 @@ BOOL sub_02047D00 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047D68 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -467,7 +467,7 @@ BOOL sub_02047D68 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047DAC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -480,7 +480,7 @@ BOOL sub_02047DAC (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047DE8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -491,7 +491,7 @@ BOOL sub_02047DE8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047E20 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -502,7 +502,7 @@ BOOL sub_02047E20 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047E58 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -513,7 +513,7 @@ BOOL sub_02047E58 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047E90 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -524,7 +524,7 @@ BOOL sub_02047E90 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047EC8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -535,7 +535,7 @@ BOOL sub_02047EC8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047F00 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -546,7 +546,7 @@ BOOL sub_02047F00 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047F38 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -569,7 +569,7 @@ BOOL sub_02047F80 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047FB4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -580,7 +580,7 @@ BOOL sub_02047FB4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02047FEC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -591,7 +591,7 @@ BOOL sub_02047FEC (UnkStruct_0203E724 * param0)
 
 BOOL sub_02048024 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u16 v3 = inline_02049538(param0);
@@ -604,7 +604,7 @@ BOOL sub_02048024 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02048060 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
 
@@ -614,7 +614,7 @@ BOOL sub_02048060 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02048080 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
     u8 v3 = (*((param0)->unk_08++));
diff --git a/src/unk_020480A8.c b/src/unk_020480A8.c
index 0b4bf83f5c..44928bee98 100644
--- a/src/unk_020480A8.c
+++ b/src/unk_020480A8.c
@@ -35,7 +35,7 @@ BOOL sub_020480A8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_020480D8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     BoxPokemon * v2;
     PCBoxes * v3 = SaveData_PCBoxes(v0->unk_0C);
diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c
index f072e57dde..8c1ea9e29b 100644
--- a/src/unk_020482D4.c
+++ b/src/unk_020482D4.c
@@ -196,7 +196,7 @@ static BOOL sub_020484B0 (UnkStruct_0203E724 * param0)
 
 BOOL sub_020484C4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     sub_02006150(sub_0203E838(param0));
     return 0;
@@ -210,7 +210,7 @@ BOOL sub_020484D4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020484E4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
 
     if (sub_020061E4() == 0) {
         return 1;
diff --git a/src/unk_02048614.c b/src/unk_02048614.c
index 22a07f07cd..116f2f6dd0 100644
--- a/src/unk_02048614.c
+++ b/src/unk_02048614.c
@@ -57,7 +57,7 @@ BOOL sub_02048614 (UnkStruct_0203E724 * param0)
     SysTask ** v5;
     UnkStruct_02061AB4 ** v6;
     UnkStruct_0205E884 * v7;
-    UnkStruct_0203CDB0 * v8 = param0->unk_34;
+    FieldSystem * v8 = param0->unk_34;
     u16 v9 = inline_02049538(param0);
 
     if (v9 == 0) {
@@ -134,7 +134,7 @@ BOOL sub_02048778 (UnkStruct_0203E724 * param0)
 
 BOOL sub_020487CC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = sub_0203F098(v0, 8);
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -145,7 +145,7 @@ BOOL sub_020487CC (UnkStruct_0203E724 * param0)
 BOOL sub_020487FC (UnkStruct_0203E724 * param0)
 {
     u32 v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     u16 * v2 = sub_0203F098(v1, 8);
     BOOL * v3 = sub_0203F098(v1, 23);
     u16 v4 = inline_02049538(param0);
@@ -164,7 +164,7 @@ BOOL sub_020487FC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204887C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     BOOL * v1 = sub_0203F098(v0, 23);
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -304,7 +304,7 @@ BOOL sub_02048AE0 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02048B0C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     BOOL * v1 = sub_0203F098(v0, 23);
 
     sub_020515CC(param0->unk_28, 1, 0, 0, 11, v1);
@@ -315,7 +315,7 @@ BOOL sub_02048B0C (UnkStruct_0203E724 * param0)
 BOOL sub_02048B34 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061AB4 ** v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0203F098(v1, 10);
     sub_0203F2BC(sub_02062C00(*v0), sub_02062910(*v0));
@@ -328,7 +328,7 @@ BOOL sub_02048B60 (UnkStruct_0203E724 * param0)
     int v0;
     s32 v1;
     UnkStruct_02061AB4 ** v2;
-    UnkStruct_0203CDB0 * v3 = param0->unk_34;
+    FieldSystem * v3 = param0->unk_34;
 
     v2 = sub_0203F098(v3, 10);
     v1 = (s32)sub_0203E850(param0);
diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c
index e9744d7e48..1d7664282d 100644
--- a/src/unk_02048DD8.c
+++ b/src/unk_02048DD8.c
@@ -42,9 +42,9 @@
 #include "overlay006/ov6_02246A30.h"
 #include "overlay025/ov25_02253CE0.h"
 
-typedef void (* UnkFuncPtr_020EBB48)(UnkStruct_0203CDB0 *, u16);
-typedef void (* UnkFuncPtr_020EBB48_1)(UnkStruct_0203CDB0 *, StringFormatter *);
-typedef BOOL (* UnkFuncPtr_020EBB48_2)(UnkStruct_0203CDB0 *);
+typedef void (* UnkFuncPtr_020EBB48)(FieldSystem *, u16);
+typedef void (* UnkFuncPtr_020EBB48_1)(FieldSystem *, StringFormatter *);
+typedef BOOL (* UnkFuncPtr_020EBB48_2)(FieldSystem *);
 
 typedef struct {
     UnkFuncPtr_020EBB48 unk_00;
@@ -53,9 +53,9 @@ typedef struct {
     u32 unk_0C;
 } UnkStruct_020EBB48;
 
-static int sub_020491D0(int param0, UnkStruct_0203CDB0 * param1, StringFormatter * param2);
-static void sub_020491B8(UnkStruct_0203CDB0 * param0, int param1, u16 param2, u16 param3);
-static BOOL sub_020491F4(UnkStruct_0203CDB0 * param0, int param1);
+static int sub_020491D0(int param0, FieldSystem * param1, StringFormatter * param2);
+static void sub_020491B8(FieldSystem * param0, int param1, u16 param2, u16 param3);
+static BOOL sub_020491F4(FieldSystem * param0, int param1);
 BOOL sub_020493C8(UnkStruct_0203E724 * param0);
 BOOL sub_020493F4(UnkStruct_0203E724 * param0);
 
@@ -233,7 +233,7 @@ BOOL sub_0204912C (UnkStruct_0203E724 * param0)
     return 0;
 }
 
-static void sub_020491B8 (UnkStruct_0203CDB0 * param0, int param1, u16 param2, u16 param3)
+static void sub_020491B8 (FieldSystem * param0, int param1, u16 param2, u16 param3)
 {
     UnkFuncPtr_020EBB48 v0;
 
@@ -244,7 +244,7 @@ static void sub_020491B8 (UnkStruct_0203CDB0 * param0, int param1, u16 param2, u
     }
 }
 
-static int sub_020491D0 (int param0, UnkStruct_0203CDB0 * param1, StringFormatter * param2)
+static int sub_020491D0 (int param0, FieldSystem * param1, StringFormatter * param2)
 {
     UnkFuncPtr_020EBB48_1 v0;
 
@@ -257,7 +257,7 @@ static int sub_020491D0 (int param0, UnkStruct_0203CDB0 * param1, StringFormatte
     return Unk_020EBB48[param0 - 1].unk_0C;
 }
 
-static BOOL sub_020491F4 (UnkStruct_0203CDB0 * param0, int param1)
+static BOOL sub_020491F4 (FieldSystem * param0, int param1)
 {
     UnkFuncPtr_020EBB48_2 v0;
     TVBroadcast * v1 = SaveData_TVBroadcast(param0->unk_0C);
@@ -284,7 +284,7 @@ static void sub_0204922C (StringFormatter * param0, int param1, const u16 * para
     Strbuf_Free(v0);
 }
 
-static void sub_02049268 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
+static void sub_02049268 (FieldSystem * param0, StringFormatter * param1)
 {
     Party * v0 = Party_GetFromSavedata(param0->unk_0C);
     Pokemon * v1 = sub_02054A74(v0);
@@ -292,7 +292,7 @@ static void sub_02049268 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
     sub_0200B538(param1, 0, Pokemon_GetBoxPokemon(v1));
 }
 
-static void sub_02049288 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
+static void sub_02049288 (FieldSystem * param0, StringFormatter * param1)
 {
     int v0;
 
@@ -300,7 +300,7 @@ static void sub_02049288 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
     sub_0200B928(param1, 0, v0);
 }
 
-static void sub_020492A0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
+static void sub_020492A0 (FieldSystem * param0, StringFormatter * param1)
 {
     u16 v0[10 + 1];
     TVBroadcast * v1 = SaveData_TVBroadcast(param0->unk_0C);
@@ -310,7 +310,7 @@ static void sub_020492A0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
     sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1);
 }
 
-static void sub_020492D4 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
+static void sub_020492D4 (FieldSystem * param0, StringFormatter * param1)
 {
     u16 v0[10 + 1];
     TVBroadcast * v1 = SaveData_TVBroadcast(param0->unk_0C);
@@ -320,7 +320,7 @@ static void sub_020492D4 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
     sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1);
 }
 
-static void sub_02049308 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
+static void sub_02049308 (FieldSystem * param0, StringFormatter * param1)
 {
     Strbuf* v0;
     TVBroadcast * v1 = SaveData_TVBroadcast(param0->unk_0C);
@@ -333,49 +333,49 @@ static void sub_02049308 (UnkStruct_0203CDB0 * param0, StringFormatter * param1)
     Strbuf_Free(v0);
 }
 
-static BOOL sub_02049348 (UnkStruct_0203CDB0 * param0)
+static BOOL sub_02049348 (FieldSystem * param0)
 {
     UnkStruct_0202E7FC * v0 = sub_0202E7FC(SaveData_TVBroadcast(param0->unk_0C));
     return v0->unk_00;
 }
 
-static BOOL sub_02049358 (UnkStruct_0203CDB0 * param0)
+static BOOL sub_02049358 (FieldSystem * param0)
 {
     PoketchData * v0 = SaveData_PoketchData(param0->unk_0C);
     return sub_020567E0(v0);
 }
 
-static BOOL sub_02049368 (UnkStruct_0203CDB0 * param0)
+static BOOL sub_02049368 (FieldSystem * param0)
 {
     UnkStruct_0202E7D8 * v0 = sub_0202E7D8(SaveData_TVBroadcast(param0->unk_0C));
     return v0->unk_00;
 }
 
-static BOOL sub_02049378 (UnkStruct_0203CDB0 * param0)
+static BOOL sub_02049378 (FieldSystem * param0)
 {
     UnkStruct_0202A750 * v0 = sub_0202A750(param0->unk_0C);
     return sub_02029D10(v0, 0);
 }
 
-static BOOL sub_02049388 (UnkStruct_0203CDB0 * param0)
+static BOOL sub_02049388 (FieldSystem * param0)
 {
     UnkStruct_0202E7F0 * v0 = sub_0202E7F0(SaveData_TVBroadcast(param0->unk_0C));
     return v0->unk_00;
 }
 
-static BOOL sub_02049398 (UnkStruct_0203CDB0 * param0)
+static BOOL sub_02049398 (FieldSystem * param0)
 {
     UnkStruct_0202E7E4 * v0 = sub_0202E7E4(SaveData_TVBroadcast(param0->unk_0C));
     return v0->unk_00;
 }
 
-static BOOL sub_020493A8 (UnkStruct_0203CDB0 * param0)
+static BOOL sub_020493A8 (FieldSystem * param0)
 {
     UnkStruct_0202E810 * v0 = sub_0202E810(SaveData_TVBroadcast(param0->unk_0C));
     return v0->unk_00;
 }
 
-static BOOL sub_020493B8 (UnkStruct_0203CDB0 * param0)
+static BOOL sub_020493B8 (FieldSystem * param0)
 {
     UnkStruct_0202E81C * v0 = sub_0202E81C(SaveData_TVBroadcast(param0->unk_0C));
     return v0->unk_00;
diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c
index 0557d75eea..8549d58d36 100644
--- a/src/unk_020494DC.c
+++ b/src/unk_020494DC.c
@@ -389,7 +389,7 @@ static u16 sub_02049AE0 (UnkStruct_0204AFC4 * param0, u8 param1)
 
 BOOL sub_02049B24 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 v1 = (*((param0)->unk_08++));
     u8 v2 = (*((param0)->unk_08++));
     Window ** v3;
@@ -402,7 +402,7 @@ BOOL sub_02049B24 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02049B54 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Window ** v1 = sub_0203F098(v0, 38);
 
     ov5_021DD084(*v1);
@@ -411,7 +411,7 @@ BOOL sub_02049B54 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02049B6C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Window ** v1 = sub_0203F098(v0, 38);
 
     ov5_021DD1A4(param0->unk_34, *v1);
@@ -420,7 +420,7 @@ BOOL sub_02049B6C (UnkStruct_0203E724 * param0)
 
 BOOL sub_02049B8C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -430,7 +430,7 @@ BOOL sub_02049B8C (UnkStruct_0203E724 * param0)
 
 BOOL sub_02049BBC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     u16 v2 = inline_02049538(param0);
 
@@ -442,7 +442,7 @@ BOOL sub_02049BBC (UnkStruct_0203E724 * param0)
 
 BOOL sub_02049C00 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     u16 v2 = inline_02049538(param0);
 
@@ -455,7 +455,7 @@ BOOL sub_02049C00 (UnkStruct_0203E724 * param0)
 BOOL sub_02049C44 (UnkStruct_0203E724 * param0)
 {
     u16 v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     SaveData * v2 = v1->unk_0C;
     u16 v3 = inline_02049538(param0);
     u16 * v4 = inline_0204FCAC(param0);
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index abc3018179..96d6c51444 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -224,7 +224,7 @@ BOOL sub_02049FA0 (UnkStruct_0202D060 * param0)
     return sub_0202D214(param0);
 }
 
-void sub_02049FA8 (UnkStruct_0203CDB0 * param0)
+void sub_02049FA8 (FieldSystem * param0)
 {
     UnkStruct_02049FA8 * v0 = sub_0203A730(sub_0203A790(param0->unk_0C));
 
@@ -234,7 +234,7 @@ void sub_02049FA8 (UnkStruct_0203CDB0 * param0)
     return;
 }
 
-void sub_02049FE8 (UnkStruct_0203CDB0 * param0)
+void sub_02049FE8 (FieldSystem * param0)
 {
     sub_0206ADAC(SaveData_Events(param0->unk_0C));
 }
diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c
index 003096812d..76afceb5e6 100644
--- a/src/unk_0204AEE8.c
+++ b/src/unk_0204AEE8.c
@@ -153,7 +153,7 @@ u16 sub_0204AF9C (u8 param0)
     return 0x3;
 }
 
-u16 sub_0204AFC4 (UnkStruct_0203CDB0 * param0, const u16 * param1)
+u16 sub_0204AFC4 (FieldSystem * param0, const u16 * param1)
 {
     u16 v0 = 0;
     UnkStruct_0204AFC4 * v1 = param0->unk_AC;
@@ -175,7 +175,7 @@ u16 sub_0204AFC4 (UnkStruct_0203CDB0 * param0, const u16 * param1)
     return v0;
 }
 
-u16 sub_0204B020 (UnkStruct_0203CDB0 * param0, const u16 * param1)
+u16 sub_0204B020 (FieldSystem * param0, const u16 * param1)
 {
     int v0;
     UnkStruct_0204AFC4 * v1 = param0->unk_AC;
@@ -188,7 +188,7 @@ u16 sub_0204B020 (UnkStruct_0203CDB0 * param0, const u16 * param1)
     return 1;
 }
 
-u16 sub_0204B044 (UnkStruct_0203CDB0 * param0, const u16 * param1)
+u16 sub_0204B044 (FieldSystem * param0, const u16 * param1)
 {
     int v0;
     UnkStruct_0204AFC4 * v1 = param0->unk_AC;
diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c
index 046d4c9d31..5857284a1c 100644
--- a/src/unk_0204B830.c
+++ b/src/unk_0204B830.c
@@ -46,13 +46,13 @@
 #include "unk_02092494.h"
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     StringFormatter * unk_04;
     void * unk_08;
 } UnkStruct_0204B830;
 
-typedef BOOL (* UnkFuncPtr_020EBE94)(UnkStruct_0203CDB0 *, void *);
-typedef void (* UnkFuncPtr_020EBE94_1)(UnkStruct_0203CDB0 *, void *);
+typedef BOOL (* UnkFuncPtr_020EBE94)(FieldSystem *, void *);
+typedef void (* UnkFuncPtr_020EBE94_1)(FieldSystem *, void *);
 typedef void (* UnkFuncPtr_020EBE94_2)(UnkStruct_0204B830 *, u16 *, u16 *);
 typedef void (* UnkFuncPtr_020EBE94_3)(UnkStruct_0204B830 *, u16 *, u16 *);
 
@@ -65,24 +65,24 @@ typedef struct {
 
 static const UnkStruct_020EBE94 Unk_020EBE94[13];
 
-static void sub_0204B830 (UnkStruct_0204B830 * param0, UnkStruct_0203CDB0 * param1, StringFormatter * param2, void * param3)
+static void sub_0204B830 (UnkStruct_0204B830 * param0, FieldSystem * param1, StringFormatter * param2, void * param3)
 {
     param0->unk_00 = param1;
     param0->unk_04 = param2;
     param0->unk_08 = param3;
 }
 
-static int sub_0204B838 (UnkStruct_0203CDB0 * param0)
+static int sub_0204B838 (FieldSystem * param0)
 {
     return sub_0202DF40(sub_0202DF18());
 }
 
-static void * sub_0204B844 (UnkStruct_0203CDB0 * param0)
+static void * sub_0204B844 (FieldSystem * param0)
 {
     return sub_0202DF5C(sub_0202DF18());
 }
 
-static void sub_0204B850 (UnkStruct_0203CDB0 * param0)
+static void sub_0204B850 (FieldSystem * param0)
 {
     sub_0202DF78(sub_0202DF18());
 }
@@ -161,7 +161,7 @@ BOOL sub_0204B85C (UnkStruct_0203E724 * param0)
     return 0;
 }
 
-static BOOL sub_0204BA50 (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204BA50 (FieldSystem * param0, void * param1)
 {
     Party * v0 = Party_GetFromSavedata(param0->unk_0C);
 
@@ -172,7 +172,7 @@ static BOOL sub_0204BA50 (UnkStruct_0203CDB0 * param0, void * param1)
     }
 }
 
-static void sub_0204BA68 (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204BA68 (FieldSystem * param0, void * param1)
 {
     sub_02054930(32, param0->unk_0C, 490, 1, 2, 1);
 }
@@ -185,7 +185,7 @@ static void sub_0204BA88 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     sub_0200B498(param0->unk_04, 0, SaveData_GetTrainerInfo(param0->unk_00->unk_0C));
 }
 
-static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204BAAC (FieldSystem * param0, void * param1)
 {
     UnkUnion_0204C4D0 * v0 = sub_0204B844(param0);
     TrainerInfo * v1 = SaveData_GetTrainerInfo(param0->unk_0C);
@@ -348,7 +348,7 @@ static void sub_0204BE2C (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     *param2 = 4;
 }
 
-static void sub_0204BE3C (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204BE3C (FieldSystem * param0, void * param1)
 {
     sub_0204BAAC(param0, param1);
 }
@@ -367,7 +367,7 @@ static void sub_0204BE44 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     sub_0200B538(param0->unk_04, 1, Pokemon_GetBoxPokemon(v1));
 }
 
-static BOOL sub_0204BE84 (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204BE84 (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -375,7 +375,7 @@ static BOOL sub_0204BE84 (UnkStruct_0203CDB0 * param0, void * param1)
     return sub_0207D55C(v0, v1->val3.unk_00, 1, 32);
 }
 
-static void sub_0204BEAC (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204BEAC (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -409,12 +409,12 @@ static void sub_0204BF14 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     sub_0200B70C(param0->unk_04, 0, v2);
 }
 
-static BOOL sub_0204BF48 (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204BF48 (FieldSystem * param0, void * param1)
 {
     return 1;
 }
 
-static void sub_0204BF4C (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204BF4C (FieldSystem * param0, void * param1)
 {
     UnkUnion_0204C4D0 * v0 = sub_0204B844(param0);
     const BattleRegulation * v1 = (const BattleRegulation *)v0;
@@ -444,7 +444,7 @@ static void sub_0204BFB8 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     *param2 = 6;
 }
 
-static BOOL sub_0204BFC8 (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204BFC8 (FieldSystem * param0, void * param1)
 {
     int v0 = sub_020289A0(sub_020298B0(param0->unk_0C));
 
@@ -455,7 +455,7 @@ static BOOL sub_0204BFC8 (UnkStruct_0203CDB0 * param0, void * param1)
     return 0;
 }
 
-static void sub_0204BFE0 (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204BFE0 (FieldSystem * param0, void * param1)
 {
     UnkUnion_0204C4D0 * v0 = sub_0204B844(param0);
     int v1 = v0->val4.unk_00;
@@ -481,7 +481,7 @@ static void sub_0204C034 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     *param2 = 6;
 }
 
-static BOOL sub_0204C044 (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204C044 (FieldSystem * param0, void * param1)
 {
     UnkUnion_0204C4D0 * v0 = sub_0204B844(param0);
     int v1 = v0->val5.unk_00;
@@ -499,7 +499,7 @@ static BOOL sub_0204C044 (UnkStruct_0203CDB0 * param0, void * param1)
     return 0;
 }
 
-static void sub_0204C07C (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204C07C (FieldSystem * param0, void * param1)
 {
     UnkUnion_0204C4D0 * v0 = sub_0204B844(param0);
     int v1 = v0->val5.unk_00;
@@ -548,7 +548,7 @@ static void sub_0204C128 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     *param2 = 6;
 }
 
-static BOOL sub_0204C138 (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204C138 (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -556,7 +556,7 @@ static BOOL sub_0204C138 (UnkStruct_0203CDB0 * param0, void * param1)
     return sub_0207D55C(v0, 454, 1, 32);
 }
 
-static void sub_0204C15C (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204C15C (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -592,7 +592,7 @@ static void sub_0204C1CC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     sub_0200B70C(param0->unk_04, 0, v2);
 }
 
-static BOOL sub_0204C1FC (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204C1FC (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -600,7 +600,7 @@ static BOOL sub_0204C1FC (UnkStruct_0203CDB0 * param0, void * param1)
     return sub_0207D55C(v0, 452, 1, 32);
 }
 
-static void sub_0204C220 (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204C220 (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -640,7 +640,7 @@ static void sub_0204C2A0 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     sub_0200B70C(param0->unk_04, 0, v2);
 }
 
-static BOOL sub_0204C2D0 (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204C2D0 (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -648,7 +648,7 @@ static BOOL sub_0204C2D0 (UnkStruct_0203CDB0 * param0, void * param1)
     return sub_0207D55C(v0, 467, 1, 32);
 }
 
-static void sub_0204C2F4 (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204C2F4 (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -684,7 +684,7 @@ static void sub_0204C364 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     sub_0200B70C(param0->unk_04, 0, v2);
 }
 
-static BOOL sub_0204C394 (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204C394 (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -692,7 +692,7 @@ static BOOL sub_0204C394 (UnkStruct_0203CDB0 * param0, void * param1)
     return sub_0207D55C(v0, 455, 1, 32);
 }
 
-static void sub_0204C3B8 (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204C3B8 (FieldSystem * param0, void * param1)
 {
     UnkStruct_0207D3C0 * v0 = sub_0207D990(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -728,7 +728,7 @@ static void sub_0204C428 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param
     sub_0200B70C(param0->unk_04, 0, v2);
 }
 
-static BOOL sub_0204C458 (UnkStruct_0203CDB0 * param0, void * param1)
+static BOOL sub_0204C458 (FieldSystem * param0, void * param1)
 {
     PoketchData * v0 = SaveData_PoketchData(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
@@ -736,7 +736,7 @@ static BOOL sub_0204C458 (UnkStruct_0203CDB0 * param0, void * param1)
     return sub_020567E0(v0);
 }
 
-static void sub_0204C474 (UnkStruct_0203CDB0 * param0, void * param1)
+static void sub_0204C474 (FieldSystem * param0, void * param1)
 {
     PoketchData * v0 = SaveData_PoketchData(param0->unk_0C);
     UnkUnion_0204C4D0 * v1 = sub_0204B844(param0);
diff --git a/src/unk_0204C6C8.c b/src/unk_0204C6C8.c
index 847be35721..fbfc39cbf1 100644
--- a/src/unk_0204C6C8.c
+++ b/src/unk_0204C6C8.c
@@ -22,7 +22,7 @@
 
 BOOL sub_0204C6C8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     Window ** v3;
@@ -35,7 +35,7 @@ BOOL sub_0204C6C8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C718 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Window ** v1 = sub_0203F098(v0, 38);
 
     ov5_021DD084(*v1);
@@ -44,7 +44,7 @@ BOOL sub_0204C718 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C730 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Window ** v1 = sub_0203F098(v0, 38);
 
     ov5_021DD098(param0->unk_34, *v1);
@@ -53,7 +53,7 @@ BOOL sub_0204C730 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C750 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     u16 * v2 = sub_02025E50(v1);
     u16 * v3;
@@ -66,7 +66,7 @@ BOOL sub_0204C750 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C780 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     u16 * v2 = sub_02025E50(v1);
     u16 v3;
@@ -79,7 +79,7 @@ BOOL sub_0204C780 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C7AC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     u16 * v2 = sub_02025E50(v1);
     u16 v3;
@@ -92,7 +92,7 @@ BOOL sub_0204C7AC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C7D8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     u16 * v2 = sub_02025E50(v1);
     u16 * v3 = inline_0204FCAC(param0);
@@ -107,7 +107,7 @@ BOOL sub_0204C7D8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C808 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     TrainerInfo * v1 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
     SaveData * v2 = v0->unk_0C;
     u16 * v3 = sub_02025E50(v2);
@@ -128,7 +128,7 @@ BOOL sub_0204C808 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C854 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     TrainerInfo * v1 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
     SaveData * v2 = v0->unk_0C;
     u16 * v3 = sub_02025E50(v2);
@@ -150,7 +150,7 @@ BOOL sub_0204C854 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C8AC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     u16 * v2 = sub_02025E50(v1);
     u16 * v3 = inline_0204FCAC(param0);
diff --git a/src/unk_0204C8F0.c b/src/unk_0204C8F0.c
index c796f1d3d3..5bb81c7207 100644
--- a/src/unk_0204C8F0.c
+++ b/src/unk_0204C8F0.c
@@ -92,7 +92,7 @@ BOOL sub_0204C9AC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C9FC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     Window ** v3;
@@ -105,7 +105,7 @@ BOOL sub_0204C9FC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CA4C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Window ** v1 = sub_0203F098(v0, 39);
 
     ov5_021DCF58(*v1);
@@ -114,7 +114,7 @@ BOOL sub_0204CA4C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CA64 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Window ** v1 = sub_0203F098(v0, 39);
 
     ov5_021DCF6C(param0->unk_34, *v1);
diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c
index ecfe9c1c26..11709a20de 100644
--- a/src/unk_0204CA84.c
+++ b/src/unk_0204CA84.c
@@ -25,7 +25,7 @@
 
 BOOL sub_0204CA84 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     StringFormatter ** v2 = sub_0203F098(v0, 15);
 
@@ -37,7 +37,7 @@ BOOL sub_0204CA84 (UnkStruct_0203E724 * param0)
 BOOL sub_0204CAA4 (UnkStruct_0203E724 * param0)
 {
     u16 * v0;
-    UnkStruct_0203CDB0 * v1 = param0->unk_34;
+    FieldSystem * v1 = param0->unk_34;
     SaveData * v2 = v1->unk_0C;
     UnkStruct_02026310 * v3;
 
@@ -50,7 +50,7 @@ BOOL sub_0204CAA4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CAD4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_02026310 * v2;
 
@@ -62,7 +62,7 @@ BOOL sub_0204CAD4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CAEC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_02026310 * v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8));
     Party * v3 = Party_GetFromSavedata(v0->unk_0C);
@@ -74,7 +74,7 @@ BOOL sub_0204CAEC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CB20 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_02026310 * v1;
     Party * v2;
     StringFormatter ** v3 = sub_0203F098(v0, 15);
@@ -91,7 +91,7 @@ BOOL sub_0204CB20 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CB80 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     UnkStruct_02026310 * v1;
     StringFormatter ** v2 = sub_0203F098(v0, 15);
     SaveData * v3 = v0->unk_0C;
@@ -106,7 +106,7 @@ BOOL sub_0204CB80 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CBD4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_02026310 * v2;
     StringFormatter ** v3 = sub_0203F098(param0->unk_34, 15);
@@ -121,7 +121,7 @@ BOOL sub_0204CBD4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CC24 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Party * v1;
     StringFormatter ** v2 = sub_0203F098(param0->unk_34, 15);
     u16 v3 = sub_0203E838(param0);
@@ -136,7 +136,7 @@ BOOL sub_0204CC24 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CC78 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_02026310 * v2;
     Party * v3;
@@ -152,7 +152,7 @@ BOOL sub_0204CC78 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CCB8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     StringFormatter ** v2 = sub_0203F098(param0->unk_34, 15);
     u8 v3 = inline_02049538(param0);
@@ -166,7 +166,7 @@ BOOL sub_0204CCB8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CD44 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_02026310 * v2;
     u16 * v3 = inline_0204FCAC(param0);
@@ -179,7 +179,7 @@ BOOL sub_0204CD44 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CD74 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_02026310 * v2;
     u16 * v3 = inline_0204FCAC(param0);
@@ -192,7 +192,7 @@ BOOL sub_0204CD74 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CDA4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
 
     return 0;
@@ -200,19 +200,19 @@ BOOL sub_0204CDA4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204CDBC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     return 0;
 }
 
 BOOL sub_0204CDC0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     return 0;
 }
 
 BOOL sub_0204CDC4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 * v1 = inline_0204FCAC(param0);
 
     return 0;
diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c
index 2ca484989a..64a30165ff 100644
--- a/src/unk_0204CFFC.c
+++ b/src/unk_0204CFFC.c
@@ -35,7 +35,7 @@ BOOL sub_0204CFFC (UnkStruct_0203E724 * param0)
     int v0 = MapHeader_GetMapLabelTextID(param0->unk_34->unk_1C->unk_00);
     int v1 = 24;
     Party * v2;
-    UnkStruct_0203CDB0 * v3 = param0->unk_34;
+    FieldSystem * v3 = param0->unk_34;
     u16 v4 = inline_02049538(param0);
     u16 v5 = inline_02049538(param0);
     u16 v6 = inline_02049538(param0);
@@ -49,7 +49,7 @@ BOOL sub_0204CFFC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D08C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -67,7 +67,7 @@ BOOL sub_0204D08C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D0E8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     TrainerInfo * v2 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
     u16 * v3 = inline_0204FCAC(param0);
@@ -94,7 +94,7 @@ BOOL sub_0204D154 (UnkStruct_0203E724 * param0)
     BOOL v2;
     Party * v3;
     Pokemon * v4;
-    UnkStruct_0203CDB0 * v5 = param0->unk_34;
+    FieldSystem * v5 = param0->unk_34;
     TrainerInfo * v6 = SaveData_GetTrainerInfo(v5->unk_0C);
     u16 v7 = inline_02049538(param0);
     u16 v8 = inline_02049538(param0);
@@ -130,7 +130,7 @@ BOOL sub_0204D1DC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D234 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -153,7 +153,7 @@ BOOL sub_0204D234 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D2D8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -194,7 +194,7 @@ BOOL sub_0204D398 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D3DC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -220,7 +220,7 @@ BOOL sub_0204D3DC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D470 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -237,7 +237,7 @@ BOOL sub_0204D470 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D4CC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -264,7 +264,7 @@ BOOL sub_0204D4CC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D540 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -289,7 +289,7 @@ BOOL sub_0204D540 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D5CC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -302,7 +302,7 @@ BOOL sub_0204D5CC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D614 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -338,7 +338,7 @@ BOOL sub_0204D614 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D6E4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -380,7 +380,7 @@ BOOL sub_0204D7AC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204D7D4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -397,7 +397,7 @@ BOOL sub_0204D840 (UnkStruct_0203E724 * param0)
 {
     int v0;
     Pokemon * v1;
-    UnkStruct_0203CDB0 * v2 = param0->unk_34;
+    FieldSystem * v2 = param0->unk_34;
     u16 * v3 = inline_0204FCAC(param0);
 
     v0 = Party_GetCurrentCount(Party_GetFromSavedata(v2->unk_0C));
@@ -410,7 +410,7 @@ BOOL sub_0204D86C (UnkStruct_0203E724 * param0)
 {
     int v0, v1, v2;
     Pokemon * v3;
-    UnkStruct_0203CDB0 * v4 = param0->unk_34;
+    FieldSystem * v4 = param0->unk_34;
     u16 * v5 = inline_0204FCAC(param0);
 
     v0 = Party_GetCurrentCount(Party_GetFromSavedata(v4->unk_0C));
@@ -432,7 +432,7 @@ BOOL sub_0204D8C4 (UnkStruct_0203E724 * param0)
 {
     int v0, v1, v2;
     Pokemon * v3;
-    UnkStruct_0203CDB0 * v4 = param0->unk_34;
+    FieldSystem * v4 = param0->unk_34;
     u16 * v5 = inline_0204FCAC(param0);
     u16 v6 = inline_02049538(param0);
 
@@ -461,7 +461,7 @@ BOOL sub_0204D94C (UnkStruct_0203E724 * param0)
 {
     int v0, v1, v2;
     Pokemon * v3;
-    UnkStruct_0203CDB0 * v4 = param0->unk_34;
+    FieldSystem * v4 = param0->unk_34;
     u16 * v5 = inline_0204FCAC(param0);
     PCBoxes * v6 = SaveData_PCBoxes(v4->unk_0C);
 
@@ -487,7 +487,7 @@ BOOL sub_0204D9C8 (UnkStruct_0203E724 * param0)
 {
     int v0, v1, v2;
     Pokemon * v3;
-    UnkStruct_0203CDB0 * v4 = param0->unk_34;
+    FieldSystem * v4 = param0->unk_34;
     u16 * v5 = inline_0204FCAC(param0);
 
     v0 = Party_GetCurrentCount(Party_GetFromSavedata(v4->unk_0C));
@@ -511,7 +511,7 @@ BOOL sub_0204DA20 (UnkStruct_0203E724 * param0)
     u16 * v2;
     u32 v3;
     Pokemon * v4;
-    UnkStruct_0203CDB0 * v5 = param0->unk_34;
+    FieldSystem * v5 = param0->unk_34;
 
     v2 = inline_0204FCAC(param0);
     v1 = Party_GetCurrentCount(Party_GetFromSavedata(v5->unk_0C));
@@ -545,7 +545,7 @@ BOOL sub_0204DA84 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204DACC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -582,7 +582,7 @@ BOOL sub_0204DACC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204DB74 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u32 v2;
     u8 v3;
@@ -597,7 +597,7 @@ BOOL sub_0204DB74 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204DBB8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -611,7 +611,7 @@ BOOL sub_0204DBB8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204DC18 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3 = inline_02049538(param0);
@@ -624,7 +624,7 @@ BOOL sub_0204DC18 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204DC60 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     u16 v2 = inline_02049538(param0);
     u16 v3;
@@ -639,7 +639,7 @@ BOOL sub_0204DC60 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204DC98 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     Party * v2;
     u16 * v3 = inline_0204FCAC(param0);
@@ -669,7 +669,7 @@ BOOL sub_0204DC98 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204DD28 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     Party * v2;
     u16 * v3 = inline_0204FCAC(param0);
@@ -714,7 +714,7 @@ BOOL sub_0204DD28 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204DE00 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
     Party * v2;
     u16 * v3 = inline_0204FCAC(param0);
@@ -858,7 +858,7 @@ BOOL sub_0204E12C (UnkStruct_0203E724 * param0)
     u16 v2;
     Pokemon * v3;
     Party * v4;
-    UnkStruct_0203CDB0 * v5 = param0->unk_34;
+    FieldSystem * v5 = param0->unk_34;
     u16 * v6 = inline_0204FCAC(param0);
     u16 v7 = inline_02049538(param0);
 
@@ -889,7 +889,7 @@ BOOL sub_0204E1D0 (UnkStruct_0203E724 * param0)
     int v0, v1;
     Party * v2;
     Pokemon * v3;
-    UnkStruct_0203CDB0 * v4 = param0->unk_34;
+    FieldSystem * v4 = param0->unk_34;
     u16 v5 = inline_02049538(param0);
     u16 * v6 = inline_0204FCAC(param0);
 
diff --git a/src/unk_0204E240.c b/src/unk_0204E240.c
index 299c717f03..0ee49e1bc9 100644
--- a/src/unk_0204E240.c
+++ b/src/unk_0204E240.c
@@ -23,7 +23,7 @@ const u16 Unk_020EBFFC[7][2] = {
 
 BOOL sub_0204E240 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 v1;
     u16 v2, v3;
     u16 * v4 = inline_0204FCAC(param0);
@@ -57,7 +57,7 @@ BOOL sub_0204E28C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204E2E0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u8 v1;
     u16 v2, v3;
     u16 * v4 = inline_0204FCAC(param0);
diff --git a/src/unk_0204E75C.c b/src/unk_0204E75C.c
index 15d03efadf..9402b77650 100644
--- a/src/unk_0204E75C.c
+++ b/src/unk_0204E75C.c
@@ -15,7 +15,7 @@
 
 BOOL sub_0204E75C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -26,7 +26,7 @@ BOOL sub_0204E75C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204E7B4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -37,7 +37,7 @@ BOOL sub_0204E7B4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204E80C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -48,7 +48,7 @@ BOOL sub_0204E80C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204E864 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -59,7 +59,7 @@ BOOL sub_0204E864 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204E8BC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -69,7 +69,7 @@ BOOL sub_0204E8BC (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204E900 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -79,7 +79,7 @@ BOOL sub_0204E900 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204E934 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 * v2 = inline_0204FCAC(param0);
 
diff --git a/src/unk_0204E974.c b/src/unk_0204E974.c
index 2133775926..e092c72ca4 100644
--- a/src/unk_0204E974.c
+++ b/src/unk_0204E974.c
@@ -15,7 +15,7 @@
 
 BOOL sub_0204E974 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_020298B0 * v2;
     u16 v3 = inline_02049538(param0);
@@ -30,7 +30,7 @@ BOOL sub_0204E974 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204E9C8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -40,7 +40,7 @@ BOOL sub_0204E9C8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EA04 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_020298B0 * v2;
     u16 v3 = inline_02049538(param0);
@@ -55,7 +55,7 @@ BOOL sub_0204EA04 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EA58 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -65,7 +65,7 @@ BOOL sub_0204EA58 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EA94 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_020298B0 * v2;
     u16 v3 = inline_02049538(param0);
@@ -80,7 +80,7 @@ BOOL sub_0204EA94 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EAE8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -90,7 +90,7 @@ BOOL sub_0204EAE8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EB24 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -100,7 +100,7 @@ BOOL sub_0204EB24 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EB60 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -110,7 +110,7 @@ BOOL sub_0204EB60 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EB9C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_020298B0 * v2;
     u16 v3 = inline_02049538(param0);
@@ -124,7 +124,7 @@ BOOL sub_0204EB9C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EBE4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -134,7 +134,7 @@ BOOL sub_0204EBE4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EC20 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -144,7 +144,7 @@ BOOL sub_0204EC20 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EC5C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -154,7 +154,7 @@ BOOL sub_0204EC5C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204EC98 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
     UnkStruct_020298B0 * v2;
     u16 v3 = inline_02049538(param0);
@@ -168,7 +168,7 @@ BOOL sub_0204EC98 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204ECF0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -178,7 +178,7 @@ BOOL sub_0204ECF0 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204ED2C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
@@ -188,7 +188,7 @@ BOOL sub_0204ED2C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204ED68 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_34;
+    FieldSystem * v0 = param0->unk_34;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c
index c7613cdcb4..d216049c26 100644
--- a/src/unk_0204F13C.c
+++ b/src/unk_0204F13C.c
@@ -77,10 +77,10 @@ static BOOL sub_0204F414(UnkStruct_020508D4 * param0);
 
 void sub_0204F470(UnkStruct_020508D4 * param0, void ** param1, u8 param2);
 static BOOL sub_0204F4A4(UnkStruct_020508D4 * param0);
-static int sub_0204F50C(UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param1, int param2);
-static int sub_0204F5D8(UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param1);
-static int sub_0204F628(UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param1, int param2);
-static int sub_0204F6B0(UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param1);
+static int sub_0204F50C(UnkStruct_0204F470 * param0, FieldSystem * param1, int param2);
+static int sub_0204F5D8(UnkStruct_0204F470 * param0, FieldSystem * param1);
+static int sub_0204F628(UnkStruct_0204F470 * param0, FieldSystem * param1, int param2);
+static int sub_0204F6B0(UnkStruct_0204F470 * param0, FieldSystem * param1);
 
 BOOL sub_0204F13C (UnkStruct_0203E724 * param0)
 {
@@ -295,7 +295,7 @@ static BOOL sub_0204F414 (UnkStruct_020508D4 * param0)
 
 void sub_0204F470 (UnkStruct_020508D4 * param0, void ** param1, u8 param2)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0204F470 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0204F470));
     MI_CpuClear8(v1, sizeof(UnkStruct_0204F470));
 
@@ -308,7 +308,7 @@ void sub_0204F470 (UnkStruct_020508D4 * param0, void ** param1, u8 param2)
 
 static BOOL sub_0204F4A4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0204F470 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -336,7 +336,7 @@ static BOOL sub_0204F4A4 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int sub_0204F50C (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param1, int param2)
+static int sub_0204F50C (UnkStruct_0204F470 * param0, FieldSystem * param1, int param2)
 {
     u8 v0;
 
@@ -376,7 +376,7 @@ static int sub_0204F50C (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param
     return UnkEnum_0204F13C_2;
 }
 
-static int sub_0204F5D8 (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param1)
+static int sub_0204F5D8 (UnkStruct_0204F470 * param0, FieldSystem * param1)
 {
     int v0;
     PartyManagementData * v1;
@@ -407,7 +407,7 @@ static int sub_0204F5D8 (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param
     return UnkEnum_0204F13C_3;
 }
 
-static int sub_0204F628 (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param1, int param2)
+static int sub_0204F628 (UnkStruct_0204F470 * param0, FieldSystem * param1, int param2)
 {
     PokemonSummary * v0;
     SaveData * v1;
@@ -449,7 +449,7 @@ static int sub_0204F628 (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param
     return UnkEnum_0204F13C_4;
 }
 
-static int sub_0204F6B0 (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param1)
+static int sub_0204F6B0 (UnkStruct_0204F470 * param0, FieldSystem * param1)
 {
     PokemonSummary * v0;
 
@@ -532,7 +532,7 @@ BOOL sub_0204F6D8 (UnkStruct_0203E724 * param0)
     UnkStruct_0203068C * v3;
     u32 v4, v5, v6;
     u16 v7, v8;
-    UnkStruct_0203CDB0 * v9 = param0->unk_34;
+    FieldSystem * v9 = param0->unk_34;
     StringFormatter ** v10 = sub_0203F098(v9, 15);
     u8 v11 = (*((param0)->unk_08++));
     u8 v12 = (*((param0)->unk_08++));
@@ -625,7 +625,7 @@ BOOL sub_0204F8A8 (UnkStruct_0203E724 * param0)
     int v0;
     BattleFrontierStage * v1;
     u32 v2, v3, v4;
-    UnkStruct_0203CDB0 * v5 = param0->unk_34;
+    FieldSystem * v5 = param0->unk_34;
     u16 * v6 = inline_0204FCAC(param0);
 
     v4 = 0;
@@ -676,7 +676,7 @@ BOOL sub_0204F950 (UnkStruct_0203E724 * param0)
     BattleFrontierStage * v2;
     UnkStruct_0203068C * v3;
     u32 v4, v5;
-    UnkStruct_0203CDB0 * v6 = param0->unk_34;
+    FieldSystem * v6 = param0->unk_34;
     u16 * v7 = inline_0204FCAC(param0);
 
     v4 = 0;
diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c
index c6dad4a3d8..1dc363a0df 100644
--- a/src/unk_0204FAB4.c
+++ b/src/unk_0204FAB4.c
@@ -54,10 +54,10 @@ BOOL sub_0204FBB4(UnkStruct_0203E724 * param0);
 static void sub_0204FBEC(SaveData * param0, UnkStruct_0203041C * param1, u8 param2);
 static void sub_0204FDB4(UnkStruct_020508D4 * param0, void ** param1, u8 param2);
 static BOOL sub_0204FDE8(UnkStruct_020508D4 * param0);
-static int sub_0204FE50(UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1, int param2);
-static int sub_0204FF1C(UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1);
-static int sub_0204FF6C(UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1, int param2);
-static int sub_0204FFF4(UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1);
+static int sub_0204FE50(UnkStruct_0204FE50 * param0, FieldSystem * param1, int param2);
+static int sub_0204FF1C(UnkStruct_0204FE50 * param0, FieldSystem * param1);
+static int sub_0204FF6C(UnkStruct_0204FE50 * param0, FieldSystem * param1, int param2);
+static int sub_0204FFF4(UnkStruct_0204FE50 * param0, FieldSystem * param1);
 BOOL sub_0204FCAC(UnkStruct_0203E724 * param0);
 static void sub_0204FCF8(UnkStruct_020508D4 * param0, u16 param1, u16 param2, u16 * param3);
 static BOOL sub_0204FD38(UnkStruct_020508D4 * param0);
@@ -216,7 +216,7 @@ static BOOL sub_0204FD38 (UnkStruct_020508D4 * param0)
 
 static void sub_0204FDB4 (UnkStruct_020508D4 * param0, void ** param1, u8 param2)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0204FE50 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0204FE50));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0204FE50));
@@ -230,7 +230,7 @@ static void sub_0204FDB4 (UnkStruct_020508D4 * param0, void ** param1, u8 param2
 
 static BOOL sub_0204FDE8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0204FE50 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -254,7 +254,7 @@ static BOOL sub_0204FDE8 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int sub_0204FE50 (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1, int param2)
+static int sub_0204FE50 (UnkStruct_0204FE50 * param0, FieldSystem * param1, int param2)
 {
     u8 v0;
     PartyManagementData * v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
@@ -291,7 +291,7 @@ static int sub_0204FE50 (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param
     return 1;
 }
 
-static int sub_0204FF1C (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1)
+static int sub_0204FF1C (UnkStruct_0204FE50 * param0, FieldSystem * param1)
 {
     int v0;
     PartyManagementData * v1;
@@ -319,7 +319,7 @@ static int sub_0204FF1C (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param
     return 2;
 }
 
-static int sub_0204FF6C (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1, int param2)
+static int sub_0204FF6C (UnkStruct_0204FE50 * param0, FieldSystem * param1, int param2)
 {
     PokemonSummary * v0;
     SaveData * v1;
@@ -351,7 +351,7 @@ static int sub_0204FF6C (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param
     return 3;
 }
 
-static int sub_0204FFF4 (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1)
+static int sub_0204FFF4 (UnkStruct_0204FE50 * param0, FieldSystem * param1)
 {
     PokemonSummary * v0;
 
diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c
index c5ea1b4339..d91853cfed 100644
--- a/src/unk_0205003C.c
+++ b/src/unk_0205003C.c
@@ -54,10 +54,10 @@ BOOL sub_0205013C(UnkStruct_0203E724 * param0);
 static void sub_02050174(SaveData * param0, UnkStruct_020305B8 * param1, u8 param2);
 void sub_020502E0(UnkStruct_020508D4 * param0, void ** param1, u8 param2);
 static BOOL sub_02050314(UnkStruct_020508D4 * param0);
-static int sub_0205037C(UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1, int param2);
-static int sub_02050448(UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1);
-static int sub_02050498(UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1, int param2);
-static int sub_02050520(UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1);
+static int sub_0205037C(UnkStruct_0205037C * param0, FieldSystem * param1, int param2);
+static int sub_02050448(UnkStruct_0205037C * param0, FieldSystem * param1);
+static int sub_02050498(UnkStruct_0205037C * param0, FieldSystem * param1, int param2);
+static int sub_02050520(UnkStruct_0205037C * param0, FieldSystem * param1);
 BOOL sub_020501D8(UnkStruct_0203E724 * param0);
 void sub_02050224(UnkStruct_020508D4 * param0, u16 param1, u16 param2, u16 * param3);
 static BOOL sub_02050264(UnkStruct_020508D4 * param0);
@@ -208,7 +208,7 @@ static BOOL sub_02050264 (UnkStruct_020508D4 * param0)
 
 void sub_020502E0 (UnkStruct_020508D4 * param0, void ** param1, u8 param2)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0205037C * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0205037C));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0205037C));
@@ -222,7 +222,7 @@ void sub_020502E0 (UnkStruct_020508D4 * param0, void ** param1, u8 param2)
 
 static BOOL sub_02050314 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0205037C * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -246,7 +246,7 @@ static BOOL sub_02050314 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int sub_0205037C (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1, int param2)
+static int sub_0205037C (UnkStruct_0205037C * param0, FieldSystem * param1, int param2)
 {
     u8 v0;
     PartyManagementData * v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
@@ -281,7 +281,7 @@ static int sub_0205037C (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param
     return 1;
 }
 
-static int sub_02050448 (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1)
+static int sub_02050448 (UnkStruct_0205037C * param0, FieldSystem * param1)
 {
     int v0;
     PartyManagementData * v1;
@@ -309,7 +309,7 @@ static int sub_02050448 (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param
     return 2;
 }
 
-static int sub_02050498 (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1, int param2)
+static int sub_02050498 (UnkStruct_0205037C * param0, FieldSystem * param1, int param2)
 {
     PokemonSummary * v0;
     SaveData * v1;
@@ -341,7 +341,7 @@ static int sub_02050498 (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param
     return 3;
 }
 
-static int sub_02050520 (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1)
+static int sub_02050520 (UnkStruct_0205037C * param0, FieldSystem * param1)
 {
     PokemonSummary * v0;
 
diff --git a/src/unk_02050568.c b/src/unk_02050568.c
index 89a590dede..47693cc3db 100644
--- a/src/unk_02050568.c
+++ b/src/unk_02050568.c
@@ -29,7 +29,7 @@
 #include "unk_02070428.h"
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     u16 unk_04;
     u16 unk_06;
     u8 unk_08;
@@ -38,9 +38,9 @@ typedef struct {
 
 static BOOL sub_020505A0(UnkStruct_020508D4 * param0);
 static void sub_0205074C(UnkStruct_0205E884 * param0, BOOL param1);
-static void sub_0205075C(UnkStruct_0203CDB0 * param0);
+static void sub_0205075C(FieldSystem * param0);
 
-void sub_02050568 (UnkStruct_0203CDB0 * param0)
+void sub_02050568 (FieldSystem * param0)
 {
     UnkStruct_02050568 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02050568));
 
@@ -50,7 +50,7 @@ void sub_02050568 (UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_020505A0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02050568 * v1 = sub_02050A64(param0);
     UnkStruct_020507E4 * v2 = SaveData_Events(v0->unk_0C);
 
@@ -137,7 +137,7 @@ static void sub_0205074C (UnkStruct_0205E884 * param0, BOOL param1)
     sub_02062D64(v0, param1);
 }
 
-static void sub_0205075C (UnkStruct_0203CDB0 * param0)
+static void sub_0205075C (FieldSystem * param0)
 {
     VecFx32 v0;
     UnkStruct_ov115_0226527C v1;
diff --git a/src/unk_020508D4.c b/src/unk_020508D4.c
index 76b4ad9cd3..27e45784dc 100644
--- a/src/unk_020508D4.c
+++ b/src/unk_020508D4.c
@@ -17,7 +17,7 @@ typedef struct UnkStruct_020508D4_t {
     void * unk_0C;
     int unk_10;
     void * unk_14;
-    UnkStruct_0203CDB0 * unk_18;
+    FieldSystem * unk_18;
     UnkStruct_ov5_021D219C * unk_1C;
 } UnkStruct_020508D4;
 
@@ -27,7 +27,7 @@ typedef struct {
     void * unk_08;
 } UnkStruct_020509F0;
 
-static UnkStruct_020508D4 * sub_020508D4 (UnkStruct_0203CDB0 * param0, UnkFuncPtr_02050904 param1, void * param2)
+static UnkStruct_020508D4 * sub_020508D4 (FieldSystem * param0, UnkFuncPtr_02050904 param1, void * param2)
 {
     UnkStruct_020508D4 * v0;
 
@@ -44,7 +44,7 @@ static UnkStruct_020508D4 * sub_020508D4 (UnkStruct_0203CDB0 * param0, UnkFuncPt
     return v0;
 }
 
-UnkStruct_020508D4 * sub_02050904 (UnkStruct_0203CDB0 * param0, UnkFuncPtr_02050904 param1, void * param2)
+UnkStruct_020508D4 * sub_02050904 (FieldSystem * param0, UnkFuncPtr_02050904 param1, void * param2)
 {
     UnkStruct_020508D4 * v0;
 
@@ -81,7 +81,7 @@ UnkStruct_020508D4 * sub_02050944 (UnkStruct_020508D4 * param0, UnkFuncPtr_02050
     return v0;
 }
 
-BOOL sub_02050958 (UnkStruct_0203CDB0 * param0)
+BOOL sub_02050958 (FieldSystem * param0)
 {
     if (param0->unk_10 == NULL) {
         return 0;
@@ -109,12 +109,12 @@ BOOL sub_02050958 (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-BOOL sub_020509A4 (UnkStruct_0203CDB0 * param0)
+BOOL sub_020509A4 (FieldSystem * param0)
 {
     return param0->unk_10 != NULL;
 }
 
-BOOL sub_020509B4 (UnkStruct_0203CDB0 * param0)
+BOOL sub_020509B4 (FieldSystem * param0)
 {
     if (sub_0203CD4C(param0) || sub_0203CD74(param0)) {
         return 1;
@@ -123,12 +123,12 @@ BOOL sub_020509B4 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void sub_020509D4 (UnkStruct_0203CDB0 * param0)
+void sub_020509D4 (FieldSystem * param0)
 {
     sub_0203CD00(param0);
 }
 
-BOOL sub_020509DC (UnkStruct_0203CDB0 * param0)
+BOOL sub_020509DC (FieldSystem * param0)
 {
     if (sub_0203CD5C(param0)) {
         return 1;
@@ -139,7 +139,7 @@ BOOL sub_020509DC (UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_020509F0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020509F0 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -170,7 +170,7 @@ void sub_02050A38 (UnkStruct_020508D4 * param0, const UnkStruct_0208BE5C * param
     sub_02050944(param0, sub_020509F0, v0);
 }
 
-UnkStruct_0203CDB0 * sub_02050A60 (UnkStruct_020508D4 * param0)
+FieldSystem * sub_02050A60 (UnkStruct_020508D4 * param0)
 {
     return param0->unk_18;
 }
diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c
index cdcaee8568..5ed3d4140a 100644
--- a/src/unk_02050A74.c
+++ b/src/unk_02050A74.c
@@ -71,14 +71,14 @@ typedef struct {
     BattleParams * unk_10;
 } UnkStruct_02050DD4;
 
-static void sub_020518B0(UnkStruct_0203CDB0 * param0, BattleParams * param1);
-static void sub_02051988(UnkStruct_0203CDB0 * param0, BattleParams * param1);
+static void sub_020518B0(FieldSystem * param0, BattleParams * param1);
+static void sub_02051988(FieldSystem * param0, BattleParams * param1);
 static BOOL sub_02050EE0(UnkStruct_020508D4 * param0);
 static BOOL sub_02051074(UnkStruct_020508D4 * param0);
 
 static BOOL sub_02050A74 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     BattleParams * v1 = sub_02050A64(param0);
     int * v2 = sub_02050A68(param0);
 
@@ -139,7 +139,7 @@ static BOOL sub_02050B04 (UnkStruct_02050ACC * param0)
     return v0;
 }
 
-static void sub_02050B1C (const BattleParams * param0, UnkStruct_0203CDB0 * param1)
+static void sub_02050B1C (const BattleParams * param0, FieldSystem * param1)
 {
     if (param0->battleType & BATTLE_TYPE_DEBUG) {
         return;
@@ -150,7 +150,7 @@ static void sub_02050B1C (const BattleParams * param0, UnkStruct_0203CDB0 * para
 
 static BOOL sub_02050B30 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_02050ACC * v1;
     int * v2;
 
@@ -218,7 +218,7 @@ static void sub_02050C4C (UnkStruct_020508D4 * param0, BattleParams * param1, in
     sub_02050944(param0, sub_02050B30, v0);
 }
 
-static void sub_02050C6C (int param0, UnkStruct_0203CDB0 * param1)
+static void sub_02050C6C (int param0, FieldSystem * param1)
 {
     switch (param0 & 0xf) {
     case 0x1:
@@ -234,7 +234,7 @@ static void sub_02050C6C (int param0, UnkStruct_0203CDB0 * param1)
 
 static BOOL sub_02050CA8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_02050ACC * v1;
     int * v2;
 
@@ -279,7 +279,7 @@ static BOOL sub_02050CA8 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02050D4C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_02050ACC * v1;
     int * v2;
 
@@ -340,7 +340,7 @@ static void sub_02050DFC (UnkStruct_02050DD4 * param0)
     Heap_FreeToHeap(param0);
 }
 
-void sub_02050E10 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
+void sub_02050E10 (FieldSystem * param0, BattleParams * param1)
 {
     if (sub_0206AE5C(SaveData_Events(param0->unk_0C))) {
         UnkStruct_02050ACC * v0;
@@ -355,7 +355,7 @@ void sub_02050E10 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
     }
 }
 
-void sub_02050E78 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1, BattleParams * param2)
+void sub_02050E78 (FieldSystem * param0, UnkStruct_020508D4 * param1, BattleParams * param2)
 {
     if (sub_0206AE5C(SaveData_Events(param0->unk_0C))) {
         UnkStruct_02050ACC * v0;
@@ -372,7 +372,7 @@ void sub_02050E78 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1, Bat
 
 static BOOL sub_02050EE0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_02050DD4 * v1;
 
     v0 = sub_02050A60(param0);
@@ -451,7 +451,7 @@ static BOOL sub_02050EE0 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02051074 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_02050ACC * v1;
     int * v2;
     u16 * v3;
@@ -538,7 +538,7 @@ void sub_0205120C (UnkStruct_020508D4 * param0, int * param1)
 {
     UnkStruct_02050ACC * v0;
     BattleParams * v1;
-    UnkStruct_0203CDB0 * v2;
+    FieldSystem * v2;
 
     v2 = sub_02050A60(param0);
     RadarChain_Clear(v2->chain);
@@ -559,7 +559,7 @@ void sub_02051270 (UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * par
 {
     UnkStruct_02050ACC * v0;
     BattleParams * v1;
-    UnkStruct_0203CDB0 * v2;
+    FieldSystem * v2;
 
     v2 = sub_02050A60(param0);
     RadarChain_Clear(v2->chain);
@@ -581,7 +581,7 @@ void sub_020512E4 (UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * par
 {
     UnkStruct_02050ACC * v0;
     BattleParams * v1;
-    UnkStruct_0203CDB0 * v2;
+    FieldSystem * v2;
     Pokemon * v3;
     int v4;
 
@@ -608,7 +608,7 @@ void sub_020512E4 (UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * par
 
 static BOOL sub_0205136C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_02050ACC * v1;
     int * v2;
 
@@ -661,7 +661,7 @@ static BOOL sub_0205136C (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_02051450 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
+void sub_02051450 (FieldSystem * param0, BattleParams * param1)
 {
     UnkStruct_02050ACC * v0;
 
@@ -673,7 +673,7 @@ void sub_02051480 (UnkStruct_020508D4 * param0, int param1, int param2, int * pa
 {
     UnkStruct_02050ACC * v0;
     BattleParams * v1;
-    UnkStruct_0203CDB0 * v2;
+    FieldSystem * v2;
 
     v2 = sub_02050A60(param0);
     v1 = sub_02051D8C(11, 0x1);
@@ -693,7 +693,7 @@ void sub_02051480 (UnkStruct_020508D4 * param0, int param1, int param2, int * pa
 static BOOL sub_020514E8 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02050ACC * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     int * v2 = sub_02050A68(param0);
 
     switch (*v2) {
@@ -735,7 +735,7 @@ void sub_02051590 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02050ACC * v0;
     BattleParams * v1;
-    UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
+    FieldSystem * v2 = sub_02050A60(param0);
 
     v1 = sub_02051F4C(11, v2);
     v0 = sub_02050ACC(v1, EncEffects_CutInEffect(v1), EncEffects_BGM(v1), NULL);
@@ -748,7 +748,7 @@ void sub_020515CC (UnkStruct_020508D4 * param0, int param1, int param2, int para
     u32 v0;
     UnkStruct_02050ACC * v1;
     BattleParams * v2;
-    UnkStruct_0203CDB0 * v3;
+    FieldSystem * v3;
 
     v3 = sub_02050A60(param0);
 
@@ -783,7 +783,7 @@ void sub_020515CC (UnkStruct_020508D4 * param0, int param1, int param2, int para
 
 void sub_0205167C (UnkStruct_020508D4 * param0, const u8 * param1, int param2)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02050ACC * v1;
     BattleParams * v2;
 
@@ -817,7 +817,7 @@ static int sub_020516C8 (const BattleRegulation * param0, int param1)
 
 void sub_020516F4 (UnkStruct_020508D4 * param0, int param1, int param2, int param3)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02050ACC * v1;
     BattleParams * v2;
     int v3;
@@ -856,7 +856,7 @@ void sub_020516F4 (UnkStruct_020508D4 * param0, int param1, int param2, int para
 
 static BOOL sub_02051790 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02050ACC * v1 = sub_02050A64(param0);
     int * v2 = sub_02050A68(param0);
 
@@ -877,7 +877,7 @@ static BOOL sub_02051790 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_020517E8 (UnkStruct_0203CDB0 * param0, const u8 * param1, int param2)
+void sub_020517E8 (FieldSystem * param0, const u8 * param1, int param2)
 {
     UnkStruct_02050ACC * v0;
     BattleParams * v1;
@@ -894,7 +894,7 @@ void sub_020517E8 (UnkStruct_0203CDB0 * param0, const u8 * param1, int param2)
     sub_02050904(param0, sub_02051790, v0);
 }
 
-void sub_0205184C (UnkStruct_0203CDB0 * param0, const Party * param1, int param2)
+void sub_0205184C (FieldSystem * param0, const Party * param1, int param2)
 {
     UnkStruct_02050ACC * v0;
     BattleParams * v1;
@@ -911,7 +911,7 @@ void sub_0205184C (UnkStruct_0203CDB0 * param0, const Party * param1, int param2
     sub_02050904(param0, sub_02051790, v0);
 }
 
-static void sub_020518B0 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
+static void sub_020518B0 (FieldSystem * param0, BattleParams * param1)
 {
     Pokemon * v0;
     u32 v1 = param1->battleType;
@@ -956,7 +956,7 @@ static void sub_020518B0 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
     }
 }
 
-static void sub_02051988 (UnkStruct_0203CDB0 * param0, BattleParams * param1)
+static void sub_02051988 (FieldSystem * param0, BattleParams * param1)
 {
     Pokemon * v0;
     u32 v1 = param1->battleType;
@@ -1008,7 +1008,7 @@ void sub_02051ABC (UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * par
 {
     UnkStruct_02050ACC * v0;
     BattleParams * v1;
-    UnkStruct_0203CDB0 * v2;
+    FieldSystem * v2;
 
     v2 = sub_02050A60(param0);
     RadarChain_Clear(v2->chain);
diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
index 781cc63539..2a3e5868e8 100644
--- a/src/unk_02051D8C.c
+++ b/src/unk_02051D8C.c
@@ -62,7 +62,7 @@
 #include "unk_0207D3B8.h"
 #include "pokemon_summary_app.h"
 
-static void sub_0205281C(BattleParams * param0, const UnkStruct_0203CDB0 * param1);
+static void sub_0205281C(BattleParams * param0, const FieldSystem * param1);
 void sub_02052894(BattleParams * param0);
 
 BattleParams * sub_02051D8C (int param0, u32 param1)
@@ -155,7 +155,7 @@ BattleParams * sub_02051F38 (int param0, int param1)
     return v0;
 }
 
-BattleParams * sub_02051F4C (int param0, const UnkStruct_0203CDB0 * param1)
+BattleParams * sub_02051F4C (int param0, const FieldSystem * param1)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(param1->unk_0C);
     Options * v1 = sub_02025E44(param1->unk_0C);
@@ -250,7 +250,7 @@ void sub_020521A4 (BattleParams * param0, const ChatotCry * param1, int param2)
     CopyChatotCryData(param0->unk_F0[param2], param1);
 }
 
-void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6)
+void sub_020521B8 (BattleParams * param0, const FieldSystem * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(param2);
     Party * v1 = Party_GetFromSavedata(param2);
@@ -297,13 +297,13 @@ void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, Sav
     param0->unk_198 = param2;
 }
 
-void sub_02052314 (BattleParams * param0, const UnkStruct_0203CDB0 * param1)
+void sub_02052314 (BattleParams * param0, const FieldSystem * param1)
 {
     sub_020521B8(param0, param1, param1->unk_0C, param1->unk_1C->unk_00, param1->unk_9C, param1->unk_98, param1->unk_BC);
     sub_02052894(param0);
 }
 
-void sub_02052348 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, int param2)
+void sub_02052348 (BattleParams * param0, const FieldSystem * param1, int param2)
 {
     int v0;
     u32 v1;
@@ -356,7 +356,7 @@ void sub_02052348 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, int
     sub_02052894(param0);
 }
 
-void sub_020524E4 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, const Party * param2, const u8 * param3)
+void sub_020524E4 (BattleParams * param0, const FieldSystem * param1, const Party * param2, const u8 * param3)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(param1->unk_0C);
     UnkStruct_0207D3C0 * v1 = sub_0207D990(param1->unk_0C);
@@ -434,12 +434,12 @@ void sub_020524E4 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, con
     }
 }
 
-void sub_020526CC (BattleParams * param0, const UnkStruct_0203CDB0 * param1, const u8 * param2)
+void sub_020526CC (BattleParams * param0, const FieldSystem * param1, const u8 * param2)
 {
     sub_020524E4(param0, param1, Party_GetFromSavedata(param1->unk_0C), param2);
 }
 
-void sub_020526E8 (const BattleParams * param0, UnkStruct_0203CDB0 * param1)
+void sub_020526E8 (const BattleParams * param0, FieldSystem * param1)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(param1->unk_0C);
     Party * v1 = Party_GetFromSavedata(param1->unk_0C);
@@ -455,7 +455,7 @@ void sub_020526E8 (const BattleParams * param0, UnkStruct_0203CDB0 * param1)
     *v4 = param0->unk_168;
 }
 
-void sub_02052754 (const BattleParams * param0, UnkStruct_0203CDB0 * param1)
+void sub_02052754 (const BattleParams * param0, FieldSystem * param1)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(param1->unk_0C);
     Party * v1 = Party_GetFromSavedata(param1->unk_0C);
@@ -465,7 +465,7 @@ void sub_02052754 (const BattleParams * param0, UnkStruct_0203CDB0 * param1)
     sub_02026338(param0->unk_E8, v3);
 }
 
-static int sub_02052780 (const UnkStruct_0203CDB0 * param0, int param1)
+static int sub_02052780 (const FieldSystem * param0, int param1)
 {
     u8 v0 = sub_02054F94(param0, param0->unk_1C->unk_08, param0->unk_1C->unk_0C);
     static const v1[] = {
@@ -521,7 +521,7 @@ static int sub_02052780 (const UnkStruct_0203CDB0 * param0, int param1)
     return 24;
 }
 
-static void sub_0205281C (BattleParams * param0, const UnkStruct_0203CDB0 * param1)
+static void sub_0205281C (BattleParams * param0, const FieldSystem * param1)
 {
     UnkStruct_0205EC34 * v0 = sub_0203A780(sub_0203A790(param1->unk_0C));
 
diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c
index 8bf9d23086..3ba245b7c5 100644
--- a/src/unk_020528D0.c
+++ b/src/unk_020528D0.c
@@ -47,14 +47,14 @@
 
 typedef struct {
     int unk_00;
-    UnkStruct_0203CDB0 * unk_04;
+    FieldSystem * unk_04;
     BGL * unk_08;
     Window unk_0C;
     MessageLoader * unk_1C;
     StringFormatter * unk_20;
 } UnkStruct_02052AA4;
 
-static void sub_02052914(UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1);
+static void sub_02052914(FieldSystem * param0, UnkStruct_020508D4 * param1);
 static BOOL sub_020529C4(UnkStruct_020508D4 * param0);
 static void sub_02052AA4(UnkStruct_02052AA4 * param0, u16 param1, u8 param2, u8 param3);
 
@@ -110,7 +110,7 @@ static void sub_020528D0 (BGL * param0)
     sub_02006E84(14, 6, 0, 13 * 0x20, 0x20, 11);
 }
 
-static void sub_02052914 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1)
+static void sub_02052914 (FieldSystem * param0, UnkStruct_020508D4 * param1)
 {
     UnkStruct_02052AA4 * v0;
 
@@ -210,7 +210,7 @@ static void sub_02052AA4 (UnkStruct_02052AA4 * param0, u16 param1, u8 param2, u8
 
 BOOL sub_02052B2C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     int * v1;
 
     v0 = sub_02050A60(param0);
diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c
index c6cb7cbf0a..7eadf09477 100644
--- a/src/unk_02052C6C.c
+++ b/src/unk_02052C6C.c
@@ -63,14 +63,14 @@ typedef struct {
     int unk_38;
 } UnkStruct_0205300C;
 
-static void sub_02052F28(UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1);
-static void sub_02052FA8(UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1);
-static void sub_02053028(UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1, int param2);
+static void sub_02052F28(FieldSystem * param0, UnkStruct_0205300C * param1);
+static void sub_02052FA8(FieldSystem * param0, UnkStruct_0205300C * param1);
+static void sub_02053028(FieldSystem * param0, UnkStruct_0205300C * param1, int param2);
 static void sub_0205300C(UnkStruct_0205300C * param0);
-static void sub_02053098(UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1);
+static void sub_02053098(FieldSystem * param0, UnkStruct_0205300C * param1);
 static BOOL sub_02052FFC(UnkStruct_0205300C * param0);
 
-static void sub_02052C6C (UnkStruct_0203CDB0 * param0, BOOL param1)
+static void sub_02052C6C (FieldSystem * param0, BOOL param1)
 {
     HallOfFame * v0;
     Party * v1;
@@ -95,7 +95,7 @@ static BOOL sub_02052CBC (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02049FA8 * v0;
     UnkStruct_020507E4 * v1;
-    UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
+    FieldSystem * v2 = sub_02050A60(param0);
     UnkStruct_0205300C * v3 = sub_02050A64(param0);
     int * v4 = sub_02050A68(param0);
     UnkStruct_0203E234 * v5 = &v3->unk_04;
@@ -181,7 +181,7 @@ static BOOL sub_02052CBC (UnkStruct_020508D4 * param0)
 
 void sub_02052E58 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_02049FA8 * v1, * v2;
     UnkStruct_020507E4 * v3;
     TrainerInfo * v4;
@@ -223,7 +223,7 @@ void sub_02052E58 (UnkStruct_020508D4 * param0)
     sub_02050944(param0, sub_02052CBC, v5);
 }
 
-static void sub_02052F28 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1)
+static void sub_02052F28 (FieldSystem * param0, UnkStruct_0205300C * param1)
 {
     static const UnkStruct_02099F80 v0 = {
         GX_VRAM_BG_128_B,
@@ -275,7 +275,7 @@ static void sub_02052F28 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * para
     sub_02019448(param0->unk_08, 3);
 }
 
-static void sub_02052FA8 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1)
+static void sub_02052FA8 (FieldSystem * param0, UnkStruct_0205300C * param1)
 {
     Options * v0 = sub_02025E44(param0->unk_0C);
 
@@ -300,7 +300,7 @@ static void sub_0205300C (UnkStruct_0205300C * param0)
     sub_0205D988(&param0->unk_1C);
 }
 
-static void sub_02053028 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1, int param2)
+static void sub_02053028 (FieldSystem * param0, UnkStruct_0205300C * param1, int param2)
 {
     MessageLoader * v0 = MessageLoader_Init(1, 26, 213, 4);
 
@@ -319,7 +319,7 @@ static void sub_02053028 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * para
     param1->unk_34 = sub_0205D994(&param1->unk_1C, param1->unk_2C, sub_02025E44(param0->unk_0C), 1);
 }
 
-static void sub_02053098 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1)
+static void sub_02053098 (FieldSystem * param0, UnkStruct_0205300C * param1)
 {
     if (param1->unk_2C) {
         Strbuf_Free(param1->unk_2C);
diff --git a/src/unk_020530C8.c b/src/unk_020530C8.c
index f15efb9356..bbc0e38272 100644
--- a/src/unk_020530C8.c
+++ b/src/unk_020530C8.c
@@ -139,12 +139,12 @@ typedef struct {
 
 static BOOL sub_02053878(UnkStruct_020508D4 * param0);
 static BOOL sub_02053570(UnkStruct_020508D4 * param0);
-static void sub_0205311C(UnkStruct_0203CDB0 * param0, const UnkStruct_02049FA8 * param1);
-static void sub_020533CC(UnkStruct_0203CDB0 * param0);
-static void sub_02053468(UnkStruct_0203CDB0 * param0);
-static void sub_02053320(UnkStruct_0203CDB0 * param0);
-static void sub_02053374(UnkStruct_0203CDB0 * param0);
-static void sub_020534BC(UnkStruct_0203CDB0 * param0);
+static void sub_0205311C(FieldSystem * param0, const UnkStruct_02049FA8 * param1);
+static void sub_020533CC(FieldSystem * param0);
+static void sub_02053468(FieldSystem * param0);
+static void sub_02053320(FieldSystem * param0);
+static void sub_02053374(FieldSystem * param0);
+static void sub_020534BC(FieldSystem * param0);
 static BOOL sub_02053B44(UnkStruct_020508D4 * param0);
 static void sub_02053BD4(UnkStruct_020508D4 * param0);
 static BOOL sub_02053BE4(UnkStruct_020508D4 * param0);
@@ -178,7 +178,7 @@ static const UnkStruct_ov61_0222C884 Unk_020EC3A0 = {
     0x21F
 };
 
-static void sub_020530C8 (UnkStruct_0203CDB0 * param0)
+static void sub_020530C8 (FieldSystem * param0)
 {
     BOOL v0;
 
@@ -205,7 +205,7 @@ static void sub_020530C8 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static void sub_0205311C (UnkStruct_0203CDB0 * param0, const UnkStruct_02049FA8 * param1)
+static void sub_0205311C (FieldSystem * param0, const UnkStruct_02049FA8 * param1)
 {
     UnkStruct_0203A790 * v0 = sub_0203A790(param0->unk_0C);
     UnkStruct_02049FA8 * v1 = sub_0203A728(v0);
@@ -235,13 +235,13 @@ static void sub_0205311C (UnkStruct_0203CDB0 * param0, const UnkStruct_02049FA8
     }
 }
 
-void sub_020531A0 (UnkStruct_0203CDB0 * param0)
+void sub_020531A0 (FieldSystem * param0)
 {
     GF_ASSERT(param0->unk_70 < 5);
     gCoreSys.unk_65 = param0->unk_74->unk_00_12;
 }
 
-void sub_020531C0 (UnkStruct_0203CDB0 * param0, BOOL param1)
+void sub_020531C0 (FieldSystem * param0, BOOL param1)
 {
     int v0 = param0->unk_1C->unk_00;
     UnkStruct_0203A790 * v1 = sub_0203A790(param0->unk_0C);
@@ -301,7 +301,7 @@ void sub_020531C0 (UnkStruct_0203CDB0 * param0, BOOL param1)
     param0->unk_78.unk_02 = 0;
 }
 
-void sub_020532A8 (UnkStruct_0203CDB0 * param0, BOOL param1)
+void sub_020532A8 (FieldSystem * param0, BOOL param1)
 {
     int v0 = param0->unk_1C->unk_00;
     UnkStruct_0203A790 * v1 = sub_0203A790(param0->unk_0C);
@@ -339,7 +339,7 @@ void sub_020532A8 (UnkStruct_0203CDB0 * param0, BOOL param1)
     param0->unk_78.unk_02 = 0;
 }
 
-static void sub_02053320 (UnkStruct_0203CDB0 * param0)
+static void sub_02053320 (FieldSystem * param0)
 {
     int v0;
     int v1;
@@ -358,14 +358,14 @@ static void sub_02053320 (UnkStruct_0203CDB0 * param0)
     sub_02062C30(param0->unk_38);
 }
 
-static void sub_02053374 (UnkStruct_0203CDB0 * param0)
+static void sub_02053374 (FieldSystem * param0)
 {
     sub_0205E8E0(param0->unk_3C);
     sub_02061BBC(param0->unk_38);
     sub_02061830(param0->unk_38);
 }
 
-static void sub_0205338C (UnkStruct_0203CDB0 * param0)
+static void sub_0205338C (FieldSystem * param0)
 {
     param0->unk_38 = sub_02061804(param0, 64, 5);
     sub_0203A7C0(param0);
@@ -381,7 +381,7 @@ static void sub_0205338C (UnkStruct_0203CDB0 * param0)
     sub_02062C30(param0->unk_38);
 }
 
-static void sub_020533CC (UnkStruct_0203CDB0 * param0)
+static void sub_020533CC (FieldSystem * param0)
 {
     sub_020530C8(param0);
     GF_ASSERT(param0->unk_5C == NULL);
@@ -408,7 +408,7 @@ static void sub_020533CC (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static void sub_02053468 (UnkStruct_0203CDB0 * param0)
+static void sub_02053468 (FieldSystem * param0)
 {
     GF_ASSERT(param0->unk_5C != NULL);
 
@@ -422,7 +422,7 @@ static void sub_02053468 (UnkStruct_0203CDB0 * param0)
     param0->unk_74 = NULL;
 }
 
-void sub_02053494 (UnkStruct_0203CDB0 * param0)
+void sub_02053494 (FieldSystem * param0)
 {
     if (param0->unk_9C != NULL) {
         void * v0;
@@ -432,7 +432,7 @@ void sub_02053494 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static void sub_020534BC (UnkStruct_0203CDB0 * param0)
+static void sub_020534BC (FieldSystem * param0)
 {
     if (param0->unk_9C != NULL) {
         UnkStruct_0203A790 * v0 = sub_0203A790(param0->unk_0C);
@@ -442,12 +442,12 @@ static void sub_020534BC (UnkStruct_0203CDB0 * param0)
     }
 }
 
-static void sub_020534EC (UnkStruct_02049FA8 * param0, const UnkStruct_0203CDB0 * param1)
+static void sub_020534EC (UnkStruct_02049FA8 * param0, const FieldSystem * param1)
 {
     inline_02049FA8(param0, param1->unk_1C->unk_00, -1, sub_0205EABC(param1->unk_3C), sub_0205EAC8(param1->unk_3C), 1);
 }
 
-static BOOL sub_02053518 (const UnkStruct_0203CDB0 * param0)
+static BOOL sub_02053518 (const FieldSystem * param0)
 {
     if (MapHeader_IsPokemonCenter2F(param0->unk_1C->unk_00)
         && (param0->unk_1C->unk_08 == 7) && (param0->unk_1C->unk_0C == 6)) {
@@ -457,7 +457,7 @@ static BOOL sub_02053518 (const UnkStruct_0203CDB0 * param0)
     }
 }
 
-static void sub_02053540 (UnkStruct_0203CDB0 * param0)
+static void sub_02053540 (FieldSystem * param0)
 {
     UnkStruct_02049FA8 * v0 = sub_0203A730(sub_0203A790(param0->unk_0C));
     UnkStruct_020507E4 * v1 = SaveData_Events(param0->unk_0C);
@@ -467,7 +467,7 @@ static void sub_02053540 (UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_02053570 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     int * v1 = sub_02050A68(param0);
 
     switch (*v1) {
@@ -489,7 +489,7 @@ static BOOL sub_02053570 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_020535CC (UnkStruct_0203CDB0 * param0)
+void sub_020535CC (FieldSystem * param0)
 {
     UnkStruct_020508D4 * v0;
 
@@ -500,7 +500,7 @@ void sub_020535CC (UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_020535E8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020507E4 * v1 = SaveData_Events(v0->unk_0C);
     int * v2 = sub_02050A68(param0);
 
@@ -555,7 +555,7 @@ static BOOL sub_020535E8 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_02053704 (UnkStruct_0203CDB0 * param0)
+void sub_02053704 (FieldSystem * param0)
 {
     UnkStruct_020508D4 * v0;
 
@@ -565,7 +565,7 @@ void sub_02053704 (UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_02053718 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053718 * v1 = sub_02050A64(param0);
     UnkStruct_020507E4 * v2 = SaveData_Events(v0->unk_0C);
     int * v3 = sub_02050A68(param0);
@@ -610,7 +610,7 @@ static BOOL sub_02053718 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_02053808 (UnkStruct_0203CDB0 * param0)
+void sub_02053808 (FieldSystem * param0)
 {
     UnkStruct_020508D4 * v0;
     UnkStruct_02053718 * v1;
@@ -637,7 +637,7 @@ void sub_02053808 (UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_02053878 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053900 * v1 = sub_02050A64(param0);
     UnkStruct_02049FA8 * v2 = &v1->unk_04;
 
@@ -682,7 +682,7 @@ void sub_02053900 (UnkStruct_020508D4 * param0, const UnkStruct_02049FA8 * param
 static BOOL sub_02053930 (UnkStruct_020508D4 * param0)
 {
     u16 v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_02053A80 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -709,7 +709,7 @@ static BOOL sub_02053930 (UnkStruct_020508D4 * param0)
 
 void sub_020539A0 (UnkStruct_020508D4 * param0, const UnkStruct_02049FA8 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053A80 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053A80));
 
     if (sub_0203CD4C(v0)) {
@@ -733,7 +733,7 @@ void sub_020539E8 (UnkStruct_020508D4 * param0, int param1, int param2, int para
 
 static BOOL sub_02053A04 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053A80 * v1 = sub_02050A64(param0);
     UnkStruct_02049FA8 * v2 = &v1->unk_04;
 
@@ -774,7 +774,7 @@ void sub_02053A80 (UnkStruct_020508D4 * param0, int param1, int param2, int para
     sub_02050944(param0, sub_02053A04, v0);
 }
 
-void sub_02053AB4 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, int param5)
+void sub_02053AB4 (FieldSystem * param0, int param1, int param2, int param3, int param4, int param5)
 {
     UnkStruct_02049FA8 v0;
 
@@ -810,7 +810,7 @@ void sub_02053AFC (UnkStruct_020508D4 * param0, int param1, int param2, int para
 
 static BOOL sub_02053B44 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053AB4 * v1 = sub_02050A64(param0);
     UnkStruct_02049FA8 * v2 = &v1->unk_08;
 
@@ -873,7 +873,7 @@ static void sub_02053C10 (UnkStruct_020508D4 * param0)
 static BOOL sub_02053C28 (UnkStruct_020508D4 * param0)
 {
     int * v0 = sub_02050A68(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     switch (*v0) {
     case 0:
@@ -894,7 +894,7 @@ static BOOL sub_02053C28 (UnkStruct_020508D4 * param0)
 
 static void sub_02053C70 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053AB4 * v1 = sub_02050A64(param0);
 
     if (!sub_0203CD4C(v0)) {
@@ -934,7 +934,7 @@ void sub_02053CD4 (UnkStruct_020508D4 * param0, const UnkStruct_02049FA8 * param
 
 static BOOL sub_02053D0C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053CD4 * v1 = sub_02050A64(param0);
     UnkStruct_02049FA8 * v2 = &v1->unk_0C;
 
@@ -1005,7 +1005,7 @@ static void sub_02053DF0 (UnkStruct_020508D4 * param0)
 static BOOL sub_02053E08 (UnkStruct_020508D4 * param0)
 {
     int * v0 = sub_02050A68(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_02053CD4 * v2 = sub_02050A64(param0);
 
     switch (*v0) {
@@ -1027,7 +1027,7 @@ static BOOL sub_02053E08 (UnkStruct_020508D4 * param0)
 
 static void sub_02053E5C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053CD4 * v1 = sub_02050A64(param0);
 
     if (!sub_0203CD4C(v0)) {
@@ -1043,7 +1043,7 @@ static void sub_02053E5C (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02053E98 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053E98 * v1 = sub_02050A64(param0);
     UnkStruct_02049FA8 * v2 = &v1->unk_08;
 
@@ -1090,7 +1090,7 @@ static BOOL sub_02053E98 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_02053F58 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+void sub_02053F58 (FieldSystem * param0, int param1, int param2)
 {
     UnkStruct_02049FA8 v0;
     UnkStruct_02053E98 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053E98));
@@ -1102,7 +1102,7 @@ void sub_02053F58 (UnkStruct_0203CDB0 * param0, int param1, int param2)
     sub_02050904(param0, sub_02053E98, v1);
 }
 
-void * sub_02053FAC (UnkStruct_0203CDB0 * param0)
+void * sub_02053FAC (FieldSystem * param0)
 {
     UnkStruct_02053FAC * v0;
     UnkStruct_02049FA8 * v1 = sub_0203A730(sub_0203A790(param0->unk_0C));
@@ -1153,7 +1153,7 @@ void * sub_02053FAC (UnkStruct_0203CDB0 * param0)
     return v0;
 }
 
-void sub_02054064 (UnkStruct_0203CDB0 * param0)
+void sub_02054064 (FieldSystem * param0)
 {
     UnkStruct_02053FAC * v0 = sub_02053FAC(param0);
 
@@ -1166,7 +1166,7 @@ void sub_02054064 (UnkStruct_0203CDB0 * param0)
 
 BOOL sub_02054084 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053FAC * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -1286,7 +1286,7 @@ BOOL sub_02054084 (UnkStruct_020508D4 * param0)
 
 BOOL sub_0205430C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053FAC * v1 = sub_02050A64(param0);
     int v2 = 0;
 
@@ -1345,7 +1345,7 @@ BOOL sub_0205430C (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-UnkFuncPtr_02050904 sub_02054428 (const UnkStruct_0203CDB0 * param0)
+UnkFuncPtr_02050904 sub_02054428 (const FieldSystem * param0)
 {
     if (param0->unk_70 == 0) {
         return sub_02054084;
@@ -1359,7 +1359,7 @@ UnkFuncPtr_02050904 sub_02054428 (const UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_0205444C (UnkStruct_020508D4 * param0, int param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053FAC * v1 = sub_02050A64(param0);
     BOOL v2 = 0;
 
@@ -1382,7 +1382,7 @@ static BOOL sub_0205444C (UnkStruct_020508D4 * param0, int param1)
 
 static BOOL sub_02054494 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053A80 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -1406,7 +1406,7 @@ static BOOL sub_02054494 (UnkStruct_020508D4 * param0)
 
 void sub_020544F0 (UnkStruct_020508D4 * param0, const UnkStruct_02049FA8 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053A80 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053A80));
 
     if (sub_0203CD4C(v0)) {
@@ -1422,7 +1422,7 @@ void sub_020544F0 (UnkStruct_020508D4 * param0, const UnkStruct_02049FA8 * param
 
 static BOOL sub_02054538 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02054538 * v1 = sub_02050A64(param0);
     int * v2 = sub_02050A68(param0);
     UnkStruct_02049FA8 * v3 = &v1->unk_08;
@@ -1467,7 +1467,7 @@ static BOOL sub_02054538 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_020545EC (UnkStruct_0203CDB0 * param0)
+void sub_020545EC (FieldSystem * param0)
 {
     UnkStruct_02049FA8 * v0 = sub_0203A730(sub_0203A790(param0->unk_0C));
     UnkStruct_02054538 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02054538));
@@ -1485,7 +1485,7 @@ void sub_020545EC (UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_02054648 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02054538 * v1 = sub_02050A64(param0);
     int * v2 = sub_02050A68(param0);
     UnkStruct_02049FA8 * v3 = &v1->unk_08;
@@ -1535,7 +1535,7 @@ static BOOL sub_02054648 (UnkStruct_020508D4 * param0)
 
 void sub_02054708 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02049FA8 * v1 = sub_0203A730(sub_0203A790(v0->unk_0C));
     UnkStruct_02054538 * v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02054538));
 
@@ -1553,7 +1553,7 @@ void sub_02054708 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02054778 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02053900 * v1 = sub_02050A64(param0);
     UnkStruct_02049FA8 * v2 = &v1->unk_04;
 
@@ -1588,7 +1588,7 @@ static BOOL sub_02054778 (UnkStruct_020508D4 * param0)
 void sub_02054800 (UnkStruct_020508D4 * param0, int param1, int param2, int param3, int param4, int param5)
 {
     UnkStruct_02049FA8 v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_02049FA8 * v2 = sub_0203A730(sub_0203A790(v1->unk_0C));
 
     sub_020534EC(v2, v1);
@@ -1609,7 +1609,7 @@ void sub_02054800 (UnkStruct_020508D4 * param0, int param1, int param2, int para
 
 void sub_02054864 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02049FA8 * v1 = sub_0203A730(sub_0203A790(v0->unk_0C));
 
     v0->unk_70 = 0;
diff --git a/src/unk_02054BD0.c b/src/unk_02054BD0.c
index 1833f2fabb..3bf87ab191 100644
--- a/src/unk_02054BD0.c
+++ b/src/unk_02054BD0.c
@@ -19,7 +19,7 @@ typedef struct UnkStruct_02054C18_t {
 static void sub_02054C18(UnkStruct_02039E30 * param0, UnkStruct_02054C18 * param1, const u8 param2);
 static const u8 sub_02054CC4(const u16 param0, u16 * param1, u8 * param2);
 
-void sub_02054BD0 (UnkStruct_0203CDB0 * param0, const u8 param1)
+void sub_02054BD0 (FieldSystem * param0, const u8 param1)
 {
     int v0;
     void * v1;
@@ -31,7 +31,7 @@ void sub_02054BD0 (UnkStruct_0203CDB0 * param0, const u8 param1)
     }
 }
 
-void sub_02054BF8 (UnkStruct_0203CDB0 * param0)
+void sub_02054BF8 (FieldSystem * param0)
 {
     if (param0->unk_58 != NULL) {
         Heap_FreeToHeap(param0->unk_58);
diff --git a/src/unk_02054D00.c b/src/unk_02054D00.c
index 127cfc7f0d..5ce654d9e6 100644
--- a/src/unk_02054D00.c
+++ b/src/unk_02054D00.c
@@ -19,19 +19,19 @@
 #include "overlay005/ov5_021EEC68.h"
 #include "overlay005/ov5_021EF250.h"
 
-typedef const fx32 (* UnkFuncPtr_02054F44)(const UnkStruct_0203CDB0 *, const fx32, const fx32, const fx32, u8 *);
-typedef BOOL (* UnkFuncPtr_02054F44_1)(const UnkStruct_0203CDB0 *, const int, const int, u16 *);
+typedef const fx32 (* UnkFuncPtr_02054F44)(const FieldSystem *, const fx32, const fx32, const fx32, u8 *);
+typedef BOOL (* UnkFuncPtr_02054F44_1)(const FieldSystem *, const int, const int, u16 *);
 
 typedef struct UnkStruct_02054F44_t {
     UnkFuncPtr_02054F44 unk_00;
     UnkFuncPtr_02054F44_1 unk_04;
 } UnkStruct_02054F44;
 
-static const fx32 sub_02054D0C(const UnkStruct_0203CDB0 * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4);
-static const fx32 sub_02054E50(const UnkStruct_0203CDB0 * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4);
-static BOOL sub_02054E84(const UnkStruct_0203CDB0 * param0, const int param1, const int param2, u16 * param3);
-static BOOL sub_02054EF4(const UnkStruct_0203CDB0 * param0, const int param1, const int param2, u16 * param3);
-static int sub_02054FD0(const UnkStruct_0203CDB0 * param0, const VecFx32 * param1, const int param2, const int param3, u8 * param4);
+static const fx32 sub_02054D0C(const FieldSystem * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4);
+static const fx32 sub_02054E50(const FieldSystem * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4);
+static BOOL sub_02054E84(const FieldSystem * param0, const int param1, const int param2, u16 * param3);
+static BOOL sub_02054EF4(const FieldSystem * param0, const int param1, const int param2, u16 * param3);
+static int sub_02054FD0(const FieldSystem * param0, const VecFx32 * param1, const int param2, const int param3, u8 * param4);
 
 static const UnkStruct_02054F44 Unk_020EC3D0 = {
     sub_02054D0C,
@@ -56,7 +56,7 @@ static fx32 sub_02054D00 (const fx32 param0, const fx32 param1)
     return v0;
 }
 
-static const fx32 sub_02054D0C (const UnkStruct_0203CDB0 * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4)
+static const fx32 sub_02054D0C (const FieldSystem * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4)
 {
     BOOL v0, v1;
     u8 v2;
@@ -162,7 +162,7 @@ static const fx32 sub_02054D0C (const UnkStruct_0203CDB0 * param0, const fx32 pa
     return v15;
 }
 
-static const fx32 sub_02054E50 (const UnkStruct_0203CDB0 * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4)
+static const fx32 sub_02054E50 (const FieldSystem * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4)
 {
     BOOL v0;
     int v1, v2;
@@ -188,7 +188,7 @@ static const fx32 sub_02054E50 (const UnkStruct_0203CDB0 * param0, const fx32 pa
     return v3;
 }
 
-static BOOL sub_02054E84 (const UnkStruct_0203CDB0 * param0, const int param1, const int param2, u16 * param3)
+static BOOL sub_02054E84 (const FieldSystem * param0, const int param1, const int param2, u16 * param3)
 {
     BOOL v0;
     u32 v1, v2;
@@ -226,7 +226,7 @@ static BOOL sub_02054E84 (const UnkStruct_0203CDB0 * param0, const int param1, c
     }
 }
 
-static BOOL sub_02054EF4 (const UnkStruct_0203CDB0 * param0, const int param1, const int param2, u16 * param3)
+static BOOL sub_02054EF4 (const FieldSystem * param0, const int param1, const int param2, u16 * param3)
 {
     BOOL v0;
     u32 v1, v2;
@@ -271,7 +271,7 @@ void sub_02054F44 (const UnkStruct_02054F44 ** param0, int param1)
     }
 }
 
-BOOL sub_02054F68 (const UnkStruct_0203CDB0 * param0, const int param1, const int param2)
+BOOL sub_02054F68 (const FieldSystem * param0, const int param1, const int param2)
 {
     BOOL v0;
     u16 v1;
@@ -292,7 +292,7 @@ BOOL sub_02054F68 (const UnkStruct_0203CDB0 * param0, const int param1, const in
     return 0;
 }
 
-u8 sub_02054F94 (const UnkStruct_0203CDB0 * param0, const int param1, const int param2)
+u8 sub_02054F94 (const FieldSystem * param0, const int param1, const int param2)
 {
     BOOL v0;
     u16 v1;
@@ -311,7 +311,7 @@ u8 sub_02054F94 (const UnkStruct_0203CDB0 * param0, const int param1, const int
     return 0xff;
 }
 
-const fx32 sub_02054FBC (const UnkStruct_0203CDB0 * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4)
+const fx32 sub_02054FBC (const FieldSystem * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4)
 {
     BOOL v0;
     fx32 v1;
@@ -321,7 +321,7 @@ const fx32 sub_02054FBC (const UnkStruct_0203CDB0 * param0, const fx32 param1, c
     return v1;
 }
 
-static int sub_02054FD0 (const UnkStruct_0203CDB0 * param0, const VecFx32 * param1, const int param2, const int param3, u8 * param4)
+static int sub_02054FD0 (const FieldSystem * param0, const VecFx32 * param1, const int param2, const int param3, u8 * param4)
 {
     int v0;
     fx32 v1, v2;
@@ -355,7 +355,7 @@ static int sub_02054FD0 (const UnkStruct_0203CDB0 * param0, const VecFx32 * para
     return v0;
 }
 
-BOOL sub_02055024 (const UnkStruct_0203CDB0 * param0, const VecFx32 * param1, const int param2, const int param3, s8 * param4)
+BOOL sub_02055024 (const FieldSystem * param0, const VecFx32 * param1, const int param2, const int param3, s8 * param4)
 {
     int v0;
     u8 v1;
@@ -385,7 +385,7 @@ BOOL sub_02055024 (const UnkStruct_0203CDB0 * param0, const VecFx32 * param1, co
     }
 }
 
-BOOL sub_0205507C (UnkStruct_0203CDB0 * param0, const VecFx32 * param1, const int param2, const int param3, s8 * param4)
+BOOL sub_0205507C (FieldSystem * param0, const VecFx32 * param1, const int param2, const int param3, s8 * param4)
 {
     int v0;
     u8 v1;
@@ -458,7 +458,7 @@ BOOL sub_02055130 (const UnkStruct_ov5_021E1890 * param0, const UnkStruct_020551
     return 0;
 }
 
-BOOL sub_02055178 (const UnkStruct_0203CDB0 * param0, const int param1, const UnkStruct_02055130 * param2, UnkStruct_ov5_021E1890 ** param3)
+BOOL sub_02055178 (const FieldSystem * param0, const int param1, const UnkStruct_02055130 * param2, UnkStruct_ov5_021E1890 ** param3)
 {
     u8 v0;
     UnkStruct_ov5_021E1608 * v1;
@@ -508,7 +508,7 @@ BOOL sub_02055178 (const UnkStruct_0203CDB0 * param0, const int param1, const Un
     return 0;
 }
 
-BOOL sub_02055208 (const UnkStruct_0203CDB0 * param0, const int * param1, const u8 param2, const UnkStruct_02055130 * param3, UnkStruct_ov5_021E1890 ** param4, int * param5)
+BOOL sub_02055208 (const FieldSystem * param0, const int * param1, const u8 param2, const UnkStruct_02055130 * param3, UnkStruct_ov5_021E1890 ** param4, int * param5)
 {
     u8 v0;
     UnkStruct_ov5_021E1608 * v1;
@@ -565,7 +565,7 @@ BOOL sub_02055208 (const UnkStruct_0203CDB0 * param0, const int * param1, const
     return 0;
 }
 
-BOOL sub_020552B4 (const UnkStruct_0203CDB0 * param0, const int param1, UnkStruct_ov5_021E1890 ** param2, int * param3)
+BOOL sub_020552B4 (const FieldSystem * param0, const int param1, UnkStruct_ov5_021E1890 ** param2, int * param3)
 {
     u8 v0;
     UnkStruct_ov5_021E1608 * v1;
@@ -609,7 +609,7 @@ BOOL sub_020552B4 (const UnkStruct_0203CDB0 * param0, const int param1, UnkStruc
     return 0;
 }
 
-BOOL sub_02055324 (const UnkStruct_0203CDB0 * param0, const int * param1, const u8 param2, UnkStruct_ov5_021E1890 ** param3, int * param4)
+BOOL sub_02055324 (const FieldSystem * param0, const int * param1, const u8 param2, UnkStruct_ov5_021E1890 ** param3, int * param4)
 {
     u8 v0;
     UnkStruct_ov5_021E1608 * v1;
diff --git a/src/unk_020553DC.c b/src/unk_020553DC.c
index e3e5e06d4c..dc3cf022d6 100644
--- a/src/unk_020553DC.c
+++ b/src/unk_020553DC.c
@@ -103,11 +103,11 @@ const static u16 Unk_020EC3E0[][2] = {
 
 
 void sub_020553DC(void);
-u16 sub_02055428(UnkStruct_0203CDB0 * param0, int param1);
-u16 sub_020554A4(UnkStruct_0203CDB0 * param0, int param1);
-static u16 sub_020554E8(UnkStruct_0203CDB0 * param0, int param1);
-BOOL sub_02055554(UnkStruct_0203CDB0 * param0, u16 param1, int param2);
-static void sub_020555CC(UnkStruct_0203CDB0 * param0, int param1, int * param2, int * param3);
+u16 sub_02055428(FieldSystem * param0, int param1);
+u16 sub_020554A4(FieldSystem * param0, int param1);
+static u16 sub_020554E8(FieldSystem * param0, int param1);
+BOOL sub_02055554(FieldSystem * param0, u16 param1, int param2);
+static void sub_020555CC(FieldSystem * param0, int param1, int * param2, int * param3);
 u16 sub_0205560C(int param0);
 
 void sub_020553DC ()
@@ -119,7 +119,7 @@ void sub_020553DC ()
     return;
 }
 
-void sub_020553F0 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_020553F0 (FieldSystem * param0, u16 param1)
 {
     u16 * v0 = sub_0203A748(sub_0203A790(param0->unk_0C));
 
@@ -127,13 +127,13 @@ void sub_020553F0 (UnkStruct_0203CDB0 * param0, u16 param1)
     return;
 }
 
-u16 sub_02055404 (UnkStruct_0203CDB0 * param0)
+u16 sub_02055404 (FieldSystem * param0)
 {
     u16 * v0 = sub_0203A748(sub_0203A790(param0->unk_0C));
     return *v0;
 }
 
-void sub_02055414 (UnkStruct_0203CDB0 * param0)
+void sub_02055414 (FieldSystem * param0)
 {
     u16 * v0 = sub_0203A748(sub_0203A790(param0->unk_0C));
 
@@ -141,7 +141,7 @@ void sub_02055414 (UnkStruct_0203CDB0 * param0)
     return;
 }
 
-u16 sub_02055428 (UnkStruct_0203CDB0 * param0, int param1)
+u16 sub_02055428 (FieldSystem * param0, int param1)
 {
     UnkStruct_0205E884 * v0;
     int v1;
@@ -181,7 +181,7 @@ u16 sub_02055428 (UnkStruct_0203CDB0 * param0, int param1)
     return v2;
 }
 
-u16 sub_020554A4 (UnkStruct_0203CDB0 * param0, int param1)
+u16 sub_020554A4 (FieldSystem * param0, int param1)
 {
     u16 v0, v1;
 
@@ -206,7 +206,7 @@ u16 sub_020554A4 (UnkStruct_0203CDB0 * param0, int param1)
     return v0;
 }
 
-static u16 sub_020554E8 (UnkStruct_0203CDB0 * param0, int param1)
+static u16 sub_020554E8 (FieldSystem * param0, int param1)
 {
     int v0, v1;
     UnkStruct_0203A790 * v2 = sub_0203A790(param0->unk_0C);
@@ -236,7 +236,7 @@ static u16 sub_020554E8 (UnkStruct_0203CDB0 * param0, int param1)
     return 0;
 }
 
-BOOL sub_02055554 (UnkStruct_0203CDB0 * param0, u16 param1, int param2)
+BOOL sub_02055554 (FieldSystem * param0, u16 param1, int param2)
 {
     UnkStruct_0205E884 * v0;
     int v1, v2, v3;
@@ -264,7 +264,7 @@ BOOL sub_02055554 (UnkStruct_0203CDB0 * param0, u16 param1, int param2)
     return 1;
 }
 
-static void sub_020555CC (UnkStruct_0203CDB0 * param0, int param1, int * param2, int * param3)
+static void sub_020555CC (FieldSystem * param0, int param1, int * param2, int * param3)
 {
     switch (param1) {
     case 0:
@@ -306,7 +306,7 @@ u16 sub_0205560C (int param0)
     return v1;
 }
 
-void sub_02055644 (UnkStruct_0203CDB0 * param0, int param1)
+void sub_02055644 (FieldSystem * param0, int param1)
 {
     if (sub_020041DC() == 1) {
         return;
@@ -319,7 +319,7 @@ void sub_02055644 (UnkStruct_0203CDB0 * param0, int param1)
     return;
 }
 
-void sub_02055670 (UnkStruct_0203CDB0 * param0, int param1)
+void sub_02055670 (FieldSystem * param0, int param1)
 {
     u16 v0;
 
@@ -337,7 +337,7 @@ void sub_02055670 (UnkStruct_0203CDB0 * param0, int param1)
     return;
 }
 
-void sub_020556A0 (UnkStruct_0203CDB0 * param0, int param1)
+void sub_020556A0 (FieldSystem * param0, int param1)
 {
     u16 v0;
 
diff --git a/src/unk_0205578C.c b/src/unk_0205578C.c
index 5ca7dc6dbf..75c2850daa 100644
--- a/src/unk_0205578C.c
+++ b/src/unk_0205578C.c
@@ -20,7 +20,7 @@ void sub_020557DC(UnkStruct_020508D4 * param0, int param1, int param2);
 
 static BOOL sub_0205578C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_0205578C * v1;
 
     v0 = sub_02050A60(param0);
diff --git a/src/unk_02055808.c b/src/unk_02055808.c
index eeb4b287b2..7c13dceac5 100644
--- a/src/unk_02055808.c
+++ b/src/unk_02055808.c
@@ -13,7 +13,7 @@
 
 static BOOL sub_02055808 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
 
     if (!sub_0203CD4C(v0)) {
         return 1;
@@ -24,7 +24,7 @@ static BOOL sub_02055808 (UnkStruct_020508D4 * param0)
 
 void sub_02055820 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
 
     if (!sub_0203CD4C(v0)) {
         GF_ASSERT(FALSE);
@@ -37,7 +37,7 @@ void sub_02055820 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02055850 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
 
     if (sub_020509DC(v0)) {
         return 1;
@@ -48,7 +48,7 @@ static BOOL sub_02055850 (UnkStruct_020508D4 * param0)
 
 void sub_02055868 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
 
     if (sub_0203CD4C(v0)) {
         GF_ASSERT(FALSE);
@@ -70,7 +70,7 @@ static BOOL sub_02055898 (UnkStruct_020508D4 * param0)
 
 void sub_020558AC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
 
     if (!sub_0203CD4C(v0)) {
         GF_ASSERT(FALSE);
@@ -85,7 +85,7 @@ void sub_020558AC (UnkStruct_020508D4 * param0)
 
 void sub_020558F0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
 
     if (!sub_0203CD4C(v0)) {
         GF_ASSERT(FALSE);
@@ -126,7 +126,7 @@ void sub_02055974 (UnkStruct_020508D4 * param0)
 static BOOL sub_02055984 (UnkStruct_020508D4 * param0)
 {
     int * v0 = sub_02050A68(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     switch (*v0) {
     case 0:
diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c
index 552a3c411b..d53a1589c2 100644
--- a/src/unk_020559DC.c
+++ b/src/unk_020559DC.c
@@ -30,12 +30,12 @@
 #include "pokemon.h"
 #include "party.h"
 
-static void sub_02055AC0(UnkStruct_0203CDB0 * param0, s32 param1);
-static void sub_02055B64(UnkStruct_0203CDB0 * param0, s32 param1, const RTCTime * param2);
-static void sub_02055A14(UnkStruct_0203CDB0 * param0, UnkStruct_02055BA8 * param1, const RTCDate * param2);
-static void inline_020559DC(UnkStruct_0203CDB0 * param0, UnkStruct_02055BA8 * param1, const RTCDate * param2, const RTCTime * param3);
+static void sub_02055AC0(FieldSystem * param0, s32 param1);
+static void sub_02055B64(FieldSystem * param0, s32 param1, const RTCTime * param2);
+static void sub_02055A14(FieldSystem * param0, UnkStruct_02055BA8 * param1, const RTCDate * param2);
+static void inline_020559DC(FieldSystem * param0, UnkStruct_02055BA8 * param1, const RTCDate * param2, const RTCTime * param3);
 
-void sub_020559DC (UnkStruct_0203CDB0 * param0)
+void sub_020559DC (FieldSystem * param0)
 {
     RTCDate v0;
     RTCTime v1;
@@ -51,7 +51,7 @@ void sub_020559DC (UnkStruct_0203CDB0 * param0)
     inline_020559DC(param0, v2, &v0, &v1);
 }
 
-static void sub_02055A14 (UnkStruct_0203CDB0 * param0, UnkStruct_02055BA8 * param1, const RTCDate * param2)
+static void sub_02055A14 (FieldSystem * param0, UnkStruct_02055BA8 * param1, const RTCDate * param2)
 {
     s32 v0;
 
@@ -65,7 +65,7 @@ static void sub_02055A14 (UnkStruct_0203CDB0 * param0, UnkStruct_02055BA8 * para
     }
 }
 
-static void inline_020559DC (UnkStruct_0203CDB0 * param0, UnkStruct_02055BA8 * param1, const RTCDate * param2, const RTCTime * param3)
+static void inline_020559DC (FieldSystem * param0, UnkStruct_02055BA8 * param1, const RTCDate * param2, const RTCTime * param3)
 {
     s64 v0, v1;
     s32 v2;
@@ -89,7 +89,7 @@ static void inline_020559DC (UnkStruct_0203CDB0 * param0, UnkStruct_02055BA8 * p
     }
 }
 
-static void sub_02055AC0 (UnkStruct_0203CDB0 * param0, s32 param1)
+static void sub_02055AC0 (FieldSystem * param0, s32 param1)
 {
     sub_02028658(sub_0203D174(param0), param1);
     sub_0203F1FC(param0);
@@ -132,7 +132,7 @@ static void sub_02055AC0 (UnkStruct_0203CDB0 * param0, s32 param1)
     sub_0206F2F0(param0->unk_0C);
 }
 
-static void sub_02055B64 (UnkStruct_0203CDB0 * param0, s32 param1, const RTCTime * param2)
+static void sub_02055B64 (FieldSystem * param0, s32 param1, const RTCTime * param2)
 {
     sub_02055CD4(param0, param1);
     sub_0202D854(param0->unk_0C, param1);
@@ -151,62 +151,62 @@ static void sub_02055B64 (UnkStruct_0203CDB0 * param0, s32 param1, const RTCTime
     }
 }
 
-int sub_02055BA8 (const UnkStruct_0203CDB0 * param0)
+int sub_02055BA8 (const FieldSystem * param0)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
     return TimeOfDayForHour(v0->unk_14.hour);
 }
 
-int sub_02055BB8 (const UnkStruct_0203CDB0 * param0)
+int sub_02055BB8 (const FieldSystem * param0)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
     return v0->unk_04.month;
 }
 
-int sub_02055BC4 (const UnkStruct_0203CDB0 * param0)
+int sub_02055BC4 (const FieldSystem * param0)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
     return v0->unk_04.day;
 }
 
-int sub_02055BD0 (const UnkStruct_0203CDB0 * param0)
+int sub_02055BD0 (const FieldSystem * param0)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
     return v0->unk_04.week;
 }
 
-int sub_02055BDC (const UnkStruct_0203CDB0 * param0)
+int sub_02055BDC (const FieldSystem * param0)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
     return v0->unk_14.hour;
 }
 
-int sub_02055BE8 (const UnkStruct_0203CDB0 * param0)
+int sub_02055BE8 (const FieldSystem * param0)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
     return v0->unk_14.minute;
 }
 
-void sub_02055BF4 (const UnkStruct_0203CDB0 * param0, RTCDate * param1, RTCTime * param2)
+void sub_02055BF4 (const FieldSystem * param0, RTCDate * param1, RTCTime * param2)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
     RTC_ConvertSecondToDateTime(param1, param2, v0->unk_24);
 }
 
-void sub_02055C10 (const UnkStruct_0203CDB0 * param0, RTCDate * param1, RTCTime * param2)
+void sub_02055C10 (const FieldSystem * param0, RTCDate * param1, RTCTime * param2)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
     RTC_ConvertSecondToDateTime(param1, param2, v0->unk_2C);
 }
 
-void sub_02055C2C (const UnkStruct_0203CDB0 * param0)
+void sub_02055C2C (const FieldSystem * param0)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
 
     v0->unk_2C = GetTimestamp();
 }
 
-BOOL sub_02055C40 (UnkStruct_0203CDB0 * param0)
+BOOL sub_02055C40 (FieldSystem * param0)
 {
     UnkStruct_02055BA8 * v0 = sub_02025CD8(param0->unk_0C);
     return sub_02025DB8(v0);
diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c
index 85575ea6eb..6108963ed6 100644
--- a/src/unk_02055C50.c
+++ b/src/unk_02055C50.c
@@ -47,7 +47,7 @@ typedef struct {
     SysTask * unk_0C;
 } UnkStruct_020562AC;
 
-static void sub_02055D14(UnkStruct_0203CDB0 * param0, UnkStruct_02055CBC * param1);
+static void sub_02055D14(FieldSystem * param0, UnkStruct_02055CBC * param1);
 static void sub_02055D48(UnkStruct_02055CBC * param0);
 
 static u16 sub_02055C50 (int param0)
@@ -86,7 +86,7 @@ static int sub_02055C80 (int param0)
     return param0 - 95 + 1;
 }
 
-UnkStruct_02055CBC * sub_02055C8C (UnkStruct_0203CDB0 * param0, int param1)
+UnkStruct_02055CBC * sub_02055C8C (FieldSystem * param0, int param1)
 {
     UnkStruct_02055CBC * v0;
 
@@ -107,7 +107,7 @@ void sub_02055CBC (UnkStruct_02055CBC * param0)
     Heap_FreeToHeap(param0);
 }
 
-void sub_02055CD4 (UnkStruct_0203CDB0 * param0, int param1)
+void sub_02055CD4 (FieldSystem * param0, int param1)
 {
     UnkStruct_02027854 * v0;
     UnkStruct_02027BF4 * v1;
@@ -124,7 +124,7 @@ void sub_02055CD4 (UnkStruct_0203CDB0 * param0, int param1)
     }
 }
 
-static void sub_02055D14 (UnkStruct_0203CDB0 * param0, UnkStruct_02055CBC * param1)
+static void sub_02055D14 (FieldSystem * param0, UnkStruct_02055CBC * param1)
 {
     UnkStruct_ov5_021DF47C * v0 = param0->unk_40;
     u32 v1 = ov5_021DF5A8(v0, 17);
@@ -140,7 +140,7 @@ static void sub_02055D48 (UnkStruct_02055CBC * param0)
     ov5_021DF554(param0->unk_60);
 }
 
-static BOOL sub_02055D54 (UnkStruct_0203CDB0 * param0, const VecFx32 * param1)
+static BOOL sub_02055D54 (FieldSystem * param0, const VecFx32 * param1)
 {
     const VecFx32 v0 = {FX32_ONE, FX32_ONE, FX32_ONE};
     MtxFx33 v1;
@@ -154,7 +154,7 @@ static BOOL sub_02055D54 (UnkStruct_0203CDB0 * param0, const VecFx32 * param1)
     }
 }
 
-void sub_02055D94 (UnkStruct_0203CDB0 * param0)
+void sub_02055D94 (FieldSystem * param0)
 {
     int v0 = 0;
     UnkStruct_02061AB4 * v1;
@@ -170,7 +170,7 @@ void sub_02055D94 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-BOOL sub_02055E00 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
+BOOL sub_02055E00 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
 {
     int v0, v1, v2;
     UnkStruct_02027854 * v3 = sub_02027854(param0->unk_0C);
@@ -186,7 +186,7 @@ BOOL sub_02055E00 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
     return sub_0207D570(sub_0207D990(param0->unk_0C), sub_02055C50(v2), v1, 4);
 }
 
-void sub_02055E80 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16 param2)
+void sub_02055E80 (FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -195,7 +195,7 @@ void sub_02055E80 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16
     sub_02027DA8(v1, v0, sub_02055C80(param2));
 }
 
-void sub_02055EAC (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16 param2)
+void sub_02055EAC (FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -204,7 +204,7 @@ void sub_02055EAC (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16
     sub_02027D40(v1, v0, param0->unk_04->unk_18->unk_04, sub_02055C60(param2));
 }
 
-void sub_02055EE0 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
+void sub_02055EE0 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -213,7 +213,7 @@ void sub_02055EE0 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
     sub_02027D78(v1, v0);
 }
 
-int sub_02055F00 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1)
+int sub_02055F00 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -222,7 +222,7 @@ int sub_02055F00 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 *
     return sub_02027D04(v1, v0);
 }
 
-int sub_02055F20 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1)
+int sub_02055F20 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -231,7 +231,7 @@ int sub_02055F20 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 *
     return sub_02027D10(v1, v0);
 }
 
-u16 sub_02055F40 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1)
+u16 sub_02055F40 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -240,7 +240,7 @@ u16 sub_02055F40 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 *
     return sub_02055C50(sub_02027D10(v1, v0));
 }
 
-u16 sub_02055F64 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1)
+u16 sub_02055F64 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -249,7 +249,7 @@ u16 sub_02055F64 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 *
     return sub_02055C70(sub_02027D9C(v1, v0));
 }
 
-int sub_02055F88 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1)
+int sub_02055F88 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -258,7 +258,7 @@ int sub_02055F88 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 *
     return sub_02027D18(v1, v0);
 }
 
-int sub_02055FA8 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1)
+int sub_02055FA8 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -267,7 +267,7 @@ int sub_02055FA8 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 *
     return sub_02027DB4(v1, v0);
 }
 
-u32 sub_02055FC8 (const UnkStruct_0203CDB0 * param0, const UnkStruct_02061AB4 * param1)
+u32 sub_02055FC8 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
 {
     u32 v0 = 0;
 
@@ -301,7 +301,7 @@ static const UnkStruct_ov5_021F8E3C Unk_020EC524[] = {
     {0xfe, 0x0}
 };
 
-static BOOL sub_02056010 (UnkStruct_0203CDB0 * param0, UnkStruct_020562AC * param1, int param2)
+static BOOL sub_02056010 (FieldSystem * param0, UnkStruct_020562AC * param1, int param2)
 {
     int v0, v1;
 
@@ -327,7 +327,7 @@ static BOOL sub_02056010 (UnkStruct_0203CDB0 * param0, UnkStruct_020562AC * para
     return sub_0206326C(param0->unk_38, v0, v1, 0) != NULL;
 }
 
-static UnkStruct_02061AB4 * sub_02056074 (UnkStruct_0203CDB0 * param0, int param1)
+static UnkStruct_02061AB4 * sub_02056074 (FieldSystem * param0, int param1)
 {
     int v0, v1;
 
@@ -344,7 +344,7 @@ static UnkStruct_02061AB4 * sub_02056074 (UnkStruct_0203CDB0 * param0, int param
     return sub_0206326C(param0->unk_38, v0, v1, 0);
 }
 
-static UnkStruct_02061AB4 * sub_020560A8 (UnkStruct_0203CDB0 * param0, UnkStruct_020562AC * param1)
+static UnkStruct_02061AB4 * sub_020560A8 (FieldSystem * param0, UnkStruct_020562AC * param1)
 {
     int v0, v1;
 
@@ -367,7 +367,7 @@ static BOOL sub_020560E4 (UnkStruct_02061AB4 * param0)
     return sub_02062920(param0) == 0x64;
 }
 
-static void sub_020560F8 (UnkStruct_0203CDB0 * param0, UnkStruct_020562AC * param1)
+static void sub_020560F8 (FieldSystem * param0, UnkStruct_020562AC * param1)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -378,7 +378,7 @@ static void sub_020560F8 (UnkStruct_0203CDB0 * param0, UnkStruct_020562AC * para
     }
 }
 
-static void sub_0205610C (UnkStruct_0203CDB0 * param0, UnkStruct_020562AC * param1, const UnkStruct_ov5_021F8E3C * param2)
+static void sub_0205610C (FieldSystem * param0, UnkStruct_020562AC * param1, const UnkStruct_ov5_021F8E3C * param2)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_3C);
     param1->unk_0C = sub_02065700(v0, param2);
@@ -386,7 +386,7 @@ static void sub_0205610C (UnkStruct_0203CDB0 * param0, UnkStruct_020562AC * para
 
 static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020562AC * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -464,7 +464,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_020562AC (UnkStruct_0203CDB0 * param0)
+void sub_020562AC (FieldSystem * param0)
 {
     UnkStruct_020562AC * v0;
 
@@ -477,7 +477,7 @@ void sub_020562AC (UnkStruct_0203CDB0 * param0)
     sub_02050944(param0->unk_10, sub_02056124, v0);
 }
 
-void sub_020562D8 (UnkStruct_0203CDB0 * param0)
+void sub_020562D8 (FieldSystem * param0)
 {
     int v0 = sub_0205EB74(param0->unk_3C);
     u32 v1 = sub_0205EED8(v0);
diff --git a/src/unk_020562F8.c b/src/unk_020562F8.c
index 0dff688664..1d7a0ce934 100644
--- a/src/unk_020562F8.c
+++ b/src/unk_020562F8.c
@@ -42,10 +42,10 @@ struct UnkStruct_020564B4_t {
     int unk_48;
 };
 
-static void sub_0205642C(UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * param1);
-static void sub_02056624(UnkStruct_0203CDB0 * param0, BattleParams * param1, UnkStruct_020564B4 * param2);
-static BOOL sub_02056554(UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * param1, int param2, int param3);
-static BattleParams * sub_0205664C(UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * param1);
+static void sub_0205642C(FieldSystem * param0, UnkStruct_020564B4 * param1);
+static void sub_02056624(FieldSystem * param0, BattleParams * param1, UnkStruct_020564B4 * param2);
+static BOOL sub_02056554(FieldSystem * param0, UnkStruct_020564B4 * param1, int param2, int param3);
+static BattleParams * sub_0205664C(FieldSystem * param0, UnkStruct_020564B4 * param1);
 static sub_020564B4(UnkStruct_020564B4 * param0);
 static void sub_020564D0(UnkStruct_020564B4 * param0);
 static BOOL sub_020564F4(UnkStruct_020564B4 * param0);
@@ -55,7 +55,7 @@ static u32 sub_0205671C(UnkStruct_020564B4 * param0);
 
 static UnkStruct_020564B4 Unk_021C07FC;
 
-void sub_020562F8 (UnkStruct_0203CDB0 * param0)
+void sub_020562F8 (FieldSystem * param0)
 {
     int v0;
     UnkStruct_020564B4 * v1 = &Unk_021C07FC;
@@ -68,7 +68,7 @@ void sub_020562F8 (UnkStruct_0203CDB0 * param0)
     v1->unk_40 = GetTimestamp();
 }
 
-void sub_02056328 (UnkStruct_0203CDB0 * param0)
+void sub_02056328 (FieldSystem * param0)
 {
     UnkStruct_020564B4 * v0 = &Unk_021C07FC;
     UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->unk_0C);
@@ -84,7 +84,7 @@ void sub_02056328 (UnkStruct_0203CDB0 * param0)
     sub_0202CFEC(v1, 17);
 }
 
-BOOL sub_02056374 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+BOOL sub_02056374 (FieldSystem * param0, int param1, int param2)
 {
     if (sub_020564F4(&Unk_021C07FC) == 1) {
         return sub_02056554(param0, &Unk_021C07FC, param1, param2);
@@ -93,32 +93,32 @@ BOOL sub_02056374 (UnkStruct_0203CDB0 * param0, int param1, int param2)
     }
 }
 
-BattleParams * sub_0205639C (UnkStruct_0203CDB0 * param0)
+BattleParams * sub_0205639C (FieldSystem * param0)
 {
     return sub_0205664C(param0, &Unk_021C07FC);
 }
 
-void sub_020563AC (UnkStruct_0203CDB0 * param0, BattleParams * param1)
+void sub_020563AC (FieldSystem * param0, BattleParams * param1)
 {
     sub_02056624(param0, param1, &Unk_021C07FC);
 }
 
-int sub_020563BC (UnkStruct_0203CDB0 * param0)
+int sub_020563BC (FieldSystem * param0)
 {
     return 6 - sub_020564B4(&Unk_021C07FC);
 }
 
-int sub_020563D0 (UnkStruct_0203CDB0 * param0)
+int sub_020563D0 (FieldSystem * param0)
 {
     return sub_02056698(&Unk_021C07FC);
 }
 
-int sub_020563E0 (UnkStruct_0203CDB0 * param0)
+int sub_020563E0 (FieldSystem * param0)
 {
     return sub_0205671C(&Unk_021C07FC);
 }
 
-int sub_020563F0 (UnkStruct_0203CDB0 * param0)
+int sub_020563F0 (FieldSystem * param0)
 {
     return sub_020566AC(&Unk_021C07FC);
 }
@@ -133,7 +133,7 @@ static void sub_02056400 (u32 param0, u8 * param1)
     NARC_ReadFromMemberByIndexPair(param1, NARC_INDEX_ARC__PPARK, 0, v0, sizeof(u8) * 6);
 }
 
-static void sub_0205642C (UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * param1)
+static void sub_0205642C (FieldSystem * param0, UnkStruct_020564B4 * param1)
 {
     int v0;
     u8 v1[8];
@@ -199,7 +199,7 @@ static BOOL sub_020564F4 (UnkStruct_020564B4 * param0)
     return 0;
 }
 
-static int sub_0205650C (UnkStruct_0203CDB0 * param0, int param1, int param2)
+static int sub_0205650C (FieldSystem * param0, int param1, int param2)
 {
     u16 v0 = sub_02054F94(param0, param1, param2);
     int v1;
@@ -216,7 +216,7 @@ static int sub_0205650C (UnkStruct_0203CDB0 * param0, int param1, int param2)
     return 0;
 }
 
-static BOOL sub_02056554 (UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * param1, int param2, int param3)
+static BOOL sub_02056554 (FieldSystem * param0, UnkStruct_020564B4 * param1, int param2, int param3)
 {
     int v0;
     int v1, v2 = 0;
@@ -259,7 +259,7 @@ static BOOL sub_02056554 (UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * para
     return 0;
 }
 
-static void sub_02056624 (UnkStruct_0203CDB0 * param0, BattleParams * param1, UnkStruct_020564B4 * param2)
+static void sub_02056624 (FieldSystem * param0, BattleParams * param1, UnkStruct_020564B4 * param2)
 {
     switch (param1->unk_14) {
     case 0x4:
@@ -272,7 +272,7 @@ static void sub_02056624 (UnkStruct_0203CDB0 * param0, BattleParams * param1, Un
     }
 }
 
-static BattleParams * sub_0205664C (UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * param1)
+static BattleParams * sub_0205664C (FieldSystem * param0, UnkStruct_020564B4 * param1)
 {
     BattleParams * v0;
     Pokemon * v1 = Pokemon_New(32);
diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c
index a10cd8cd61..39072af602 100644
--- a/src/unk_02056B30.c
+++ b/src/unk_02056B30.c
@@ -66,8 +66,8 @@ static BOOL sub_0205711C(UnkStruct_020508D4 * param0);
 static BOOL sub_020571A0(UnkStruct_020508D4 * param0);
 static BOOL sub_02057218(UnkStruct_020508D4 * param0);
 static BOOL sub_020572B8(UnkStruct_020508D4 * param0);
-static void sub_02057300(UnkStruct_0203CDB0 * param0);
-static void sub_02057368(UnkStruct_0203CDB0 * param0);
+static void sub_02057300(FieldSystem * param0);
+static void sub_02057368(FieldSystem * param0);
 
 static const UnkFuncPtr_020EC560 Unk_020EC560[7] = {
     sub_02056DE4,
@@ -117,7 +117,7 @@ void sub_02056B30 (UnkStruct_020508D4 * param0, int param1, int param2, int para
 
 static BOOL sub_02056B70 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056B30 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -137,7 +137,7 @@ static BOOL sub_02056B70 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_02056BDC (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6)
+void sub_02056BDC (FieldSystem * param0, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6)
 {
     UnkStruct_02056BDC * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02056BDC));
 
@@ -151,7 +151,7 @@ void sub_02056BDC (UnkStruct_0203CDB0 * param0, const int param1, const int para
     sub_02050904(param0, sub_02056CFC, v0);
 }
 
-void sub_02056C18 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const int param3, const int param4, const int param5)
+void sub_02056C18 (FieldSystem * param0, const int param1, const int param2, const int param3, const int param4, const int param5)
 {
     int v0;
     int v1;
@@ -204,7 +204,7 @@ void sub_02056C18 (UnkStruct_0203CDB0 * param0, const int param1, const int para
 
 static BOOL sub_02056CFC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
     UnkStruct_02049FA8 * v2 = &v1->unk_08;
 
@@ -256,7 +256,7 @@ static BOOL sub_02056CFC (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02056DE4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
 
     switch (v1->unk_04) {
@@ -275,7 +275,7 @@ static BOOL sub_02056DE4 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02056E20 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
     UnkStruct_ov5_021D432C * v2;
 
@@ -307,7 +307,7 @@ static BOOL sub_02056E20 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02056EA4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
     UnkStruct_ov5_021D432C * v2;
 
@@ -335,7 +335,7 @@ static BOOL sub_02056EA4 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02056F1C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
     UnkStruct_02061AB4 * v2;
 
@@ -381,7 +381,7 @@ static BOOL sub_02056F1C (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02056FC0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
 
@@ -404,7 +404,7 @@ static BOOL sub_02056FC0 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02057008 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
 
@@ -428,7 +428,7 @@ static BOOL sub_02057008 (UnkStruct_020508D4 * param0)
 static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_02056BDC * v2 = sub_02050A64(param0);
     UnkStruct_ov5_021D432C * v3;
 
@@ -481,7 +481,7 @@ static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
 static BOOL sub_0205711C (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_02056BDC * v2 = sub_02050A64(param0);
     UnkStruct_ov5_021D432C * v3;
 
@@ -515,7 +515,7 @@ static BOOL sub_0205711C (UnkStruct_020508D4 * param0)
 
 static BOOL sub_020571A0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
     UnkStruct_ov5_021D432C * v2;
 
@@ -543,7 +543,7 @@ static BOOL sub_020571A0 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02057218 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
     UnkStruct_02061AB4 * v2;
 
@@ -593,7 +593,7 @@ static BOOL sub_02057218 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_020572B8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
 
@@ -614,7 +614,7 @@ static BOOL sub_020572B8 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static void sub_02057300 (UnkStruct_0203CDB0 * param0)
+static void sub_02057300 (FieldSystem * param0)
 {
     int v0;
     VecFx32 v1;
@@ -635,7 +635,7 @@ static void sub_02057300 (UnkStruct_0203CDB0 * param0)
     sub_02020690(sub_0205EAFC(param0->unk_3C), param0->unk_24);
 }
 
-static void sub_02057368 (UnkStruct_0203CDB0 * param0)
+static void sub_02057368 (FieldSystem * param0)
 {
     int v0, v1, v2;
     VecFx32 v3;
diff --git a/src/unk_0205749C.c b/src/unk_0205749C.c
index 7fe078475f..87442cbcd7 100644
--- a/src/unk_0205749C.c
+++ b/src/unk_0205749C.c
@@ -43,7 +43,7 @@ void sub_0205749C (UnkStruct_020508D4 * param0, BOOL param1)
 
 static BOOL sub_020574CC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0205749C * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
diff --git a/src/unk_02057518.c b/src/unk_02057518.c
index ddaf915440..d5f4569bdc 100644
--- a/src/unk_02057518.c
+++ b/src/unk_02057518.c
@@ -65,7 +65,7 @@ UnkStruct_ov23_0224A294 * sub_02057518 (void)
     return Unk_021C0848;
 }
 
-BOOL sub_02057524 (void * param0, UnkStruct_0203CDB0 * param1, BOOL param2)
+BOOL sub_02057524 (void * param0, FieldSystem * param1, BOOL param2)
 {
     int v0, v1;
 
@@ -615,7 +615,7 @@ void sub_02058018 (int param0, int param1, void * param2, void * param3)
     }
 }
 
-void sub_0205805C (UnkStruct_0203CDB0 * param0, BOOL param1)
+void sub_0205805C (FieldSystem * param0, BOOL param1)
 {
     if (Unk_021C0848 == NULL) {
         return;
diff --git a/src/unk_0205964C.c b/src/unk_0205964C.c
index 11c3245feb..e3b23eb31d 100644
--- a/src/unk_0205964C.c
+++ b/src/unk_0205964C.c
@@ -72,7 +72,7 @@ static void sub_02059658 (void)
     return;
 }
 
-void sub_0205965C (UnkStruct_0203CDB0 * param0)
+void sub_0205965C (FieldSystem * param0)
 {
     void * v0;
 
@@ -119,7 +119,7 @@ void sub_020596BC (void)
     Unk_021C084C = NULL;
 }
 
-void sub_02059708 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+void sub_02059708 (FieldSystem * param0, int param1, int param2)
 {
     if (sub_02035E38()) {
         return;
@@ -130,7 +130,7 @@ void sub_02059708 (UnkStruct_0203CDB0 * param0, int param1, int param2)
     sub_020598EC(sub_020598FC, 0);
 }
 
-void sub_02059748 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+void sub_02059748 (FieldSystem * param0, int param1, int param2)
 {
     if (sub_02035E38()) {
         return;
@@ -152,7 +152,7 @@ void sub_020597A4 (void)
     sub_020598EC(sub_02059E80, 0);
 }
 
-void sub_020597B4 (UnkStruct_0203CDB0 * param0)
+void sub_020597B4 (FieldSystem * param0)
 {
     sub_0200F3B0(0, 0x0);
     sub_0200F3B0(1, 0x0);
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 75ff903769..bb463cc781 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -64,7 +64,7 @@ typedef struct {
     Strbuf* unk_0C;
     Strbuf* unk_10;
     Window unk_14;
-    UnkStruct_0203CDB0 * unk_24;
+    FieldSystem * unk_24;
     StringFormatter * unk_28;
     MessageLoader * unk_2C;
     int unk_30;
@@ -124,7 +124,7 @@ static void sub_0205AAA0(UnkStruct_0205A0D8 * param0, BOOL param1);
 static void sub_0205AF18(UnkStruct_0205A0D8 * param0, int param1);
 static BOOL sub_0205AD20(UnkStruct_0205A0D8 * param0);
 
-static void sub_0205A0D8 (UnkStruct_0205A0D8 * param0, UnkStruct_0203CDB0 * param1, Party * param2, int param3, int param4, int param5)
+static void sub_0205A0D8 (UnkStruct_0205A0D8 * param0, FieldSystem * param1, Party * param2, int param3, int param4, int param5)
 {
     PokemonSummary * v0;
     SaveData * v1;
@@ -188,7 +188,7 @@ static void sub_0205A164 (UnkStruct_0205A0D8 * param0, int param1)
     param0->unk_04 = v1;
 }
 
-static BOOL sub_0205A258 (UnkStruct_0205A0D8 * param0, UnkStruct_0203CDB0 * param1)
+static BOOL sub_0205A258 (UnkStruct_0205A0D8 * param0, FieldSystem * param1)
 {
     int v0;
 
@@ -217,7 +217,7 @@ static BOOL sub_0205A258 (UnkStruct_0205A0D8 * param0, UnkStruct_0203CDB0 * para
     return 1;
 }
 
-static BOOL sub_0205A2B0 (UnkStruct_0205A0D8 * param0, UnkStruct_0203CDB0 * param1)
+static BOOL sub_0205A2B0 (UnkStruct_0205A0D8 * param0, FieldSystem * param1)
 {
     PokemonSummary * v0;
 
@@ -261,7 +261,7 @@ static BOOL sub_0205A2FC (void)
 static BOOL sub_0205A324 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0205A0D8 * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     switch (v0->unk_34) {
     case 0:
@@ -658,7 +658,7 @@ static void sub_0205AAA0 (UnkStruct_0205A0D8 * param0, BOOL param1)
     }
 }
 
-void sub_0205AB10 (UnkStruct_0203CDB0 * param0, UnkFuncPtr_0205AB10 * param1)
+void sub_0205AB10 (FieldSystem * param0, UnkFuncPtr_0205AB10 * param1)
 {
     UnkStruct_0205A0D8 * v0;
     UnkStruct_020508D4 * v1 = param0->unk_10;
@@ -744,7 +744,7 @@ static void sub_0205AC28 (UnkStruct_0205A0D8 * param0)
     sub_0205AAA0(param0, 1);
 }
 
-static UnkStruct_0205A0D8 * sub_0205AC74 (UnkStruct_0203CDB0 * param0)
+static UnkStruct_0205A0D8 * sub_0205AC74 (FieldSystem * param0)
 {
     return sub_02050A64(param0->unk_10);
 }
@@ -1014,7 +1014,7 @@ void sub_0205B110 (int param0, int param1, void * param2, void * param3)
 
 static BOOL sub_0205B140 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0205B2D4 * v1 = sub_02050A64(param0);
     UnkStruct_02072014 * v2 = (UnkStruct_02072014 *)sub_02059EBC(v1->unk_24, NULL, 0);
 
@@ -1084,7 +1084,7 @@ static BOOL sub_0205B140 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_0205B2D4 (UnkStruct_0203CDB0 * param0)
+void sub_0205B2D4 (FieldSystem * param0)
 {
     int v0;
     int v1 = CommSys_CurNetId();
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index ee730bc637..00db2ea62f 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -53,7 +53,7 @@ typedef struct {
 } UnkStruct_0205B43C_sub2;
 
 struct UnkStruct_0205B43C_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     SaveData * unk_04;
     TrainerInfo * unk_08;
     SysTask * unk_0C;
@@ -86,7 +86,7 @@ struct UnkStruct_0205B43C_t {
     UnkStruct_02072014 * unk_188[2];
 };
 
-static UnkStruct_0205B43C * sub_0205B3A0(UnkStruct_0203CDB0 * param0);
+static UnkStruct_0205B43C * sub_0205B3A0(FieldSystem * param0);
 static void sub_0205B43C(UnkStruct_0205B43C * param0);
 static void sub_0205B4B0(UnkStruct_0205B43C * param0);
 static void sub_0205B5B4(UnkStruct_0205B43C * param0, UnkFuncPtr_0205B43C param1, int param2);
@@ -106,7 +106,7 @@ static int sub_0205BCD4(int param0, int param1, StringFormatter * param2);
 static void sub_0205B408(UnkStruct_0205B43C * param0);
 static void sub_0205BFF0(UnkStruct_0205B4F8 * param0);
 
-UnkStruct_0205B43C * sub_0205B33C (UnkStruct_0203CDB0 * param0)
+UnkStruct_0205B43C * sub_0205B33C (FieldSystem * param0)
 {
     UnkStruct_0205B43C * v0 = NULL;
 
@@ -133,7 +133,7 @@ UnkStruct_0205B43C * sub_0205B33C (UnkStruct_0203CDB0 * param0)
     return v0;
 }
 
-void sub_0205B388 (UnkStruct_0203CDB0 * param0)
+void sub_0205B388 (FieldSystem * param0)
 {
     if (param0->unk_7C == NULL) {
         return;
@@ -142,7 +142,7 @@ void sub_0205B388 (UnkStruct_0203CDB0 * param0)
     sub_0205B5B4(param0->unk_7C, sub_0205B5FC, 5);
 }
 
-static UnkStruct_0205B43C * sub_0205B3A0 (UnkStruct_0203CDB0 * param0)
+static UnkStruct_0205B43C * sub_0205B3A0 (FieldSystem * param0)
 {
     void * v0;
     SaveData * v1;
@@ -412,7 +412,7 @@ static void sub_0205B754 (UnkStruct_0205B43C * param0)
     Heap_Destroy(31);
 }
 
-UnkStruct_0203CDB0 * sub_0205B770 (UnkStruct_0205B43C * param0)
+FieldSystem * sub_0205B770 (UnkStruct_0205B43C * param0)
 {
     return param0->unk_00;
 }
@@ -633,7 +633,7 @@ void sub_0205B98C (int param0, int param1, void * param2, void * param3)
 
 void sub_0205B990 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param3;
+    FieldSystem * v0 = (FieldSystem *)param3;
 
     sub_0205B5B4(v0->unk_7C, sub_0205B43C, 2);
     sub_0205C160(v0->unk_7C);
@@ -643,7 +643,7 @@ static int Unk_021C0858;
 
 void sub_0205B9AC (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param3;
+    FieldSystem * v0 = (FieldSystem *)param3;
     u8 * v1 = (u8 *)param2;
 
     if (v0->unk_7C->unk_44 == 0) {
@@ -654,7 +654,7 @@ void sub_0205B9AC (int param0, int param1, void * param2, void * param3)
 
 void sub_0205B9C4 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param3;
+    FieldSystem * v0 = (FieldSystem *)param3;
     u8 * v1 = (u8 *)param2;
 
     v0->unk_7C->unk_2C = 1;
@@ -667,7 +667,7 @@ void sub_0205B9C4 (int param0, int param1, void * param2, void * param3)
 
 void sub_0205B9E0 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param3;
+    FieldSystem * v0 = (FieldSystem *)param3;
 
     v0->unk_7C->unk_44 = 1;
 }
@@ -689,7 +689,7 @@ int sub_0205B9EC (UnkStruct_0205B43C * param0, int param1)
 
 void sub_0205BA08 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param3;
+    FieldSystem * v0 = (FieldSystem *)param3;
     UnkStruct_02072014 * v1 = (UnkStruct_02072014 *)param2;
     TrainerInfo * v2 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1);
     void * v3;
@@ -713,7 +713,7 @@ void sub_0205BA08 (int param0, int param1, void * param2, void * param3)
 
 u8 * sub_0205BA5C (int param0, void * param1, int param2)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param1;
+    FieldSystem * v0 = (FieldSystem *)param1;
     UnkStruct_0205B43C * v1 = v0->unk_7C;
 
     return (u8 *)v1->unk_188[param0];
@@ -721,7 +721,7 @@ u8 * sub_0205BA5C (int param0, void * param1, int param2)
 
 void sub_0205BA6C (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param3;
+    FieldSystem * v0 = (FieldSystem *)param3;
     UnkStruct_0205B43C * v1 = v0->unk_7C;
     u8 * v2 = (u8 *)param2;
 
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index e0ae26b63d..818fbef2ea 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -50,7 +50,7 @@ typedef struct UnkStruct_0205D3AC_t {
 } UnkStruct_0205D3AC;
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_0205D094 unk_04;
     UnkStruct_0205D3AC unk_1C0[2];
     int unk_1E0;
@@ -82,7 +82,7 @@ static void sub_0205CA94(SysTask * param0, void * param1);
 static void sub_0205CBFC(SysTask * param0, void * param1);
 static void sub_0205CD3C(SysTask * param0, void * param1);
 static void sub_0205CE7C(SysTask * param0, void * param1);
-static UnkStruct_0205D274 * sub_0205D050(SysTaskFunc func, UnkStruct_0203CDB0 * param1, u32 param2);
+static UnkStruct_0205D274 * sub_0205D050(SysTaskFunc func, FieldSystem * param1, u32 param2);
 static void sub_0205D080(SysTask * param0, UnkStruct_0205D274 * param1);
 void sub_0205D094(UnkStruct_0205D094 * param0, int param1, u32 param2);
 static void sub_0205D0AC(UnkStruct_0205D094 * param0);
@@ -372,7 +372,7 @@ void sub_0205CE7C (SysTask * param0, void * param1)
     }
 }
 
-void sub_0205CFDC (UnkStruct_0203CDB0 * param0, int param1, BOOL * param2)
+void sub_0205CFDC (FieldSystem * param0, int param1, BOOL * param2)
 {
     UnkStruct_0205D274 * v0;
 
@@ -395,7 +395,7 @@ void sub_0205CFDC (UnkStruct_0203CDB0 * param0, int param1, BOOL * param2)
     v0->unk_00 = param0;
 }
 
-UnkStruct_0205D274 * sub_0205D050 (SysTaskFunc func, UnkStruct_0203CDB0 * param1, u32 param2)
+UnkStruct_0205D274 * sub_0205D050 (SysTaskFunc func, FieldSystem * param1, u32 param2)
 {
     UnkStruct_0205D274 * v0;
     SysTask * v1;
diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c
index b33c242ffb..52cc25cc6e 100644
--- a/src/unk_0205DFC4.c
+++ b/src/unk_0205DFC4.c
@@ -292,7 +292,7 @@ BOOL HasAllLegendaryTitansInParty (SaveData * param0)
 static BOOL sub_0205E268 (UnkStruct_020508D4 * param0)
 {
     VecFx32 v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_0205E268 * v2 = sub_02050A64(param0);
 
     v0.x = FX32_CONST(8);
@@ -322,7 +322,7 @@ static BOOL sub_0205E268 (UnkStruct_020508D4 * param0)
 
 void sub_0205E318 (UnkStruct_020508D4 * param0, UnkStruct_02061AB4 * param1, u16 param2, u16 param3, u16 param4, u16 param5)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0205E268 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E268));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0205E268));
@@ -338,7 +338,7 @@ void sub_0205E318 (UnkStruct_020508D4 * param0, UnkStruct_02061AB4 * param1, u16
 
 static BOOL sub_0205E3AC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0205E3AC * v1 = sub_02050A64(param0);
 
     sub_02062D64(v1->unk_00, v1->unk_09);
@@ -358,7 +358,7 @@ static BOOL sub_0205E3AC (UnkStruct_020508D4 * param0)
 
 void sub_0205E3F4 (UnkStruct_020508D4 * param0, UnkStruct_02061AB4 * param1, u16 param2, u16 param3)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0205E3AC * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E3AC));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0205E3AC));
diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c
index 019f96ea4e..21f4efb9bf 100644
--- a/src/unk_0205E7D0.c
+++ b/src/unk_0205E7D0.c
@@ -702,7 +702,7 @@ u32 sub_0205EED8 (int param0)
     return 1 << 0;
 }
 
-UnkStruct_0205E884 * sub_0205EF3C (UnkStruct_0203CDB0 * param0)
+UnkStruct_0205E884 * sub_0205EF3C (FieldSystem * param0)
 {
     return param0->unk_3C;
 }
diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c
index b457cb1aae..87878ca8ee 100644
--- a/src/unk_0205F180.c
+++ b/src/unk_0205F180.c
@@ -202,7 +202,7 @@ static int sub_0205F22C (UnkStruct_0205E884 * param0, int param1)
             v2 = sub_020611FC(param0, v1, param1);
 
             if ((v2 & (~(1 << 7))) && (sub_0205F108(param0) == 2)) {
-                UnkStruct_0203CDB0 * v3 = sub_02062C00(v1);
+                FieldSystem * v3 = sub_02062C00(v1);
                 int v4, v5 = sub_02063020(v1);
                 int v6, v7 = sub_02063030(v1);
                 int v8, v9 = sub_02063040(v1);
@@ -704,7 +704,7 @@ static int sub_0205FAB0 (UnkStruct_0205E884 * param0, int param1)
     int v0;
     VecFx32 v1, v2;
     UnkStruct_02061AB4 * v3 = sub_0205EB3C(param0);
-    UnkStruct_0203CDB0 * v4 = sub_02062C00(v3);
+    FieldSystem * v4 = sub_02062C00(v3);
 
     sub_02063050(v3, &v1);
     v2 = v1;
@@ -990,7 +990,7 @@ static void sub_0205FECC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     v0 = sub_020611FC(param0, param1, param2);
 
     if ((v0 & (~(1 << 7)))) {
-        UnkStruct_0203CDB0 * v3 = sub_02062C00(param1);
+        FieldSystem * v3 = sub_02062C00(param1);
         int v4 = sub_02063020(param1);
         int v5 = sub_02063030(param1);
         int v6 = sub_02063040(param1);
@@ -1759,7 +1759,7 @@ static u32 sub_02060C24 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
 
     {
         s8 v6;
-        UnkStruct_0203CDB0 * v7 = sub_02062C00(param1);
+        FieldSystem * v7 = sub_02062C00(param1);
 
         if (sub_0205507C(v7, &v0, v3, v5, &v6) == 1) {
             v1 |= (1 << 1);
@@ -1784,7 +1784,7 @@ static u32 sub_02060C24 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
 static int sub_02060CE4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param1);
+        FieldSystem * v0 = sub_02062C00(param1);
         int v1 = sub_02063020(param1) + sub_0206419C(param2);
         int v2 = sub_02063040(param1) + sub_020641A8(param2);
 
@@ -1828,7 +1828,7 @@ static int sub_02060D98 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     BOOL v0 = 0;
 
     if (param2 != -1) {
-        UnkStruct_0203CDB0 * v1 = sub_02062C00(param1);
+        FieldSystem * v1 = sub_02062C00(param1);
         int v2 = sub_02063020(param1) + sub_0206419C(param2);
         int v3 = sub_02063040(param1) + sub_020641A8(param2);
         u8 v4 = sub_02054F94(v1, v2, v3);
@@ -1863,7 +1863,7 @@ static int sub_02060D98 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
 static int sub_02060E40 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param1);
+        FieldSystem * v0 = sub_02062C00(param1);
         int v1 = sub_02063020(param1);
         int v2 = sub_02063040(param1);
         u8 v3 = sub_02054F94(v0, v1, v2);
@@ -1906,7 +1906,7 @@ static int sub_02060E40 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
 static int sub_02060EE4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param1);
+        FieldSystem * v0 = sub_02062C00(param1);
         int v1 = sub_02063020(param1) + sub_0206419C(param2);
         int v2 = sub_02063040(param1) + sub_020641A8(param2);
         u8 v3 = sub_02054F94(v0, v1, v2);
@@ -1926,7 +1926,7 @@ static int sub_02060EE4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
 static int sub_02060F4C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param1);
+        FieldSystem * v0 = sub_02062C00(param1);
         int v1 = sub_02063020(param1) + sub_0206419C(param2);
         int v2 = sub_02063040(param1) + sub_020641A8(param2);
         u8 v3 = sub_02054F94(v0, v1, v2);
@@ -1942,7 +1942,7 @@ static int sub_02060F4C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
 static int sub_02060FA8 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param1);
+        FieldSystem * v0 = sub_02062C00(param1);
         int v1 = sub_02063020(param1) + sub_0206419C(param2);
         int v2 = sub_02063040(param1) + sub_020641A8(param2);
         u8 v3 = sub_02054F94(v0, v1, v2);
@@ -1976,7 +1976,7 @@ static int sub_02060FA8 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
 static int sub_02061058 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if ((param2 != -1) && (sub_0205EB74(param0) == 0x1)) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param1);
+        FieldSystem * v0 = sub_02062C00(param1);
         int v1 = sub_02063020(param1) + sub_0206419C(param2);
         int v2 = sub_02063040(param1) + sub_020641A8(param2);
         u8 v3 = sub_02054F94(v0, v1, v2);
@@ -2008,7 +2008,7 @@ static int sub_02061058 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
 static int sub_02061100 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     u32 v0 = 0;
-    UnkStruct_0203CDB0 * v1 = sub_02062C00(param1);
+    FieldSystem * v1 = sub_02062C00(param1);
 
     if (sub_02071CB4(v1, 9) == 1) {
         int v2 = sub_02063020(param1);
@@ -2034,7 +2034,7 @@ static int sub_02061100 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
 static int sub_02061180 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param1);
+        FieldSystem * v0 = sub_02062C00(param1);
 
         if (sub_02071CB4(v0, 9) == 1) {
             BOOL v1;
@@ -2086,7 +2086,7 @@ static int sub_02061248 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     BOOL v0 = 0;
 
     if ((param2 != -1) && (sub_0205F108(param0) == 2)) {
-        UnkStruct_0203CDB0 * v1 = sub_02062C00(param1);
+        FieldSystem * v1 = sub_02062C00(param1);
 
         if (sub_02071CB4(v1, 9) == 1) {
             u32 v2;
@@ -2371,7 +2371,7 @@ void sub_020615AC (UnkStruct_0205E884 * param0, int * param1, int * param2)
 static void sub_020615C8 (UnkStruct_0205E884 * param0)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02062C00(v0);
+    FieldSystem * v1 = sub_02062C00(v0);
     UnkStruct_0202CD88 * v2 = sub_0202CD88(v1->unk_0C);
 
     sub_0202CF28(v2, (0 + 0));
@@ -2464,7 +2464,7 @@ u32 sub_020616F0 (UnkStruct_0205E884 * param0, int param1)
         v0 = sub_0206156C(param0, param1);
     } else {
         UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
-        UnkStruct_0203CDB0 * v2 = sub_02062C00(v1);
+        FieldSystem * v2 = sub_02062C00(v1);
         int v3 = sub_02063020(v1);
         int v4 = ((sub_02063030(v1) / 2));
         int v5 = sub_02063040(v1);
@@ -2480,7 +2480,7 @@ u32 sub_02061760 (UnkStruct_0205E884 * param0)
 {
     u32 v0;
     UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
-    UnkStruct_0203CDB0 * v2 = sub_02062C00(v1);
+    FieldSystem * v2 = sub_02062C00(v1);
     int v3 = sub_02063020(v1);
     int v4 = ((sub_02063030(v1) / 2));
     int v5 = sub_02063040(v1);
diff --git a/src/unk_02061804.c b/src/unk_02061804.c
index af0a092b39..082319b88f 100644
--- a/src/unk_02061804.c
+++ b/src/unk_02061804.c
@@ -45,7 +45,7 @@ typedef struct UnkStruct_02061830_t {
     UnkStruct_ov5_021ED0A4 unk_18;
     UnkStruct_02061830_sub1 * unk_120;
     UnkStruct_02061AB4 * unk_124;
-    UnkStruct_0203CDB0 * unk_128;
+    FieldSystem * unk_128;
 } UnkStruct_02061830;
 
 typedef struct UnkStruct_02061AB4_t {
@@ -111,7 +111,7 @@ typedef struct {
 } UnkStruct_020620C4;
 
 static UnkStruct_02061830 * sub_020618C8(int param0);
-static void sub_02061D3C(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, UnkStruct_02061D3C * param2);
+static void sub_02061D3C(FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_02061D3C * param2);
 static void sub_02061E80(UnkStruct_02061AB4 * param0, UnkStruct_02061D3C * param1);
 static void sub_02061FA8(const UnkStruct_02061830 * param0, UnkStruct_02061AB4 * param1);
 static void sub_02061FF0(UnkStruct_02061AB4 * param0);
@@ -120,7 +120,7 @@ static void sub_020620C4(UnkStruct_020620C4 * param0);
 static UnkStruct_02061AB4 * sub_02062120(const UnkStruct_02061830 * param0);
 static UnkStruct_02061AB4 * sub_02062154(const UnkStruct_02061830 * param0, int param1, int param2);
 static void sub_020621AC(const UnkStruct_02061830 * param0, UnkStruct_02061AB4 * param1);
-static void sub_020621E8(UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1, UnkStruct_0203CDB0 * param2);
+static void sub_020621E8(UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1, FieldSystem * param2);
 static void sub_020622B8(UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1);
 static void sub_0206234C(UnkStruct_02061AB4 * param0, const UnkStruct_02061830 * param1);
 static void sub_0206239C(UnkStruct_02061AB4 * param0);
@@ -131,7 +131,7 @@ static UnkStruct_02061AB4 * sub_020624CC(const UnkStruct_02061830 * param0, int
 static void sub_02062604(UnkStruct_02061AB4 * param0);
 static void sub_02062618(UnkStruct_02061AB4 * param0);
 static void sub_02062628(UnkStruct_02061AB4 * param0);
-static int sub_0206262C(UnkStruct_0203CDB0 * param0, int param1);
+static int sub_0206262C(FieldSystem * param0, int param1);
 static void sub_02062648(UnkStruct_02061AB4 * param0);
 static void sub_02062660(UnkStruct_02061AB4 * param0);
 static void sub_02062670(UnkStruct_02061AB4 * param0);
@@ -160,7 +160,7 @@ static UnkFuncPtr_ov5_021FB0F0_1 sub_02063234(const UnkStruct_ov5_021FB0F0 * par
 static UnkFuncPtr_ov5_021FB0F0_2 sub_02063238(const UnkStruct_ov5_021FB0F0 * param0);
 static const UnkStruct_ov5_021FB0F0 * sub_02063244(u32 param0);
 
-UnkStruct_02061830 * sub_02061804 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+UnkStruct_02061830 * sub_02061804 (FieldSystem * param0, int param1, int param2)
 {
     UnkStruct_02061830 * v0;
 
@@ -310,7 +310,7 @@ UnkStruct_02061AB4 * sub_02061A74 (const UnkStruct_02061830 * param0, int param1
 
     if (v1 != NULL) {
         int v2 = sub_02063114(v1);
-        UnkStruct_0203CDB0 * v3 = sub_02062894(param0);
+        FieldSystem * v3 = sub_02062894(param0);
 
         if (sub_0203F188(v3, v2) == 0) {
             v0 = sub_02061918(param0, v1, param3);
@@ -456,7 +456,7 @@ void sub_02061C48 (UnkStruct_02061830 * param0)
     }
 }
 
-void sub_02061CA8 (UnkStruct_0203CDB0 * param0, const UnkStruct_02061830 * param1, UnkStruct_02061D3C * param2, int param3)
+void sub_02061CA8 (FieldSystem * param0, const UnkStruct_02061830 * param1, UnkStruct_02061D3C * param2, int param3)
 {
     int v0 = 0;
     UnkStruct_02061AB4 * v1;
@@ -491,7 +491,7 @@ void sub_02061D04 (const UnkStruct_02061830 * param0, UnkStruct_02061D3C * param
     }
 }
 
-static void sub_02061D3C (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, UnkStruct_02061D3C * param2)
+static void sub_02061D3C (FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_02061D3C * param2)
 {
     param2->unk_00 = sub_020628B8(param1);
     param2->unk_04 = sub_020628EC(param1);
@@ -649,7 +649,7 @@ void sub_02062068 (const UnkStruct_02061830 * param0, int param1, int param2, co
 static void sub_020620C4 (UnkStruct_020620C4 * param0)
 {
     UnkStruct_02061AB4 * v0;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
     const UnkStruct_020619DC * v2;
 
     v1 = sub_02062894(param0->unk_0C);
@@ -726,7 +726,7 @@ static void sub_020621AC (const UnkStruct_02061830 * param0, UnkStruct_02061AB4
     sub_02062A1C(param1, v2);
 }
 
-static void sub_020621E8 (UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1, UnkStruct_0203CDB0 * param2)
+static void sub_020621E8 (UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1, FieldSystem * param2)
 {
     sub_0206290C(param0, sub_020630F4(param1));
     sub_0206291C(param0, sub_0206262C(param2, sub_020630FC(param1)));
@@ -961,7 +961,7 @@ static void sub_02062628 (UnkStruct_02061AB4 * param0)
     (void)0;
 }
 
-static int sub_0206262C (UnkStruct_0203CDB0 * param0, int param1)
+static int sub_0206262C (FieldSystem * param0, int param1)
 {
     if ((param1 >= 0x65) && (param1 <= 0x74)) {
         param1 -= 0x65;
@@ -1186,12 +1186,12 @@ void sub_02062880 (const UnkStruct_02061AB4 ** param0)
     (*param0)++;
 }
 
-void sub_0206288C (UnkStruct_02061830 * param0, UnkStruct_0203CDB0 * param1)
+void sub_0206288C (UnkStruct_02061830 * param0, FieldSystem * param1)
 {
     param0->unk_128 = param1;
 }
 
-UnkStruct_0203CDB0 * sub_02062894 (const UnkStruct_02061830 * param0)
+FieldSystem * sub_02062894 (const UnkStruct_02061830 * param0)
 {
     return param0->unk_128;
 }
@@ -1689,7 +1689,7 @@ u32 sub_02062BF8 (const UnkStruct_02061AB4 * param0)
     return param0->unk_AE;
 }
 
-UnkStruct_0203CDB0 * sub_02062C00 (const UnkStruct_02061AB4 * param0)
+FieldSystem * sub_02062C00 (const UnkStruct_02061AB4 * param0)
 {
     UnkStruct_02061830 * v0;
 
diff --git a/src/unk_02063400.c b/src/unk_02063400.c
index e398561dcb..13488d0c8d 100644
--- a/src/unk_02063400.c
+++ b/src/unk_02063400.c
@@ -572,7 +572,7 @@ u32 sub_02063E18 (const UnkStruct_02061AB4 * param0, const VecFx32 * param1, int
 
     {
         s8 v1;
-        UnkStruct_0203CDB0 * v2 = sub_02062C00(param0);
+        FieldSystem * v2 = sub_02062C00(param0);
 
         if (sub_02055024(v2, param1, param2, param4, &v1) == 1) {
             v0 |= (1 << 1);
@@ -703,7 +703,7 @@ int sub_02063FAC (const UnkStruct_02061AB4 * param0, int param1, int param2, int
 int sub_02064004 (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
 {
     if (sub_02062FDC(param0) == 0) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+        FieldSystem * v0 = sub_02062C00(param0);
         u8 v1 = sub_02062BE8(param0);
         u8 v2 = sub_02054F94(v0, param1, param2);
 
@@ -871,7 +871,7 @@ u32 sub_02064238 (UnkStruct_02061AB4 * param0, int param1)
 {
     int v0 = sub_02063020(param0) + sub_0206419C(param1);
     int v1 = sub_02063040(param0) + sub_020641A8(param1);
-    UnkStruct_0203CDB0 * v2 = sub_02062C00(param0);
+    FieldSystem * v2 = sub_02062C00(param0);
     u8 v3 = sub_02054F94(v2, v0, v1);
 
     return v3;
@@ -928,7 +928,7 @@ int sub_020642F8 (UnkStruct_02061AB4 * param0)
 
     {
         int v2 = sub_02062FAC(param0);
-        UnkStruct_0203CDB0 * v3 = sub_02062C00(param0);
+        FieldSystem * v3 = sub_02062C00(param0);
         int v4 = sub_020644D0(v3, &v1, v2);
 
         if (v4 == 1) {
@@ -953,7 +953,7 @@ int sub_02064390 (UnkStruct_02061AB4 * param0)
     if (sub_02062FDC(param0) == 0) {
         int v2 = sub_02063008(param0);
         int v3 = sub_02063018(param0);
-        UnkStruct_0203CDB0 * v4 = sub_02062C00(param0);
+        FieldSystem * v4 = sub_02062C00(param0);
 
         v0 = sub_02054F94(v4, v2, v3);
         v2 = sub_02063020(param0);
@@ -1035,7 +1035,7 @@ int sub_02064488 (int param0, int param1, int param2, int param3)
     return(1);
 }
 
-int sub_020644A4 (UnkStruct_0203CDB0 * param0, VecFx32 * param1)
+int sub_020644A4 (FieldSystem * param0, VecFx32 * param1)
 {
     fx32 v0;
     u8 v1;
@@ -1050,7 +1050,7 @@ int sub_020644A4 (UnkStruct_0203CDB0 * param0, VecFx32 * param1)
     return 1;
 }
 
-int sub_020644D0 (UnkStruct_0203CDB0 * param0, VecFx32 * param1, int param2)
+int sub_020644D0 (FieldSystem * param0, VecFx32 * param1, int param2)
 {
     fx32 v0;
     u8 v1;
diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c
index 1fc965e9e9..98d24a1589 100644
--- a/src/unk_0206450C.c
+++ b/src/unk_0206450C.c
@@ -1104,7 +1104,7 @@ static void sub_02065100 (UnkStruct_0206502C * param0)
 static int sub_02065124 (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param1)
 {
     if (sub_02062950(param0) == 0xa) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+        FieldSystem * v0 = sub_02062C00(param0);
         UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
         int v2 = sub_0206298C(param0);
         int v3 = sub_020629D8(param0, 0);
@@ -1284,7 +1284,7 @@ static int sub_0206537C (UnkStruct_02061AB4 * param0)
     }
 
     {
-        UnkStruct_0203CDB0 * v1 = sub_02062C00(param0);
+        FieldSystem * v1 = sub_02062C00(param0);
         UnkStruct_0205E884 * v2 = sub_0205EF3C(v1);
 
         if (sub_0206140C(v2) == 0) {
@@ -1374,7 +1374,7 @@ static int sub_02065448 (UnkStruct_02061AB4 * param0, int param1, int param2)
                 int v4 = -1, v5 = -1;
                 int v6 = sub_02063020(param0);
                 int v7 = sub_02063040(param0);
-                UnkStruct_0203CDB0 * v8 = sub_02062C00(param0);
+                FieldSystem * v8 = sub_02062C00(param0);
                 UnkStruct_0205E884 * v9 = sub_0205EF3C(v8);
                 int v10 = sub_0205EABC(v9);
                 int v11 = sub_0205EAC8(v9);
diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c
index b2b2ae17ab..45852c8f16 100644
--- a/src/unk_02067A84.c
+++ b/src/unk_02067A84.c
@@ -45,18 +45,18 @@ typedef struct {
     UnkStruct_ov101_021D5D90 * unk_20;
     UnkStruct_02061AB4 * unk_24;
     UnkStruct_0205E884 * unk_28;
-    UnkStruct_0203CDB0 * unk_2C;
+    FieldSystem * unk_2C;
 } UnkStruct_020EF6D0;
 
-static int sub_02067BA8(UnkStruct_0203CDB0 * param0, UnkStruct_02061830 * param1, UnkStruct_0205E884 * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4);
+static int sub_02067BA8(FieldSystem * param0, UnkStruct_02061830 * param1, UnkStruct_0205E884 * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4);
 static void sub_02067C28(UnkStruct_02067C28 * param0, UnkStruct_02061AB4 * param1, int param2, int param3);
 static int sub_02067C54(const UnkStruct_02061AB4 * param0);
 static int sub_02067C80(const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 * param1, int * param2);
 static int sub_02067DA8(const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4, int param5);
 static int sub_02067E74(const UnkStruct_02061AB4 * param0, int param1, int param2);
 static int sub_02067F14(UnkStruct_02061AB4 * param0);
-static UnkStruct_02061AB4 * sub_02067F2C(UnkStruct_0203CDB0 * param0, UnkStruct_02061830 * param1, UnkStruct_02061AB4 * param2, int param3);
-static SysTask * sub_02067FF0(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7);
+static UnkStruct_02061AB4 * sub_02067F2C(FieldSystem * param0, UnkStruct_02061830 * param1, UnkStruct_02061AB4 * param2, int param3);
+static SysTask * sub_02067FF0(FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7);
 static int sub_02068048(SysTask * param0);
 static void sub_02068054(SysTask * param0);
 static void sub_0206806C(SysTask * param0, void * param1);
@@ -64,7 +64,7 @@ static void sub_0206806C(SysTask * param0, void * param1);
 int(*const Unk_020EF6C0[])(const UnkStruct_02061AB4 *, int, int, int, int);
 int(*const Unk_020EF6D0[])(UnkStruct_020EF6D0 *);
 
-int sub_02067A84 (UnkStruct_0203CDB0 * param0, BOOL param1)
+int sub_02067A84 (FieldSystem * param0, BOOL param1)
 {
     UnkStruct_02067C28 v0;
     UnkStruct_02061830 * v1 = param0->unk_38;
@@ -113,7 +113,7 @@ int sub_02067A84 (UnkStruct_0203CDB0 * param0, BOOL param1)
     return 0;
 }
 
-static int sub_02067BA8 (UnkStruct_0203CDB0 * param0, UnkStruct_02061830 * param1, UnkStruct_0205E884 * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4)
+static int sub_02067BA8 (FieldSystem * param0, UnkStruct_02061830 * param1, UnkStruct_0205E884 * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4)
 {
     int v0, v1, v2;
     UnkStruct_02061AB4 * v3;
@@ -358,7 +358,7 @@ int sub_02067F24 (UnkStruct_02061AB4 * param0)
     return sub_02067F14(param0);
 }
 
-static UnkStruct_02061AB4 * sub_02067F2C (UnkStruct_0203CDB0 * param0, UnkStruct_02061830 * param1, UnkStruct_02061AB4 * param2, int param3)
+static UnkStruct_02061AB4 * sub_02067F2C (FieldSystem * param0, UnkStruct_02061830 * param1, UnkStruct_02061AB4 * param2, int param3)
 {
     int v0;
     UnkStruct_02061AB4 * v1;
@@ -381,7 +381,7 @@ static UnkStruct_02061AB4 * sub_02067F2C (UnkStruct_0203CDB0 * param0, UnkStruct
     return NULL;
 }
 
-int sub_02067F88 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
+int sub_02067F88 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
 {
     int v0 = sub_02067C54(param1);
 
@@ -394,7 +394,7 @@ int sub_02067F88 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1)
     return 0;
 }
 
-SysTask * sub_02067FB8 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7)
+SysTask * sub_02067FB8 (FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7)
 {
     return sub_02067FF0(param0, param1, param2, param3, param4, param5, param6, param7);
 }
@@ -410,7 +410,7 @@ void sub_02067FE8 (SysTask * param0)
     sub_02068054(param0);
 }
 
-static SysTask * sub_02067FF0 (UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7)
+static SysTask * sub_02067FF0 (FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7)
 {
     SysTask * v0;
     UnkStruct_020EF6D0 * v1;
diff --git a/src/unk_02068344.c b/src/unk_02068344.c
index a0cdff9a18..52493f239e 100644
--- a/src/unk_02068344.c
+++ b/src/unk_02068344.c
@@ -61,7 +61,7 @@ const static UnkFuncPtr_020EF770 Unk_020EF770[11] = {
     ov5_021F83D4
 };
 
-void sub_02068344 (UnkStruct_0203CDB0 * param0)
+void sub_02068344 (FieldSystem * param0)
 {
     int v0;
     UnkStruct_02027860 * v1;
@@ -76,7 +76,7 @@ void sub_02068344 (UnkStruct_0203CDB0 * param0)
     Unk_020EF744[v0](param0);
 }
 
-void sub_02068368 (UnkStruct_0203CDB0 * param0)
+void sub_02068368 (FieldSystem * param0)
 {
     int v0;
     UnkStruct_02027860 * v1;
@@ -93,7 +93,7 @@ void sub_02068368 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-BOOL sub_02068390 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
+BOOL sub_02068390 (FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4)
 {
     int v0;
     UnkStruct_02027860 * v1;
@@ -115,7 +115,7 @@ BOOL sub_02068390 (UnkStruct_0203CDB0 * param0, const int param1, const int para
     return 0;
 }
 
-BOOL sub_020683D8 (UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, int param4)
+BOOL sub_020683D8 (FieldSystem * param0, const int param1, const int param2, const fx32 param3, int param4)
 {
     if (param0->unk_1C->unk_00 == 67) {
         if (ov8_0224B714(param0, param1, param2, param4)) {
diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c
index aff89c3b9c..acea2d4535 100644
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -71,7 +71,7 @@
 typedef void *(* UnkFuncPtr_02068870)(void *);
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     UnkStruct_020684D0 unk_04;
     UnkFuncPtr_02068870 unk_20;
     void * unk_24;
@@ -102,8 +102,8 @@ typedef struct {
     u16 unk_16;
 } UnkStruct_02068EFC;
 
-void * sub_0203D8AC(UnkStruct_0203CDB0 * param0);
-static void sub_020684D0(UnkStruct_0203CDB0 * param0, UnkStruct_020684D0 * param1);
+void * sub_0203D8AC(FieldSystem * param0);
+static void sub_020684D0(FieldSystem * param0, UnkStruct_020684D0 * param1);
 static void sub_02068630(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1);
 static void sub_020686C8(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1);
 static void sub_02068710(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1);
@@ -206,7 +206,7 @@ u32 sub_020683F4 (u16 param0, u16 param1)
     return (u32)Unk_020EF79C[param1].unk_08;
 }
 
-void sub_0206842C (UnkStruct_0203CDB0 * param0, UnkStruct_020684D0 * param1)
+void sub_0206842C (FieldSystem * param0, UnkStruct_020684D0 * param1)
 {
     int v0, v1, v2;
     UnkStruct_02061AB4 * v3;
@@ -250,7 +250,7 @@ void sub_0206842C (UnkStruct_0203CDB0 * param0, UnkStruct_020684D0 * param1)
     param1->unk_14 = param0->unk_3C;
 }
 
-static void sub_020684D0 (UnkStruct_0203CDB0 * param0, UnkStruct_020684D0 * param1)
+static void sub_020684D0 (FieldSystem * param0, UnkStruct_020684D0 * param1)
 {
     param1->unk_18 = param0;
     param1->unk_00 = param0->unk_1C->unk_00;
@@ -284,7 +284,7 @@ static UnkStruct_0206851C * sub_0206851C (u32 param0, u16 param1, u16 param2, u1
 
 static void sub_02068540 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1, u32 param2)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -305,7 +305,7 @@ static void sub_02068584 (UnkStruct_02068870 * param0, u32 param1)
 
 static BOOL sub_020685AC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206851C * v1 = sub_02050A64(param0);
     int * v2 = sub_02050A68(param0);
     UnkStruct_02061AB4 * v3;
@@ -332,7 +332,7 @@ static BOOL sub_020685AC (UnkStruct_020508D4 * param0)
 
 static void sub_02068630 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     PartyManagementData * v2;
 
@@ -361,7 +361,7 @@ static void sub_02068630 (UnkStruct_02068630 * param0, const UnkStruct_020684D0
 
 static void sub_020686C8 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -384,7 +384,7 @@ static void * sub_02068708 (void * param0)
 
 static void sub_02068710 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -456,7 +456,7 @@ static u32 sub_0206877C (const UnkStruct_020684D0 * param0)
 
 static void sub_0206883C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -477,7 +477,7 @@ static BOOL sub_02068870 (UnkStruct_02068870 * param0)
 
 static BOOL sub_02068884 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     int * v1;
 
     v0 = sub_02050A60(param0);
@@ -561,7 +561,7 @@ static u32 sub_02068948 (const UnkStruct_020684D0 * param0)
 
 static void sub_020689EC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -585,7 +585,7 @@ static void * sub_02068A28 (void * param0)
 
 static void sub_02068A34 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     PartyManagementData * v2;
 
@@ -614,7 +614,7 @@ static void sub_02068A34 (UnkStruct_02068630 * param0, const UnkStruct_020684D0
 
 static void sub_02068ACC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_02097728 * v2;
 
@@ -635,7 +635,7 @@ static u32 sub_02068B18 (const UnkStruct_020684D0 * param0)
 
 static void sub_02068B1C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_02061AB4 * v2;
 
@@ -660,7 +660,7 @@ BOOL sub_02068B50 (const UnkStruct_020684D0 * param0)
 
 static void sub_02068B5C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_0203D9B8 * v2;
 
@@ -685,7 +685,7 @@ static void * sub_02068B9C (void * param0)
 
 static void sub_02068BA8 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -704,13 +704,13 @@ static BOOL sub_02068BDC (UnkStruct_02068870 * param0)
 
 static void * sub_02068BEC (void * param0)
 {
-    sub_0203DE78(param0, ((UnkStruct_0203CDB0 *)param0)->unk_0C);
+    sub_0203DE78(param0, ((FieldSystem *)param0)->unk_0C);
     return NULL;
 }
 
 static void sub_02068BF8 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     int * v2;
 
@@ -793,7 +793,7 @@ static u32 sub_02068CE0 (const UnkStruct_020684D0 * param0)
 
 static void sub_02068CF0 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_ov5_021F0468 * v2;
     int v3;
@@ -837,7 +837,7 @@ static u32 sub_02068D68 (const UnkStruct_020684D0 * param0)
 
 static void sub_02068D80 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -860,7 +860,7 @@ static BOOL sub_02068DBC (UnkStruct_02068870 * param0)
 
 static void sub_02068DDC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -883,7 +883,7 @@ static BOOL sub_02068E18 (UnkStruct_02068870 * param0)
 
 static void sub_02068E38 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -944,7 +944,7 @@ static BOOL sub_02068EFC (UnkStruct_02068870 * param0)
 
 static BOOL sub_02068F48 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_02068EFC * v1;
 
     v0 = sub_02050A60(param0);
@@ -985,7 +985,7 @@ static BOOL sub_02068F48 (UnkStruct_020508D4 * param0)
 
 static void sub_02068FEC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     PartyManagementData * v2;
 
@@ -1013,7 +1013,7 @@ static void sub_02068FEC (UnkStruct_02068630 * param0, const UnkStruct_020684D0
 
 static void sub_02069080 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -1043,7 +1043,7 @@ static u32 sub_020690C4 (const UnkStruct_020684D0 * param0)
 
 static BOOL sub_020690F0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     void * v1 = ov6_02247100(v0, 11);
 
     sub_02050924(param0, ov6_02247120, v1);
@@ -1086,7 +1086,7 @@ static u32 sub_02069130 (const UnkStruct_020684D0 * param0)
 
 static void sub_02069188 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -1106,14 +1106,14 @@ static BOOL sub_020691BC (UnkStruct_02068870 * param0)
 static void * sub_020691CC (void * param0)
 {
     ov5_021E2064(param0);
-    sub_0203DE88(param0, ((UnkStruct_0203CDB0 *)param0)->unk_0C);
+    sub_0203DE88(param0, ((FieldSystem *)param0)->unk_0C);
 
     return NULL;
 }
 
 static void sub_020691E0 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     PartyManagementData * v2;
 
@@ -1136,7 +1136,7 @@ static void * sub_02069228 (void * param0)
     return sub_0203E598(param0, 11, 466);
 }
 
-BOOL sub_02069238 (UnkStruct_0203CDB0 * param0)
+BOOL sub_02069238 (FieldSystem * param0)
 {
     UnkStruct_02068870 * v0;
     UnkFuncPtr_020EF79C v1;
@@ -1204,7 +1204,7 @@ static void sub_020692E4 (UnkStruct_02068870 * param0, u32 param1)
 
 static BOOL sub_0206932C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_02068870 * v1;
 
     v0 = sub_02050A60(param0);
diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c
index 7c66760d1e..927324826f 100644
--- a/src/unk_02069BE0.c
+++ b/src/unk_02069BE0.c
@@ -155,7 +155,7 @@ static int sub_02069CA8 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param
 
 static void sub_02069CD4 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+    FieldSystem * v0 = sub_02062C00(param0);
     UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
 
     param1->unk_01 = 1;
@@ -166,7 +166,7 @@ static void sub_02069CD4 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * para
 
 static int sub_02069CFC (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+    FieldSystem * v0 = sub_02062C00(param0);
     UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
 
     if (v1 != NULL) {
@@ -183,7 +183,7 @@ static int sub_02069CFC (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param
 
 static void sub_02069D30 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+    FieldSystem * v0 = sub_02062C00(param0);
     UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
 
     param1->unk_02 = sub_0205EABC(v1);
@@ -193,7 +193,7 @@ static void sub_02069D30 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * para
 static u32 sub_02069D50 (UnkStruct_02061AB4 * param0)
 {
     u32 v0;
-    UnkStruct_0203CDB0 * v1 = sub_02062C00(param0);
+    FieldSystem * v1 = sub_02062C00(param0);
     UnkStruct_0205E884 * v2 = sub_0205EF3C(v1);
 
     v0 = sub_0205EC14(v2);
@@ -218,7 +218,7 @@ static u32 sub_02069D50 (UnkStruct_02061AB4 * param0)
 
 static int sub_02069D8C (UnkStruct_02061AB4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+    FieldSystem * v0 = sub_02062C00(param0);
     UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
     int v2 = sub_02063020(param0);
     int v3 = sub_02063040(param0);
@@ -627,7 +627,7 @@ static int sub_0206A30C (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
 static int sub_0206A324 (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param1)
 {
     if (param1->unk_01 == -1) {
-        UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+        FieldSystem * v0 = sub_02062C00(param0);
 
         param1->unk_01 = sub_0205EA78(v0->unk_3C);
     }
@@ -674,7 +674,7 @@ static void sub_0206A37C (UnkStruct_02061AB4 * param0, int param1, int param2, u
 static int sub_0206A3BC (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param1)
 {
     int v0;
-    UnkStruct_0203CDB0 * v1 = sub_02062C00(param0);
+    FieldSystem * v1 = sub_02062C00(param0);
     int v2 = sub_0205EA78(v1->unk_3C);
     u32 v3 = sub_0205EC1C(v1->unk_3C);
 
@@ -842,7 +842,7 @@ static const int Unk_020EF8E4[2] = {
     0x0
 };
 
-static BOOL sub_0206A524 (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4)
+static BOOL sub_0206A524 (FieldSystem * param0, int param1, int param2, int param3, int param4)
 {
     BOOL v0;
 
@@ -853,7 +853,7 @@ static BOOL sub_0206A524 (UnkStruct_0203CDB0 * param0, int param1, int param2, i
     return v0;
 }
 
-static BOOL sub_0206A54C (UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4)
+static BOOL sub_0206A54C (FieldSystem * param0, int param1, int param2, int param3, int param4)
 {
     BOOL v0;
 
@@ -866,7 +866,7 @@ static BOOL sub_0206A54C (UnkStruct_0203CDB0 * param0, int param1, int param2, i
 
 static int sub_0206A574 (UnkStruct_02061AB4 * param0, int param1, int param2)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+    FieldSystem * v0 = sub_02062C00(param0);
     int v1 = sub_02063020(param0);
     int v2 = sub_02063040(param0);
     BOOL v3 = sub_0206A524(v0, v1, v2, param1, param2);
@@ -876,7 +876,7 @@ static int sub_0206A574 (UnkStruct_02061AB4 * param0, int param1, int param2)
 
 static int sub_0206A5A4 (UnkStruct_02061AB4 * param0, int param1, int param2)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02062C00(param0);
+    FieldSystem * v0 = sub_02062C00(param0);
     int v1 = sub_02063020(param0);
     int v2 = sub_02063040(param0);
     BOOL v3 = sub_0206A54C(v0, v1, v2, param1, param2);
diff --git a/src/unk_0206B70C.c b/src/unk_0206B70C.c
index d751beb013..7b066b9318 100644
--- a/src/unk_0206B70C.c
+++ b/src/unk_0206B70C.c
@@ -34,7 +34,7 @@ typedef struct {
     u8 unk_03;
 } UnkStruct_0206B878;
 
-static void sub_0206B878(UnkStruct_0203CDB0 * param0, UnkStruct_0203D8AC * param1, const char * param2);
+static void sub_0206B878(FieldSystem * param0, UnkStruct_0203D8AC * param1, const char * param2);
 
 static const int Unk_020EFA98[10][4] = {
 	{ 0x23D, 0x15, 0x120, 0xA },
@@ -72,7 +72,7 @@ static const u8 Unk_020EFA84[20] = {
     0x44
 };
 
-void sub_0206B70C (UnkStruct_0203CDB0 * param0, UnkStruct_0203D8AC * param1, int param2)
+void sub_0206B70C (FieldSystem * param0, UnkStruct_0203D8AC * param1, int param2)
 {
     TrainerInfo * v0;
     int v1 = 0, v2 = 0, v3 = 0;
@@ -152,7 +152,7 @@ void sub_0206B70C (UnkStruct_0203CDB0 * param0, UnkStruct_0203D8AC * param1, int
     param1->unk_139 = param2;
 }
 
-static void sub_0206B878 (UnkStruct_0203CDB0 * param0, UnkStruct_0203D8AC * param1, const char * param2)
+static void sub_0206B878 (FieldSystem * param0, UnkStruct_0203D8AC * param1, const char * param2)
 {
     FSFile v0;
     int v1, v2;
diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c
index 8bb0d6281e..bf39b822bc 100644
--- a/src/unk_0206B9D8.c
+++ b/src/unk_0206B9D8.c
@@ -67,7 +67,7 @@ typedef struct {
     u16 unk_02;
 } UnkStruct_0206BD88;
 
-static int sub_0206B9D8 (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param1, int param2)
+static int sub_0206B9D8 (UnkStruct_0206B9D8 * param0, FieldSystem * param1, int param2)
 {
     u8 v0;
     SaveData * v1;
@@ -96,7 +96,7 @@ static int sub_0206B9D8 (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param
     return 1;
 }
 
-static int sub_0206BA84 (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param1)
+static int sub_0206BA84 (UnkStruct_0206B9D8 * param0, FieldSystem * param1)
 {
     int v0;
     PartyManagementData * v1;
@@ -126,7 +126,7 @@ static int sub_0206BA84 (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param
     return 2;
 }
 
-static int sub_0206BAE0 (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param1, int param2)
+static int sub_0206BAE0 (UnkStruct_0206B9D8 * param0, FieldSystem * param1, int param2)
 {
     PokemonSummary * v0;
     SaveData * v1;
@@ -157,7 +157,7 @@ static int sub_0206BAE0 (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param
     return 3;
 }
 
-static int sub_0206BB6C (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param1)
+static int sub_0206BB6C (UnkStruct_0206B9D8 * param0, FieldSystem * param1)
 {
     PokemonSummary * v0;
 
@@ -175,7 +175,7 @@ static int sub_0206BB6C (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param
 
 static BOOL sub_0206BB94 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206B9D8 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_04) {
@@ -201,7 +201,7 @@ static BOOL sub_0206BB94 (UnkStruct_020508D4 * param0)
 
 void sub_0206BBFC (UnkStruct_020508D4 * param0, void ** param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206B9D8 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206B9D8));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0206B9D8));
@@ -217,7 +217,7 @@ void sub_0206BBFC (UnkStruct_020508D4 * param0, void ** param1, u8 param2, u8 pa
     sub_02050944(v0->unk_10, sub_0206BB94, v1);
 }
 
-static int sub_0206BC48 (UnkStruct_0206BC48 * param0, UnkStruct_0203CDB0 * param1)
+static int sub_0206BC48 (UnkStruct_0206BC48 * param0, FieldSystem * param1)
 {
     SaveData * v0;
 
@@ -230,7 +230,7 @@ static int sub_0206BC48 (UnkStruct_0206BC48 * param0, UnkStruct_0203CDB0 * param
     }
 }
 
-static int sub_0206BC70 (UnkStruct_0206BC48 * param0, UnkStruct_0203CDB0 * param1)
+static int sub_0206BC70 (UnkStruct_0206BC48 * param0, FieldSystem * param1)
 {
     u8 v0;
     UnkStruct_0206BC70 * v1;
@@ -248,7 +248,7 @@ static int sub_0206BC70 (UnkStruct_0206BC48 * param0, UnkStruct_0203CDB0 * param
 static BOOL sub_0206BC94 (UnkStruct_020508D4 * param0)
 {
     u16 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_0206BC48 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_04) {
@@ -270,7 +270,7 @@ static BOOL sub_0206BC94 (UnkStruct_020508D4 * param0)
 
 void sub_0206BCE4 (UnkStruct_020508D4 * param0, u16 param1, u16 param2, u16 param3)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206BC48 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206BC48));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0206BC48));
@@ -286,7 +286,7 @@ static BOOL sub_0206BD1C (UnkStruct_020508D4 * param0)
 {
     u16 * v0;
     const void * v1;
-    UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
+    FieldSystem * v2 = sub_02050A60(param0);
     UnkStruct_0206BD88 * v3 = sub_02050A64(param0);
 
     v1 = sub_0203664C(1 - CommSys_CurNetId());
@@ -314,7 +314,7 @@ static BOOL sub_0206BD1C (UnkStruct_020508D4 * param0)
 
 void sub_0206BD88 (UnkStruct_020508D4 * param0, u16 param1, u16 param2)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206BD88 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206BD88));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0206BD88));
@@ -519,7 +519,7 @@ u32 sub_0206C068 (SaveData * param0)
     return v2;
 }
 
-BOOL sub_0206C0D0 (UnkStruct_0203CDB0 * param0)
+BOOL sub_0206C0D0 (FieldSystem * param0)
 {
     if (param0->unk_1C->unk_00 == SPECIES_ARCEUS) {
         return 1;
diff --git a/src/unk_0206C0E8.c b/src/unk_0206C0E8.c
index a553cda785..48c071ac3e 100644
--- a/src/unk_0206C0E8.c
+++ b/src/unk_0206C0E8.c
@@ -39,7 +39,7 @@ typedef struct {
 
 static BOOL sub_0206C120(UnkStruct_020508D4 * param0);
 
-void sub_0206C0E8 (UnkStruct_0203CDB0 * param0)
+void sub_0206C0E8 (FieldSystem * param0)
 {
     UnkStruct_0206C0E8 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0206C0E8));
 
@@ -53,7 +53,7 @@ void sub_0206C0E8 (UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_0206C120 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206C0E8 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_0C) {
diff --git a/src/unk_0206C660.c b/src/unk_0206C660.c
index 07188cda3a..4c4257dc1c 100644
--- a/src/unk_0206C660.c
+++ b/src/unk_0206C660.c
@@ -33,7 +33,7 @@ static void sub_0206C660(UnkStruct_020508D4 * param0);
 
 void sub_0206C660 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206C660 * v1 = sub_02050A64(param0);
 
     {
@@ -49,7 +49,7 @@ void sub_0206C660 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0206C680 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206C660 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_04) {
diff --git a/src/unk_0206C784.c b/src/unk_0206C784.c
index b1cc526a90..8017568aec 100644
--- a/src/unk_0206C784.c
+++ b/src/unk_0206C784.c
@@ -48,15 +48,15 @@ typedef struct {
     fx32 unk_7C;
 } UnkStruct_0206CAD0;
 
-static void sub_0206C8D4(UnkStruct_0203CDB0 * param0, const u8 param1, UnkStruct_ov5_021D5894 * param2);
+static void sub_0206C8D4(FieldSystem * param0, const u8 param1, UnkStruct_ov5_021D5894 * param2);
 static BOOL sub_0206C8F8(UnkStruct_020508D4 * param0);
 static BOOL sub_0206C964(UnkStruct_020508D4 * param0);
 static BOOL sub_0206CAD0(UnkStruct_0206CAD0 * param0);
 static BOOL sub_0206CB8C(const fx32 * param0, const fx32 * param1, u8 * param2);
-static void sub_0206CBA0(UnkStruct_0203CDB0 * param0);
+static void sub_0206CBA0(FieldSystem * param0);
 static void sub_0206CC64(UnkStruct_0206CAD0 * param0);
 
-void sub_0206C784 (UnkStruct_0203CDB0 * param0, const u8 param1, const u8 param2, const int param3, const int param4, const int param5)
+void sub_0206C784 (FieldSystem * param0, const u8 param1, const u8 param2, const int param3, const int param4, const int param5)
 {
     UnkStruct_0206CAD0 * v0;
     BOOL v1;
@@ -129,7 +129,7 @@ void sub_0206C784 (UnkStruct_0203CDB0 * param0, const u8 param1, const u8 param2
     sub_02050944(param0->unk_10, sub_0206C964, v0);
 }
 
-static void sub_0206C8D4 (UnkStruct_0203CDB0 * param0, const u8 param1, UnkStruct_ov5_021D5894 * param2)
+static void sub_0206C8D4 (FieldSystem * param0, const u8 param1, UnkStruct_ov5_021D5894 * param2)
 {
     UnkStruct_0206C8D4 * v0;
 
@@ -143,7 +143,7 @@ static void sub_0206C8D4 (UnkStruct_0203CDB0 * param0, const u8 param1, UnkStruc
 
 static BOOL sub_0206C8F8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206C8D4 * v1 = sub_02050A64(param0);
     int * v2 = sub_02050A68(param0);
 
@@ -171,7 +171,7 @@ static BOOL sub_0206C8F8 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0206C964 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206CAD0 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
@@ -298,7 +298,7 @@ static BOOL sub_0206CB8C (const fx32 * param0, const fx32 * param1, u8 * param2)
     }
 }
 
-static void sub_0206CBA0 (UnkStruct_0203CDB0 * param0)
+static void sub_0206CBA0 (FieldSystem * param0)
 {
     u8 v0;
     BOOL v1;
diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c
index 461de07389..cd41a4f454 100644
--- a/src/unk_0206CCB0.c
+++ b/src/unk_0206CCB0.c
@@ -70,7 +70,7 @@
 #include "overlay006/ov6_02246444.h"
 #include "overlay025/ov25_02253CE0.h"
 
-static void sub_0206CD70(UnkStruct_0203CDB0 * param0, int param1, int param2, const void * param3);
+static void sub_0206CD70(FieldSystem * param0, int param1, int param2, const void * param3);
 static void sub_0206CD7C(SaveData * param0, int param1, int param2, const void * param3);
 static u8 sub_0206DE4C(Pokemon * param0);
 static Strbuf* sub_0206F0D8(u16 param0, u32 param1);
@@ -349,8 +349,8 @@ typedef union {
     UnkStruct_0206E768 val39;
 } UnkUnion_0206D1B8;
 
-typedef int (* UnkFuncPtr_0206CD00)(UnkStruct_0203CDB0 *, StringFormatter *, UnkStruct_ov6_022465F4 *);
-typedef BOOL (* UnkFuncPtr_0206CD2C)(UnkStruct_0203CDB0 *, UnkStruct_ov6_022465F4 *);
+typedef int (* UnkFuncPtr_0206CD00)(FieldSystem *, StringFormatter *, UnkStruct_ov6_022465F4 *);
+typedef BOOL (* UnkFuncPtr_0206CD2C)(FieldSystem *, UnkStruct_ov6_022465F4 *);
 
 typedef struct {
     UnkFuncPtr_0206CD00 unk_00;
@@ -399,7 +399,7 @@ static const UnkStruct_020EFFA4 * sub_0206CCDC (const UnkStruct_020EFD60 * param
     return &(param0->unk_08[v0 - 1]);
 }
 
-int sub_0206CD00 (int param0, UnkStruct_0203CDB0 * param1, StringFormatter * param2, UnkStruct_ov6_022465F4 * param3, u16 * param4)
+int sub_0206CD00 (int param0, FieldSystem * param1, StringFormatter * param2, UnkStruct_ov6_022465F4 * param3, u16 * param4)
 {
     UnkFuncPtr_0206CD00 v0;
     const UnkStruct_020EFD60 * v1;
@@ -414,7 +414,7 @@ int sub_0206CD00 (int param0, UnkStruct_0203CDB0 * param1, StringFormatter * par
     return v0(param1, param2, param3);
 }
 
-BOOL sub_0206CD2C (int param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_022465F4 * param2)
+BOOL sub_0206CD2C (int param0, FieldSystem * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkFuncPtr_0206CD2C v0;
     const UnkStruct_020EFD60 * v1;
@@ -444,7 +444,7 @@ static void sub_0206CD58 (SaveData * param0, int param1, int param2, const void
     sub_0202E43C(v0, param1, param2, (const u8 *)param3);
 }
 
-static void sub_0206CD70 (UnkStruct_0203CDB0 * param0, int param1, int param2, const void * param3)
+static void sub_0206CD70 (FieldSystem * param0, int param1, int param2, const void * param3)
 {
     sub_0206CD7C(param0->unk_0C, param1, param2, param3);
 }
@@ -710,7 +710,7 @@ void sub_0206D160 (UnkStruct_0206D140 * param0, Pokemon * param1, int param2, in
     sub_0206CED0(param4, param1, &param0->unk_0B, param0->unk_0C);
 }
 
-void sub_0206D1B8 (UnkStruct_0203CDB0 * param0, const UnkStruct_0206D140 * param1, int param2)
+void sub_0206D1B8 (FieldSystem * param0, const UnkStruct_0206D140 * param1, int param2)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206D140 * v1 = &v0.val2;
@@ -740,7 +740,7 @@ void sub_0206D1B8 (UnkStruct_0203CDB0 * param0, const UnkStruct_0206D140 * param
     }
 }
 
-static int sub_0206D230 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D230 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D140 * v0 = ov6_02246498(param2);
 
@@ -760,7 +760,7 @@ static int sub_0206D230 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static int sub_0206D2E0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D2E0 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D140 * v0 = ov6_02246498(param2);
 
@@ -774,7 +774,7 @@ static int sub_0206D2E0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static BOOL sub_0206D320 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206D320 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     PokedexData * v0 = sub_02027560(param0->unk_0C);
     UnkStruct_0206D140 * v1 = ov6_02246498(param1);
@@ -782,7 +782,7 @@ static BOOL sub_0206D320 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 *
     return sub_02026FE8(v0, v1->unk_06);
 }
 
-void sub_0206D340 (UnkStruct_0203CDB0 * param0, BOOL param1, u16 param2, Pokemon * param3)
+void sub_0206D340 (FieldSystem * param0, BOOL param1, u16 param2, Pokemon * param3)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206D374 * v1 = &v0.val3;
@@ -797,7 +797,7 @@ void sub_0206D340 (UnkStruct_0203CDB0 * param0, BOOL param1, u16 param2, Pokemon
     sub_0206CD70(param0, 2, 3, v1);
 }
 
-static int sub_0206D374 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D374 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D374 * v0 = (UnkStruct_0206D374 * )ov6_02246498(param2);
 
@@ -812,7 +812,7 @@ static int sub_0206D374 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static BOOL sub_0206D3C0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206D3C0 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0206D374 * v0 = (UnkStruct_0206D374 * )ov6_02246498(param1);
 
@@ -823,7 +823,7 @@ static BOOL sub_0206D3C0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 *
     return sub_02026FE8(sub_02027560(param0->unk_0C), v0->unk_00);
 }
 
-static void sub_0206D3E4 (UnkStruct_0203CDB0 * param0, int param1)
+static void sub_0206D3E4 (FieldSystem * param0, int param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206D43C * v1 = &v0.val4;
@@ -836,17 +836,17 @@ static void sub_0206D3E4 (UnkStruct_0203CDB0 * param0, int param1)
     sub_0206CD70(param0, 2, param1, v1);
 }
 
-void sub_0206D424 (UnkStruct_0203CDB0 * param0)
+void sub_0206D424 (FieldSystem * param0)
 {
     sub_0206D3E4(param0, 20);
 }
 
-void sub_0206D430 (UnkStruct_0203CDB0 * param0)
+void sub_0206D430 (FieldSystem * param0)
 {
     sub_0206D3E4(param0, 4);
 }
 
-static int sub_0206D43C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D43C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D43C * v0 = (UnkStruct_0206D43C * )ov6_02246498(param2);
 
@@ -856,7 +856,7 @@ static int sub_0206D43C (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 6;
 }
 
-static int sub_0206D474 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D474 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D43C * v0 = (UnkStruct_0206D43C * )ov6_02246498(param2);
 
@@ -866,7 +866,7 @@ static int sub_0206D474 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 32;
 }
 
-void sub_0206D4AC (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206D4AC (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206D4D4 * v1 = &v0.val5;
@@ -877,7 +877,7 @@ void sub_0206D4AC (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 2, 6, v1);
 }
 
-static int sub_0206D4D4 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D4D4 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D4D4 * v0 = (UnkStruct_0206D4D4 *)ov6_02246498(param2);
 
@@ -905,7 +905,7 @@ void sub_0206D504 (SaveData * param0, u16 param1, u8 param2)
     }
 }
 
-static int sub_0206D530 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D530 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D530 * v0 = (UnkStruct_0206D530 *)ov6_02246498(param2);
 
@@ -917,7 +917,7 @@ static int sub_0206D530 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 11;
 }
 
-void sub_0206D578 (UnkStruct_0203CDB0 * param0, Pokemon * param1)
+void sub_0206D578 (FieldSystem * param0, Pokemon * param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206D5B0 * v1 = &v0.val7;
@@ -927,7 +927,7 @@ void sub_0206D578 (UnkStruct_0203CDB0 * param0, Pokemon * param1)
     sub_0206CD70(param0, 2, 8, v1);
 }
 
-static int sub_0206D5B0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D5B0 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D5B0 * v0 = (UnkStruct_0206D5B0 *)ov6_02246498(param2);
 
@@ -938,13 +938,13 @@ static int sub_0206D5B0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 12;
 }
 
-static BOOL sub_0206D5F0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206D5F0 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0206D5B0 * v0 = (UnkStruct_0206D5B0 *)ov6_02246498(param1);
     return sub_02026FE8(sub_02027560(param0->unk_0C), v0->unk_00);
 }
 
-void sub_0206D60C (UnkStruct_0203CDB0 * param0, Pokemon * param1)
+void sub_0206D60C (FieldSystem * param0, Pokemon * param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206D644 * v1 = &v0.val8;
@@ -954,7 +954,7 @@ void sub_0206D60C (UnkStruct_0203CDB0 * param0, Pokemon * param1)
     sub_0206CD70(param0, 2, 10, v1);
 }
 
-static int sub_0206D644 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D644 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D644 * v0 = (UnkStruct_0206D644 *)ov6_02246498(param2);
 
@@ -965,7 +965,7 @@ static int sub_0206D644 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 17 + inline_020564D0(5);
 }
 
-static BOOL sub_0206D6A8 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206D6A8 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     PokedexData * v0 = sub_02027560(param0->unk_0C);
     UnkStruct_0206D644 * v1 = (UnkStruct_0206D644 *)ov6_02246498(param1);
@@ -973,7 +973,7 @@ static BOOL sub_0206D6A8 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 *
     return sub_02026FE8(v0, v1->unk_00);
 }
 
-void sub_0206D6C8 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+void sub_0206D6C8 (FieldSystem * param0, int param1, int param2)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206D6E0 * v1 = &v0.val9;
@@ -984,7 +984,7 @@ void sub_0206D6C8 (UnkStruct_0203CDB0 * param0, int param1, int param2)
     sub_0206CD70(param0, 2, 13, v1);
 }
 
-static int sub_0206D6E0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D6E0 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D6E0 * v0 = (UnkStruct_0206D6E0 *)ov6_02246498(param2);
 
@@ -995,7 +995,7 @@ static int sub_0206D6E0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 24;
 }
 
-void sub_0206D720 (UnkStruct_0203CDB0 * param0)
+void sub_0206D720 (FieldSystem * param0)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206D75C * v1 = &v0.val10;
@@ -1015,7 +1015,7 @@ void sub_0206D720 (UnkStruct_0203CDB0 * param0)
     sub_0206CD70(param0, 2, 15, v1);
 }
 
-static int sub_0206D75C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D75C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D75C * v0 = (UnkStruct_0206D75C *)ov6_02246498(param2);
 
@@ -1026,7 +1026,7 @@ static int sub_0206D75C (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 26;
 }
 
-static BOOL sub_0206D7A4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206D7A4 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     PokedexData * v0 = sub_02027560(param0->unk_0C);
     UnkStruct_0206D75C * v1 = (UnkStruct_0206D75C *)ov6_02246498(param1);
@@ -1034,7 +1034,7 @@ static BOOL sub_0206D7A4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 *
     return sub_02026FE8(v0, v1->unk_00);
 }
 
-void sub_0206D7C4 (UnkStruct_0203CDB0 * param0)
+void sub_0206D7C4 (FieldSystem * param0)
 {
     u32 v0, v1, v2, v3;
     u8 v4, v5;
@@ -1080,7 +1080,7 @@ void sub_0206D7C4 (UnkStruct_0203CDB0 * param0)
     return;
 }
 
-static int sub_0206D8B0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D8B0 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D8B0 * v0 = (UnkStruct_0206D8B0 *)ov6_02246498(param2);
 
@@ -1094,7 +1094,7 @@ static int sub_0206D8B0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 28;
 }
 
-static BOOL sub_0206D8F0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206D8F0 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0206D8B0 * v0 = (UnkStruct_0206D8B0 *)ov6_02246498(param1);
 
@@ -1106,12 +1106,12 @@ void sub_0206D90C (TVBroadcast * param0, Pokemon * param1, u16 param2)
     return;
 }
 
-static BOOL sub_0206D910 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206D910 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return 0;
 }
 
-void sub_0206D914 (UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, u16 param3)
+void sub_0206D914 (FieldSystem * param0, u16 param1, u8 param2, u16 param3)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206D94C * v1 = &v0.val13;
@@ -1129,7 +1129,7 @@ void sub_0206D914 (UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, u16 param
     }
 }
 
-static int sub_0206D94C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D94C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D94C * v0 = ov6_02246498(param2);
 
@@ -1140,7 +1140,7 @@ static int sub_0206D94C (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 30;
 }
 
-static int sub_0206D98C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D98C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D94C * v0 = ov6_02246498(param2);
 
@@ -1162,7 +1162,7 @@ void sub_0206D9B4 (TVBroadcast * param0, Pokemon * param1, u8 param2)
     sub_0202E43C(param0, 2, 21, (const u8 *)v1);
 }
 
-static int sub_0206D9F4 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206D9F4 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206D9F4 * v0 = (UnkStruct_0206D9F4 *)ov6_02246498(param2);
 
@@ -1173,7 +1173,7 @@ static int sub_0206D9F4 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 33 + inline_020564D0(3);
 }
 
-static BOOL sub_0206DA50 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206DA50 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0206D9F4 * v0 = (UnkStruct_0206D9F4 *)ov6_02246498(param1);
 
@@ -1186,7 +1186,7 @@ static void sub_0206DA6C (UnkStruct_0206DA6C * param0, const TrainerInfo * param
     TrainerInfo_Copy(param1, (TrainerInfo *)param0->unk_04);
 }
 
-static void sub_0206DA84 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static void sub_0206DA84 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206DA6C * v0 = (UnkStruct_0206DA6C *)ov6_02246498(param2);
     TrainerInfo * v1 = (TrainerInfo *)&v0->unk_04;
@@ -1197,7 +1197,7 @@ static void sub_0206DA84 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     sub_0200B498(param1, 1, v1);
 }
 
-void sub_0206DAB8 (UnkStruct_0203CDB0 * param0, const TrainerInfo * param1)
+void sub_0206DAB8 (FieldSystem * param0, const TrainerInfo * param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206DA6C * v1 = &v0.val15;
@@ -1206,7 +1206,7 @@ void sub_0206DAB8 (UnkStruct_0203CDB0 * param0, const TrainerInfo * param1)
     sub_0206CD70(param0, 2, 22, v1);
 }
 
-void sub_0206DAD4 (UnkStruct_0203CDB0 * param0, const TrainerInfo * param1)
+void sub_0206DAD4 (FieldSystem * param0, const TrainerInfo * param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206DA6C * v1 = &v0.val15;
@@ -1215,24 +1215,24 @@ void sub_0206DAD4 (UnkStruct_0203CDB0 * param0, const TrainerInfo * param1)
     sub_0206CD70(param0, 2, 23, v1);
 }
 
-static int sub_0206DAF0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DAF0 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     sub_0206DA84(param0, param1, param2);
     return 36;
 }
 
-static int sub_0206DAFC (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DAFC (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     sub_0206DA84(param0, param1, param2);
     return 37;
 }
 
-static BOOL sub_0206DB08 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206DB08 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return sub_0207D688(sub_0207D990(param0->unk_0C), 428, 1, 32);
 }
 
-void sub_0206DB20 (UnkStruct_0203CDB0 * param0)
+void sub_0206DB20 (FieldSystem * param0)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206DB20 * v1 = &v0.val16;
@@ -1242,18 +1242,18 @@ void sub_0206DB20 (UnkStruct_0203CDB0 * param0)
     sub_0206CD70(param0, 2, 25, v1);
 }
 
-static int sub_0206DB38 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DB38 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     sub_0206CDD0(param1, 0, param2);
     return 38;
 }
 
-static BOOL sub_0206DB48 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206DB48 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return inline_0208BE68(SaveData_Events(param0->unk_0C), 6);
 }
 
-void sub_0206DB5C (UnkStruct_0203CDB0 * param0, u8 param1)
+void sub_0206DB5C (FieldSystem * param0, u8 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206DB74 * v1 = &v0.val17;
@@ -1263,7 +1263,7 @@ void sub_0206DB5C (UnkStruct_0203CDB0 * param0, u8 param1)
     sub_0206CD70(param0, 2, 26, v1);
 }
 
-static int sub_0206DB74 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DB74 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206DB74 * v0 = (UnkStruct_0206DB74 *)ov6_02246498(param2);
 
@@ -1273,7 +1273,7 @@ static int sub_0206DB74 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 39;
 }
 
-static BOOL sub_0206DB9C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206DB9C (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return inline_0208BE68(SaveData_Events(param0->unk_0C), 6);
 }
@@ -1291,7 +1291,7 @@ void sub_0206DBB0 (SaveData * param0, u32 param1, Pokemon * param2, BOOL param3)
     sub_0206CD58(param0, 3, 1, v1);
 }
 
-static int sub_0206DBE8 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DBE8 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206DBE8 * v0 = (UnkStruct_0206DBE8 *)ov6_02246498(param2);
 
@@ -1306,7 +1306,7 @@ static int sub_0206DBE8 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static BOOL sub_0206DC3C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206DC3C (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0206DBE8 * v0 = (UnkStruct_0206DBE8 *)ov6_02246498(param1);
 
@@ -1317,7 +1317,7 @@ static BOOL sub_0206DC3C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 *
     return inline_0208BE68(SaveData_Events(param0->unk_0C), 17);
 }
 
-void sub_0206DC6C (UnkStruct_0203CDB0 * param0, u32 param1, Pokemon * param2)
+void sub_0206DC6C (FieldSystem * param0, u32 param1, Pokemon * param2)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206DC9C * v1 = &v0.val19;
@@ -1327,7 +1327,7 @@ void sub_0206DC6C (UnkStruct_0203CDB0 * param0, u32 param1, Pokemon * param2)
     sub_0206CD70(param0, 3, 3, v1);
 }
 
-static int sub_0206DC9C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DC9C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206DC9C * v0 = (UnkStruct_0206DC9C *)ov6_02246498(param2);
 
@@ -1344,13 +1344,13 @@ static int sub_0206DC9C (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 2;
 }
 
-static BOOL sub_0206DD1C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206DD1C (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0206DC9C * v0 = (UnkStruct_0206DC9C *)ov6_02246498(param1);
     return sub_02026FE8(sub_02027560(param0->unk_0C), v0->unk_00);
 }
 
-void sub_0206DD38 (UnkStruct_0203CDB0 * param0, u32 param1, u32 param2, u32 param3)
+void sub_0206DD38 (FieldSystem * param0, u32 param1, u32 param2, u32 param3)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206DD5C * v1 = &v0.val20;
@@ -1366,7 +1366,7 @@ void sub_0206DD38 (UnkStruct_0203CDB0 * param0, u32 param1, u32 param2, u32 para
     sub_0206CD70(param0, 3, 4, v1);
 }
 
-static int sub_0206DD5C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DD5C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206DD5C * v0 = ov6_02246498(param2);
 
@@ -1466,7 +1466,7 @@ static u8 sub_0206DE4C (Pokemon * param0)
     return v0;
 }
 
-static int sub_0206DE80 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DE80 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206DE80 * v0 = ov6_02246498(param2);
 
@@ -1484,7 +1484,7 @@ static int sub_0206DE80 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 4;
 }
 
-void sub_0206DEEC (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2)
+void sub_0206DEEC (FieldSystem * param0, u16 param1, u16 param2)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206DF14 * v1 = &v0.val22;
@@ -1499,7 +1499,7 @@ void sub_0206DEEC (UnkStruct_0203CDB0 * param0, u16 param1, u16 param2)
     sub_0206CD70(param0, 3, 8, v1);
 }
 
-static int sub_0206DF14 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DF14 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     u16 v0;
     UnkStruct_0206DF14 * v1 = ov6_02246498(param2);
@@ -1517,7 +1517,7 @@ static int sub_0206DF14 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 7;
 }
 
-void sub_0206DF60 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206DF60 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206DF88 * v1 = &v0.val23;
@@ -1533,7 +1533,7 @@ void sub_0206DF60 (UnkStruct_0203CDB0 * param0, u16 param1)
     }
 }
 
-static int sub_0206DF88 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206DF88 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     u16 v0;
     UnkStruct_0206DF88 * v1 = ov6_02246498(param2);
@@ -1551,7 +1551,7 @@ static int sub_0206DF88 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 8;
 }
 
-static BOOL sub_0206DFC8 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206DFC8 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return sub_0207D688(sub_0207D990(param0->unk_0C), 428, 1, 32);
 }
@@ -1571,7 +1571,7 @@ void sub_0206DFE0 (SaveData * param0)
     }
 }
 
-static int sub_0206E018 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E018 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E018 * v0 = ov6_02246498(param2);
 
@@ -1581,7 +1581,7 @@ static int sub_0206E018 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 9;
 }
 
-static BOOL sub_0206E04C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206E04C (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return inline_0208BE68(SaveData_Events(param0->unk_0C), 17);
 }
@@ -1601,7 +1601,7 @@ void sub_0206E060 (SaveData * param0)
     }
 }
 
-static int sub_0206E098 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E098 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E098 * v0 = ov6_02246498(param2);
 
@@ -1611,12 +1611,12 @@ static int sub_0206E098 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 10;
 }
 
-static BOOL sub_0206E0CC (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206E0CC (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return inline_0208BE68(SaveData_Events(param0->unk_0C), 9);
 }
 
-void sub_0206E0E0 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E0E0 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E118 * v1 = &v0.val26;
@@ -1630,7 +1630,7 @@ void sub_0206E0E0 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 2, v1);
 }
 
-static int sub_0206E118 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E118 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E118 * v0 = ov6_02246498(param2);
 
@@ -1645,12 +1645,12 @@ static int sub_0206E118 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static BOOL sub_0206E160 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206E160 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return inline_0208BE68(SaveData_Events(param0->unk_0C), 17);
 }
 
-void sub_0206E174 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E174 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E1C0 * v1 = &v0.val27;
@@ -1665,7 +1665,7 @@ void sub_0206E174 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 4, v1);
 }
 
-static int sub_0206E1C0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E1C0 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E1C0 * v0 = ov6_02246498(param2);
 
@@ -1684,14 +1684,14 @@ static int sub_0206E1C0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static BOOL sub_0206E248 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206E248 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0206E1C0 * v0 = ov6_02246498(param1);
 
     return sub_02026FE8(sub_02027560(param0->unk_0C), v0->unk_00);
 }
 
-void sub_0206E264 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E264 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E28C * v1 = &v0.val28;
@@ -1702,7 +1702,7 @@ void sub_0206E264 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 6, v1);
 }
 
-static int sub_0206E28C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E28C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E28C * v0 = ov6_02246498(param2);
 
@@ -1713,7 +1713,7 @@ static int sub_0206E28C (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 16;
 }
 
-void sub_0206E2BC (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E2BC (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E300 * v1 = &v0.val29;
@@ -1727,7 +1727,7 @@ void sub_0206E2BC (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 7, v1);
 }
 
-static int sub_0206E300 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E300 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E300 * v0 = ov6_02246498(param2);
 
@@ -1745,13 +1745,13 @@ static int sub_0206E300 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static BOOL sub_0206E37C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206E37C (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0206E300 * v0 = ov6_02246498(param1);
     return sub_02026FE8(sub_02027560(param0->unk_0C), v0->unk_00.unk_02);
 }
 
-void sub_0206E398 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E398 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E3C8 * v1 = &v0.val30;
@@ -1768,7 +1768,7 @@ void sub_0206E398 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 9, v1);
 }
 
-static int sub_0206E3C8 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E3C8 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E3C8 * v0 = ov6_02246498(param2);
 
@@ -1779,13 +1779,13 @@ static int sub_0206E3C8 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 20;
 }
 
-static BOOL sub_0206E3F8 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206E3F8 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0206E3C8 * v0 = ov6_02246498(param1);
     return sub_02026FE8(sub_02027560(param0->unk_0C), v0->unk_00);
 }
 
-void sub_0206E414 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E414 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E428 * v1 = &v0.val31;
@@ -1794,7 +1794,7 @@ void sub_0206E414 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 10, v1);
 }
 
-static int sub_0206E428 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E428 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E428 * v0 = ov6_02246498(param2);
 
@@ -1802,7 +1802,7 @@ static int sub_0206E428 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 21 + v0->unk_00 - 1;
 }
 
-void sub_0206E448 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E448 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E480 * v1 = &v0.val32;
@@ -1816,7 +1816,7 @@ void sub_0206E448 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 11, v1);
 }
 
-static int sub_0206E480 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E480 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E480 * v0 = ov6_02246498(param2);
     int v1 = v0->unk_00.unk_01;
@@ -1839,7 +1839,7 @@ static int sub_0206E480 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-void sub_0206E4DC (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E4DC (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E520 * v1 = &v0.val33;
@@ -1853,7 +1853,7 @@ void sub_0206E4DC (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 13, v1);
 }
 
-static int sub_0206E520 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E520 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E520 * v0 = ov6_02246498(param2);
 
@@ -1876,7 +1876,7 @@ static int sub_0206E520 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 45;
 }
 
-void sub_0206E5A0 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E5A0 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E5E4 * v1 = &v0.val34;
@@ -1890,7 +1890,7 @@ void sub_0206E5A0 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 14, v1);
 }
 
-static int sub_0206E5E4 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E5E4 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E5E4 * v0 = ov6_02246498(param2);
 
@@ -1907,12 +1907,12 @@ static int sub_0206E5E4 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 47;
 }
 
-static BOOL sub_0206E654 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206E654 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return inline_0208BE68(SaveData_Events(param0->unk_0C), 17);
 }
 
-void sub_0206E668 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E668 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E680 * v1 = &v0.val35;
@@ -1921,7 +1921,7 @@ void sub_0206E668 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 15, v1);
 }
 
-static int sub_0206E680 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E680 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E680 * v0 = ov6_02246498(param2);
 
@@ -1931,7 +1931,7 @@ static int sub_0206E680 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 48;
 }
 
-void sub_0206E6A8 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E6A8 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E6C0 * v1 = &v0.val36;
@@ -1940,7 +1940,7 @@ void sub_0206E6A8 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 16, v1);
 }
 
-static int sub_0206E6C0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E6C0 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E6C0 * v0 = ov6_02246498(param2);
 
@@ -1950,7 +1950,7 @@ static int sub_0206E6C0 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 49;
 }
 
-void sub_0206E6E8 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E6E8 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E700 * v1 = &v0.val37;
@@ -1959,7 +1959,7 @@ void sub_0206E6E8 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 17, v1);
 }
 
-static int sub_0206E700 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E700 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E700 * v0 = ov6_02246498(param2);
 
@@ -1969,7 +1969,7 @@ static int sub_0206E700 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 50;
 }
 
-void sub_0206E728 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E728 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E740 * v1 = &v0.val38;
@@ -1978,7 +1978,7 @@ void sub_0206E728 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 18, v1);
 }
 
-static int sub_0206E740 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E740 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206E740 * v0 = ov6_02246498(param2);
 
@@ -1988,7 +1988,7 @@ static int sub_0206E740 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 51;
 }
 
-void sub_0206E768 (UnkStruct_0203CDB0 * param0, u16 param1)
+void sub_0206E768 (FieldSystem * param0, u16 param1)
 {
     UnkUnion_0206D1B8 v0;
     UnkStruct_0206E768 * v1 = &v0.val39;
@@ -2002,7 +2002,7 @@ void sub_0206E768 (UnkStruct_0203CDB0 * param0, u16 param1)
     sub_0206CD70(param0, 1, 19, v1);
 }
 
-static int sub_0206E7AC (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E7AC (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     int v0;
     UnkStruct_0206E768 * v1 = ov6_02246498(param2);
@@ -2036,7 +2036,7 @@ static int sub_0206E7AC (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return v0;
 }
 
-static BOOL sub_0206E834 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206E834 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return inline_0208BE68(SaveData_Events(param0->unk_0C), 17);
 }
@@ -2062,7 +2062,7 @@ static int sub_0206E848 (UnkStruct_0202B4A0 * param0)
     return v1;
 }
 
-static int sub_0206E870 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E870 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     int v0, v1, v2;
     int v3;
@@ -2103,7 +2103,7 @@ static int sub_0206E870 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 0;
 }
 
-static BOOL sub_0206E928 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206E928 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0202B4A0 * v0 = sub_0202B4A0(param0->unk_0C);
 
@@ -2122,7 +2122,7 @@ static u16 Unk_02100BA4[] = {
     0xA5
 };
 
-static int sub_0206E940 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206E940 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     int v0, v1;
 
@@ -2165,12 +2165,12 @@ static int sub_0206E940 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 1;
 }
 
-static BOOL sub_0206EA0C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206EA0C (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return 1;
 }
 
-static int sub_0206EA10 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206EA10 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0));
     int v1 = param0->unk_1C->unk_00;
@@ -2240,7 +2240,7 @@ static int sub_0206EA10 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 27;
 }
 
-static int sub_0206EB94 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206EB94 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     u16 v0, v1;
     UnkStruct_0202D7B0 * v2 = sub_0202D834(param0->unk_0C);
@@ -2252,13 +2252,13 @@ static int sub_0206EB94 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 29;
 }
 
-static BOOL sub_0206EBD4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206EBD4 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0202D7B0 * v0 = sub_0202D834(param0->unk_0C);
     return sub_0202D898(v0);
 }
 
-static BOOL sub_0206EBE4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206EBE4 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return 0;
 }
@@ -2523,7 +2523,7 @@ static const u16 Unk_020F0074[] = {
     0x1D7
 };
 
-static int sub_0206EBE8 (UnkStruct_0203CDB0 * param0)
+static int sub_0206EBE8 (FieldSystem * param0)
 {
     u8 v0[NELEMS(Unk_020EFD3C)];
     u8 v1[NELEMS(Unk_020F0074) / 2];
@@ -2544,7 +2544,7 @@ static int sub_0206EBE8 (UnkStruct_0203CDB0 * param0)
     return v1[inline_020564D0(v3)];
 }
 
-static int sub_0206EC90 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206EC90 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_02027854 * v0 = sub_02027854(param0->unk_0C);
     int v1, v2;
@@ -2569,18 +2569,18 @@ static int sub_0206EC90 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static BOOL sub_0206ECFC (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206ECFC (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
     return inline_0208BE68(v0, 9);
 }
 
-static BOOL sub_0206ED10 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206ED10 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     return 0;
 }
 
-static int sub_0206ED14 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206ED14 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     u32 v0, v1;
     u8 v2;
@@ -2622,7 +2622,7 @@ static int sub_0206ED14 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 44;
 }
 
-static int sub_0206EDAC (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206EDAC (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_0206C638 * v0;
     UnkStruct_0202D7B0 * v1;
@@ -2653,7 +2653,7 @@ static int sub_0206EDAC (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 49;
 }
 
-static BOOL sub_0206EE74 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206EE74 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     int v0;
     UnkStruct_0202D7B0 * v1;
@@ -2682,7 +2682,7 @@ static int sub_0206EE9C (UnkStruct_0202A750 * param0)
     return v1;
 }
 
-static int sub_0206EEBC (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206EEBC (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     UnkStruct_02029C68 * v0;
     int v1, v2, v3, v4;
@@ -2726,7 +2726,7 @@ static int sub_0206EEBC (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 52;
 }
 
-static BOOL sub_0206EF64 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206EF64 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     UnkStruct_0202A750 * v0 = sub_0202A750(param0->unk_0C);
 
@@ -2737,7 +2737,7 @@ static BOOL sub_0206EF64 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 *
     }
 }
 
-static int sub_0206EF7C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206EF7C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     u16 v0;
 
@@ -2756,7 +2756,7 @@ static int sub_0206EF7C (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 0 + v0;
 }
 
-static int sub_0206F01C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206F01C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     Strbuf* v0;
     u16 v1, v2, v3;
@@ -2807,7 +2807,7 @@ static Strbuf* sub_0206F0D8 (u16 param0, u32 param1)
     return v1;
 }
 
-static BOOL sub_0206F100 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206F100 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     const PokedexData * v0 = sub_02027560(param0->unk_0C);
 
@@ -2818,7 +2818,7 @@ static BOOL sub_0206F100 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 *
     }
 }
 
-static int sub_0206F118 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206F118 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     u16 v0;
 
@@ -2833,7 +2833,7 @@ static int sub_0206F118 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static int sub_0206F13C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206F13C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     u16 v0;
 
@@ -2848,7 +2848,7 @@ static int sub_0206F13C (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     }
 }
 
-static int sub_0206F160 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206F160 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     Strbuf* v0;
     u16 v1, v2;
@@ -2885,7 +2885,7 @@ static int sub_0206F160 (UnkStruct_0203CDB0 * param0, StringFormatter * param1,
     return 17;
 }
 
-static BOOL sub_0206F260 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206F260 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     const PokedexData * v0 = sub_02027560(param0->unk_0C);
 
@@ -2896,17 +2896,17 @@ static BOOL sub_0206F260 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 *
     }
 }
 
-static int sub_0206F278 (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206F278 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     return 18;
 }
 
-static int sub_0206F27C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206F27C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     return 19;
 }
 
-static BOOL sub_0206F280 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * param1)
+static BOOL sub_0206F280 (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 {
     if (TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->unk_0C), 0) == 1) {
         return 1;
@@ -2915,7 +2915,7 @@ static BOOL sub_0206F280 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 *
     }
 }
 
-static int sub_0206F29C (UnkStruct_0203CDB0 * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
+static int sub_0206F29C (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
     u16 v0;
 
diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c
index 74227a63e7..f6c619aa7b 100644
--- a/src/unk_0206F314.c
+++ b/src/unk_0206F314.c
@@ -107,7 +107,7 @@ typedef struct {
     UnkStruct_0200112C * unk_C0;
     ResourceMetadata * unk_C4;
     UIControlData * unk_C8;
-    UnkStruct_0203CDB0 * unk_CC;
+    FieldSystem * unk_CC;
     BGL * unk_D0;
     Window unk_D4;
     Window unk_E4;
@@ -196,7 +196,7 @@ static const UnkStruct_020F02D0 * const Unk_020F0254[] = {
     Unk_020F0278
 };
 
-static int sub_0206F314 (UnkStruct_0206F314 * param0, UnkStruct_0203CDB0 * param1, u16 param2)
+static int sub_0206F314 (UnkStruct_0206F314 * param0, FieldSystem * param1, u16 param2)
 {
     UnkStruct_0206F7F8 * v0;
     SaveData * v1 = param1->unk_0C;
@@ -855,7 +855,7 @@ static void sub_02070288 (UnkStruct_0206F7F8 * param0)
 
 static BOOL sub_020702D0 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206F314 * v1 = sub_02050A64(param0);
     UnkStruct_0206F7F8 * v2 = v1->unk_08;
 
@@ -917,7 +917,7 @@ static BOOL sub_020702D0 (UnkStruct_020508D4 * param0)
 
 void sub_020703FC (UnkStruct_020508D4 * param0, u16 param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206F314 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206F314));
 
     v1->unk_00 = 0;
diff --git a/src/unk_02070428.c b/src/unk_02070428.c
index 61d8d574fb..02a4902e5c 100644
--- a/src/unk_02070428.c
+++ b/src/unk_02070428.c
@@ -24,15 +24,15 @@
 #include "roaming_pokemon.h"
 #include "unk_02070428.h"
 
-static BOOL sub_020705DC(UnkStruct_0203CDB0 * param0);
-static BOOL sub_02070610(UnkStruct_0203CDB0 * param0);
+static BOOL sub_020705DC(FieldSystem * param0);
+static BOOL sub_02070610(FieldSystem * param0);
 
-void sub_02070428 (UnkStruct_0203CDB0 * param0, BOOL param1)
+void sub_02070428 (FieldSystem * param0, BOOL param1)
 {
     param0->unk_B8 = param1;
 }
 
-void sub_02070430 (UnkStruct_0203CDB0 * param0)
+void sub_02070430 (FieldSystem * param0)
 {
     sub_020705DC(param0);
     sub_0206AF1C(SaveData_Events(param0->unk_0C), 0);
@@ -53,7 +53,7 @@ void sub_02070430 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void sub_02070494 (UnkStruct_0203CDB0 * param0)
+void sub_02070494 (FieldSystem * param0)
 {
     if (param0->unk_B8 == 1) {
         return;
@@ -105,24 +105,24 @@ void sub_02070494 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void sub_0207056C (UnkStruct_0203CDB0 * param0)
+void sub_0207056C (FieldSystem * param0)
 {
     sub_0206AE4C(SaveData_Events(param0->unk_0C));
     sub_0206C354(sub_0202D834(param0->unk_0C));
 }
 
-void sub_02070588 (UnkStruct_0203CDB0 * param0)
+void sub_02070588 (FieldSystem * param0)
 {
     sub_0206AE4C(SaveData_Events(param0->unk_0C));
     sub_0206C354(sub_0202D834(param0->unk_0C));
 }
 
-void sub_020705A4 (UnkStruct_0203CDB0 * param0)
+void sub_020705A4 (FieldSystem * param0)
 {
     sub_0206AE4C(SaveData_Events(param0->unk_0C));
 }
 
-void sub_020705B4 (UnkStruct_0203CDB0 * param0)
+void sub_020705B4 (FieldSystem * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_0C);
 
@@ -130,12 +130,12 @@ void sub_020705B4 (UnkStruct_0203CDB0 * param0)
     sub_0206B024(v0, 0);
 }
 
-void sub_020705CC (UnkStruct_0203CDB0 * param0)
+void sub_020705CC (FieldSystem * param0)
 {
     sub_0206C354(sub_0202D834(param0->unk_0C));
 }
 
-static BOOL sub_020705DC (UnkStruct_0203CDB0 * param0)
+static BOOL sub_020705DC (FieldSystem * param0)
 {
     int v0 = sub_0203A87C(param0->unk_1C->unk_00);
 
@@ -147,7 +147,7 @@ static BOOL sub_020705DC (UnkStruct_0203CDB0 * param0)
     return 0;
 }
 
-static BOOL sub_02070610 (UnkStruct_0203CDB0 * param0)
+static BOOL sub_02070610 (FieldSystem * param0)
 {
     UnkStruct_02049FA8 * v0 = sub_0203A728(sub_0203A790(param0->unk_0C));
 
diff --git a/src/unk_0207064C.c b/src/unk_0207064C.c
index 43c4434626..003e6f2da6 100644
--- a/src/unk_0207064C.c
+++ b/src/unk_0207064C.c
@@ -17,7 +17,7 @@
 #include "overlay006/ov6_02243258.h"
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     int unk_04;
     u16 unk_08;
     s16 unk_0A;
@@ -26,7 +26,7 @@ typedef struct {
     SysTask * unk_14;
 } UnkStruct_0207064C;
 
-void * sub_0207064C (u32 param0, UnkStruct_0203CDB0 * param1, Pokemon * param2, u16 param3, s16 param4, s16 param5)
+void * sub_0207064C (u32 param0, FieldSystem * param1, Pokemon * param2, u16 param3, s16 param4, s16 param5)
 {
     UnkStruct_0207064C * v0 = Heap_AllocFromHeapAtEnd(param0, (sizeof(UnkStruct_0207064C)));
 
@@ -43,7 +43,7 @@ void * sub_0207064C (u32 param0, UnkStruct_0203CDB0 * param1, Pokemon * param2,
 
 BOOL sub_02070680 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0207064C * v1 = sub_02050A64(param0);
 
     switch (v1->unk_04) {
diff --git a/src/unk_0207070C.c b/src/unk_0207070C.c
index ee92837b5c..5fb62ff7ad 100644
--- a/src/unk_0207070C.c
+++ b/src/unk_0207070C.c
@@ -52,7 +52,7 @@ typedef struct {
     UnkStruct_020709CC unk_08;
 } UnkStruct_0207086C;
 
-static void sub_02070838(UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1);
+static void sub_02070838(FieldSystem * param0, UnkStruct_02070950 * param1);
 static int sub_02070950(const UnkStruct_02070950 * param0);
 static void sub_020709CC(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1);
 static int sub_02070EEC(const UnkStruct_02070950 * param0);
@@ -162,7 +162,7 @@ u32 sub_0207070C (u16 param0, u16 param1)
     return (u32)Unk_020F0368[param1].unk_04;
 }
 
-void sub_02070728 (UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1)
+void sub_02070728 (FieldSystem * param0, UnkStruct_02070950 * param1)
 {
     UnkStruct_02061AB4 * v0;
     int v1, v2;
@@ -224,7 +224,7 @@ void sub_02070728 (UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1)
     }
 }
 
-static void sub_02070838 (UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1)
+static void sub_02070838 (FieldSystem * param0, UnkStruct_02070950 * param1)
 {
     int v0;
     u32 v1, v2;
@@ -290,7 +290,7 @@ static void sub_020708E0 (UnkStruct_020709CC * param0, const UnkStruct_02070950
 static BOOL sub_02070914 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0207086C * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     sub_0203E918(param0, 10008, v0->unk_04);
     sub_0203F21C(v1, v0->unk_08.unk_04, 0, 0, 0);
@@ -326,7 +326,7 @@ static int sub_02070950 (const UnkStruct_02070950 * param0)
 
 static void sub_020709CC (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -390,7 +390,7 @@ static void sub_02070A80 (UnkStruct_020709CC * param0, const UnkStruct_02070950
 static BOOL sub_02070AB4 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0207086C * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     sub_0203E918(param0, 10012, NULL);
     sub_0203F21C(v1, v0->unk_08.unk_04, 0, 0, 0);
@@ -434,7 +434,7 @@ static void sub_02070B28 (UnkStruct_020709CC * param0, const UnkStruct_02070950
 static BOOL sub_02070B5C (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0207086C * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     sub_0203E918(param0, 10010, v0->unk_04);
     sub_0203F21C(v1, v0->unk_08.unk_04, 0, 0, 0);
@@ -478,7 +478,7 @@ static void sub_02070BD0 (UnkStruct_020709CC * param0, const UnkStruct_02070950
 static BOOL sub_02070C04 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0207086C * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     sub_0203E918(param0, 10014, NULL);
     sub_0203F21C(v1, v0->unk_08.unk_04, 0, 0, 0);
@@ -526,7 +526,7 @@ static void sub_02070C88 (UnkStruct_020709CC * param0, const UnkStruct_02070950
 static BOOL sub_02070CBC (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0207086C * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     sub_0203E918(param0, 10009, v0->unk_04);
     sub_0203F21C(v1, v0->unk_08.unk_04, 0, 0, 0);
@@ -570,7 +570,7 @@ static void sub_02070D30 (UnkStruct_020709CC * param0, const UnkStruct_02070950
 static BOOL sub_02070D64 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0207086C * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     sub_0203E918(param0, 10013, NULL);
     sub_0203F21C(v1, v0->unk_08.unk_04, 0, 0, 0);
@@ -618,7 +618,7 @@ static void sub_02070DEC (UnkStruct_020709CC * param0, const UnkStruct_02070950
 static BOOL sub_02070E20 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0207086C * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     sub_0203E918(param0, 10011, NULL);
     sub_0203F21C(v1, v0->unk_08.unk_04, 0, 0, 0);
@@ -658,7 +658,7 @@ static void sub_02070E7C (UnkStruct_020709CC * param0, const UnkStruct_02070950
 static BOOL sub_02070EB0 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0207086C * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     sub_0203E918(param0, 10015, NULL);
     sub_0203F21C(v1, v0->unk_08.unk_04, 0, 0, 0);
@@ -690,7 +690,7 @@ static int sub_02070EEC (const UnkStruct_02070950 * param0)
 
 static void sub_02070F54 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -711,7 +711,7 @@ static void sub_02070F54 (UnkStruct_020709CC * param0, const UnkStruct_02070950
 
 static BOOL sub_02070F94 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020711C8 * v1 = sub_02050A64(param0);
     void * v2 = ov6_02247530(v0, v1->unk_00, 4);
 
@@ -740,7 +740,7 @@ static int sub_02070FCC (const UnkStruct_02070950 * param0)
 
 static void sub_02071010 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
 
     v0 = sub_02050A60(param0->unk_00);
@@ -761,7 +761,7 @@ static void sub_02071010 (UnkStruct_020709CC * param0, const UnkStruct_02070950
 
 static BOOL sub_02071050 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020711C8 * v1 = sub_02050A64(param0);
     void * v2 = ov6_02247488(v0, v1->unk_00, 11);
 
@@ -791,7 +791,7 @@ static int sub_020710A4 (const UnkStruct_02070950 * param0)
 
 static void sub_020710D4 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_020711C8 * v2;
     int v3;
@@ -822,7 +822,7 @@ static int sub_02071130 (const UnkStruct_02070950 * param0)
 
 static void sub_02071150 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_0207086C * v2;
 
@@ -840,7 +840,7 @@ static void sub_02071150 (UnkStruct_020709CC * param0, const UnkStruct_02070950
 static BOOL sub_0207118C (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0207086C * v0 = sub_02050A64(param0);
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
 
     sub_0203E918(param0, 8900, NULL);
     sub_0203F21C(v1, v0->unk_08.unk_04, 0, 0, 0);
diff --git a/src/unk_0207160C.c b/src/unk_0207160C.c
index 65f75d1c89..39797fbc3b 100644
--- a/src/unk_0207160C.c
+++ b/src/unk_0207160C.c
@@ -114,7 +114,7 @@ static const UnkStruct_020F03F4 Unk_020F03F4[9] = {
     }
 };
 
-void sub_0207160C (UnkStruct_0203CDB0 * param0)
+void sub_0207160C (FieldSystem * param0)
 {
     BOOL v0;
     UnkStruct_ov5_021E1890 * v1;
@@ -157,7 +157,7 @@ void sub_0207160C (UnkStruct_0203CDB0 * param0)
     ov5_021EF2CC(0, v4->unk_08, v4->unk_0C, 3, 2, v5, param0->unk_A0);
 }
 
-void sub_020716D4 (UnkStruct_0203CDB0 * param0)
+void sub_020716D4 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_020716D4 * v1;
@@ -269,7 +269,7 @@ void sub_020716D4 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-u8 sub_02071818 (UnkStruct_0203CDB0 * param0)
+u8 sub_02071818 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_020716D4 * v1;
@@ -284,7 +284,7 @@ u8 sub_02071818 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void sub_0207183C (UnkStruct_0203CDB0 * param0)
+void sub_0207183C (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_020716D4 * v1;
@@ -319,7 +319,7 @@ void sub_0207183C (UnkStruct_0203CDB0 * param0)
 static BOOL sub_020718D8 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_020718D8 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
@@ -382,7 +382,7 @@ static BOOL sub_020718D8 (UnkStruct_020508D4 * param0)
 static BOOL sub_020719D8 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_020718D8 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
diff --git a/src/unk_02071B10.c b/src/unk_02071B10.c
index c469367e04..35abf00adf 100644
--- a/src/unk_02071B10.c
+++ b/src/unk_02071B10.c
@@ -48,7 +48,7 @@ static const u8 Unk_020F04CC[24] = {
     0x1
 };
 
-void sub_02071B10 (UnkStruct_0203CDB0 * param0)
+void sub_02071B10 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071B10 * v1;
@@ -60,7 +60,7 @@ void sub_02071B10 (UnkStruct_0203CDB0 * param0)
     v1->unk_00 = 1;
 }
 
-void sub_02071B30 (UnkStruct_0203CDB0 * param0)
+void sub_02071B30 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071B30 * v1;
@@ -79,7 +79,7 @@ void sub_02071B30 (UnkStruct_0203CDB0 * param0)
     }
 }
 
-void sub_02071B6C (UnkStruct_0203CDB0 * param0, const u8 param1)
+void sub_02071B6C (FieldSystem * param0, const u8 param1)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071B6C * v1;
@@ -115,7 +115,7 @@ void sub_02071B6C (UnkStruct_0203CDB0 * param0, const u8 param1)
     }
 }
 
-void sub_02071BD0 (UnkStruct_0203CDB0 * param0)
+void sub_02071BD0 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071BD0 * v1;
@@ -127,7 +127,7 @@ void sub_02071BD0 (UnkStruct_0203CDB0 * param0)
     memset(v1, 0, sizeof(8));
 }
 
-void sub_02071BF8 (UnkStruct_0203CDB0 * param0)
+void sub_02071BF8 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071BF8 * v1;
@@ -139,7 +139,7 @@ void sub_02071BF8 (UnkStruct_0203CDB0 * param0)
     v1->unk_00 = 0;
 }
 
-void sub_02071C18 (UnkStruct_0203CDB0 * param0)
+void sub_02071C18 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071C18 * v1;
@@ -149,7 +149,7 @@ void sub_02071C18 (UnkStruct_0203CDB0 * param0)
     v1 = (UnkStruct_02071C18 *)sub_02027F6C(v0, 2);
 }
 
-void sub_02071C34 (UnkStruct_0203CDB0 * param0)
+void sub_02071C34 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071C34 * v1;
@@ -161,7 +161,7 @@ void sub_02071C34 (UnkStruct_0203CDB0 * param0)
     memset(v1, 0, sizeof(UnkStruct_02071C34));
 }
 
-void sub_02071C5C (UnkStruct_0203CDB0 * param0)
+void sub_02071C5C (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
     UnkStruct_02071C5C * v1;
@@ -186,7 +186,7 @@ static void sub_02071C80 (const u8 param0, const u8 param1, int * param2)
     (*param2) = (v0 | v1 | v2);
 }
 
-BOOL sub_02071CB4 (UnkStruct_0203CDB0 * param0, int param1)
+BOOL sub_02071CB4 (FieldSystem * param0, int param1)
 {
     UnkStruct_02027860 * v0;
 
diff --git a/src/unk_02071CD0.c b/src/unk_02071CD0.c
index 12c0ca5ba5..3c34940b8d 100644
--- a/src/unk_02071CD0.c
+++ b/src/unk_02071CD0.c
@@ -10,9 +10,9 @@
 #include "unk_02027F50.h"
 #include "unk_0203CC84.h"
 
-void sub_02071CD0(UnkStruct_0203CDB0 * param0);
+void sub_02071CD0(FieldSystem * param0);
 
-void sub_02071CD0 (UnkStruct_0203CDB0 * param0)
+void sub_02071CD0 (FieldSystem * param0)
 {
     int v0;
     UnkStruct_02027860 * v1;
diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c
index c745071275..fae53a9013 100644
--- a/src/unk_02071D40.c
+++ b/src/unk_02071D40.c
@@ -43,10 +43,10 @@ static void sub_02072014(const u8 param0, const u8 param1, const u8 param2, cons
 static void sub_02072038(const u16 param0, const u8 param1, const u16 * param2, const u32 param3, const u32 param4, const BOOL param5, const u32 param6, UnkStruct_02072014 * param7);
 static void sub_0207207C(const u8 param0, const UnkStruct_02025E5C * param1, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, UnkStruct_02072014 * param6);
 static void sub_02072120(const u32 param0, const u32 param1, const u32 param2, const u32 param3, const u8 * param4, UnkStruct_02072014 * param5);
-static void sub_0207216C(TrainerInfo * param0, UnkStruct_0203CDB0 * param1, UnkStruct_02072014 * param2);
+static void sub_0207216C(TrainerInfo * param0, FieldSystem * param1, UnkStruct_02072014 * param2);
 static BOOL sub_02072230(UnkStruct_020508D4 * param0);
 
-void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 param3, UnkStruct_0203CDB0 * param4, UnkStruct_02072014 * param5)
+void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 param3, FieldSystem * param4, UnkStruct_02072014 * param5)
 {
     TrainerInfo * v0;
     UnkStruct_0202CD88 * v1;
@@ -122,7 +122,7 @@ void sub_02071F20 (UnkStruct_02072014 * param0)
     Heap_FreeToHeap(param0);
 }
 
-u8 sub_02071F28 (UnkStruct_0203CDB0 * param0)
+u8 sub_02071F28 (FieldSystem * param0)
 {
     u8 v0;
     SaveData * v1;
@@ -242,7 +242,7 @@ static void sub_02072120 (const u32 param0, const u32 param1, const u32 param2,
     MI_CpuCopy8(param4, param5->unk_68, 24 * 8 * 8);
 }
 
-static void sub_0207216C (TrainerInfo * param0, UnkStruct_0203CDB0 * param1, UnkStruct_02072014 * param2)
+static void sub_0207216C (TrainerInfo * param0, FieldSystem * param1, UnkStruct_02072014 * param2)
 {
     u8 v0;
     UnkStruct_0202C834 * v1;
@@ -262,7 +262,7 @@ static void sub_0207216C (TrainerInfo * param0, UnkStruct_0203CDB0 * param1, Unk
     }
 }
 
-void sub_020721D4 (UnkStruct_0203CDB0 * param0, const UnkStruct_02072014 * param1)
+void sub_020721D4 (FieldSystem * param0, const UnkStruct_02072014 * param1)
 {
     u8 v0;
     UnkStruct_0202C834 * v1;
@@ -276,7 +276,7 @@ void sub_020721D4 (UnkStruct_0203CDB0 * param0, const UnkStruct_02072014 * param
     }
 }
 
-void sub_02072204 (UnkStruct_0203CDB0 * param0)
+void sub_02072204 (FieldSystem * param0)
 {
     UnkStruct_02072204 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02072204));
 
@@ -288,7 +288,7 @@ void sub_02072204 (UnkStruct_0203CDB0 * param0)
 
 static BOOL sub_02072230 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02072204 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_00) {
diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c
index 5402ae34c3..23cfd0cffb 100644
--- a/src/unk_020722AC.c
+++ b/src/unk_020722AC.c
@@ -115,7 +115,7 @@ typedef struct {
     UnkStruct_0200112C * unk_160;
     ResourceMetadata * unk_164;
     UIControlData * unk_168;
-    UnkStruct_0203CDB0 * unk_16C;
+    FieldSystem * unk_16C;
     BGL * unk_170;
     Window unk_174;
     Window unk_184;
@@ -220,7 +220,7 @@ void sub_020722AC (void * param0, int * param1)
 
     v1 = sub_0203D174(param0);
 
-    v0->unk_16C = (UnkStruct_0203CDB0 *)param0;
+    v0->unk_16C = (FieldSystem *)param0;
     v0->unk_00 = 43;
     v0->unk_19 = 0;
     v0->unk_1A = 0xFF;
@@ -1291,7 +1291,7 @@ static int sub_020735E8 (UnkStruct_02072334 * param0)
 
 static BOOL sub_02073694 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020736D8 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_04) {
@@ -1313,7 +1313,7 @@ static BOOL sub_02073694 (UnkStruct_020508D4 * param0)
 
 void sub_020736D8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020736D8 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_020736D8));
 
     v1->unk_00 = 0;
diff --git a/src/unk_0207DA28.c b/src/unk_0207DA28.c
index c9b49a24e4..5c96ece3b0 100644
--- a/src/unk_0207DA28.c
+++ b/src/unk_0207DA28.c
@@ -53,15 +53,15 @@ typedef struct {
 
 void sub_02099570(void);
 static BOOL sub_0207DA28(UnkStruct_020508D4 * param0);
-static void sub_0207DE04(UnkStruct_0207DE40 * param0, UnkStruct_0203CDB0 * param1, u32 param2, u32 param3);
+static void sub_0207DE04(UnkStruct_0207DE40 * param0, FieldSystem * param1, u32 param2, u32 param3);
 static u32 sub_0207DE40(UnkStruct_0207DE40 * param0);
-static UnkStruct_ov115_02260440 * sub_0207DE90(UnkStruct_0203CDB0 * param0, u32 param1, u32 param2);
+static UnkStruct_ov115_02260440 * sub_0207DE90(FieldSystem * param0, u32 param1, u32 param2);
 static void sub_0207DED8(UnkStruct_ov115_02260440 * param0);
-static UnkStruct_ov66_02231134 * sub_0207DEEC(UnkStruct_0203CDB0 * param0, u32 param1, u32 param2);
+static UnkStruct_ov66_02231134 * sub_0207DEEC(FieldSystem * param0, u32 param1, u32 param2);
 static void sub_0207DF2C(UnkStruct_ov66_02231134 * param0);
-static UnkStruct_ov117_02260440 * sub_0207DF40(UnkStruct_0203CDB0 * param0, u32 param1, u32 param2);
+static UnkStruct_ov117_02260440 * sub_0207DF40(FieldSystem * param0, u32 param1, u32 param2);
 static void sub_0207DF88(UnkStruct_ov115_02260440 * param0);
-static void sub_0207DF9C(UnkStruct_0203CDB0 * param0);
+static void sub_0207DF9C(FieldSystem * param0);
 
 static const UnkStruct_0208BE5C Unk_020F1B98 = {
     ov65_0222E2A8,
@@ -87,7 +87,7 @@ static const u8 Unk_020F1B64[4] = {
 static BOOL sub_0207DA28 (UnkStruct_020508D4 * param0)
 {
     int v0;
-    UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+    FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_0207DE40 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_04) {
@@ -325,7 +325,7 @@ void sub_0207DDE0 (UnkStruct_020508D4 * param0, u16 * param1)
     sub_02050944(param0, sub_0207DA28, v0);
 }
 
-static void sub_0207DE04 (UnkStruct_0207DE40 * param0, UnkStruct_0203CDB0 * param1, u32 param2, u32 param3)
+static void sub_0207DE04 (UnkStruct_0207DE40 * param0, FieldSystem * param1, u32 param2, u32 param3)
 {
     UnkStruct_0207DE04 * v0;
 
@@ -372,7 +372,7 @@ static u32 sub_0207DE40 (UnkStruct_0207DE40 * param0)
     return param0->unk_04;
 }
 
-static UnkStruct_ov115_02260440 * sub_0207DE90 (UnkStruct_0203CDB0 * param0, u32 param1, u32 param2)
+static UnkStruct_ov115_02260440 * sub_0207DE90 (FieldSystem * param0, u32 param1, u32 param2)
 {
     UnkStruct_ov115_02260440 * v0;
 
@@ -405,7 +405,7 @@ static void sub_0207DED8 (UnkStruct_ov115_02260440 * param0)
     Overlay_UnloadByID(FS_OVERLAY_ID(overlay114));
 }
 
-static UnkStruct_ov66_02231134 * sub_0207DEEC (UnkStruct_0203CDB0 * param0, u32 param1, u32 param2)
+static UnkStruct_ov66_02231134 * sub_0207DEEC (FieldSystem * param0, u32 param1, u32 param2)
 {
     UnkStruct_ov66_02231134 * v0;
 
@@ -436,7 +436,7 @@ static void sub_0207DF2C (UnkStruct_ov66_02231134 * param0)
     Overlay_UnloadByID(FS_OVERLAY_ID(overlay114));
 }
 
-static UnkStruct_ov117_02260440 * sub_0207DF40 (UnkStruct_0203CDB0 * param0, u32 param1, u32 param2)
+static UnkStruct_ov117_02260440 * sub_0207DF40 (FieldSystem * param0, u32 param1, u32 param2)
 {
     UnkStruct_ov117_02260440 * v0;
 
@@ -470,7 +470,7 @@ static void sub_0207DF88 (UnkStruct_ov115_02260440 * param0)
     Overlay_UnloadByID(FS_OVERLAY_ID(overlay114));
 }
 
-static void sub_0207DF9C (UnkStruct_0203CDB0 * param0)
+static void sub_0207DF9C (FieldSystem * param0)
 {
     UnkStruct_0202CD88 * v0;
 
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index 5f323ffdca..1315b2cdae 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -2459,7 +2459,7 @@ static int ProcessWindowInput (GameWindowLayout * param0)
             Pokemon * v0;
             Strbuf* v1;
             void * v2;
-            UnkStruct_0203CDB0 * v3;
+            FieldSystem * v3;
 
             v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
             v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 64);
@@ -2647,7 +2647,7 @@ static int ProcessItemApplication (GameWindowLayout * param0)
     Pokemon * v0;
     Window * v1;
     int v2 = -1, v3;
-    UnkStruct_0203CDB0 * v4;
+    FieldSystem * v4;
 
     v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
     v1 = &param0->unk_04[34];
@@ -2709,7 +2709,7 @@ static int ProcessItemApplication (GameWindowLayout * param0)
 static int UpdatePokemonWithItem (GameWindowLayout * param0, Pokemon * param1, int * param2)
 {
     u32 v0 = param0->unk_5A4->unk_24;
-    UnkStruct_0203CDB0 * v1;
+    FieldSystem * v1;
 
     v1 = param0->unk_5A4->unk_1C;
 
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index efdcf489be..ede7c5528c 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -166,7 +166,7 @@ static void sub_020834B0 (GameWindowLayout * param0, int * param1)
     Pokemon * v0;
     int v1;
     int v2 = 17;
-    UnkStruct_0203CDB0 * v3;
+    FieldSystem * v3;
 
     Window_Clear(&param0->unk_04[35], 1);
     sub_02001BC4(param0->unk_700, NULL);
diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c
index a2ed7c65ea..a56cf8a23e 100644
--- a/src/unk_02084B70.c
+++ b/src/unk_02084B70.c
@@ -804,7 +804,7 @@ static int sub_02085C50 (void * param0)
     case 6:
     {
         Pokemon * v3;
-        UnkStruct_0203CDB0 * v4;
+        FieldSystem * v4;
         int v5;
 
         v3 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
@@ -1273,6 +1273,6 @@ void sub_020868B0 (GameWindowLayout * param0)
 
 static u16 sub_02086930 (GameWindowLayout * param0)
 {
-    UnkStruct_0203CDB0 * v0 = param0->unk_5A4->unk_1C;
+    FieldSystem * v0 = param0->unk_5A4->unk_1C;
     return (u16)MapHeader_GetMapLabelTextID(v0->unk_1C->unk_00);
 }
diff --git a/src/unk_0208BA78.c b/src/unk_0208BA78.c
index c3da94ade9..af34c87a16 100644
--- a/src/unk_0208BA78.c
+++ b/src/unk_0208BA78.c
@@ -47,7 +47,7 @@ typedef struct {
     BattleParams * unk_10;
     UnkStruct_0208C06C * unk_14;
     UnkStruct_0208BA84 unk_18;
-    UnkStruct_0203CDB0 * unk_28;
+    FieldSystem * unk_28;
 } UnkStruct_0208BC3C;
 
 static void sub_0208BAAC(UnkStruct_020067E8 * param0, int param1);
diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c
index c95a76cd20..76f5e3cdd7 100644
--- a/src/unk_020933F8.c
+++ b/src/unk_020933F8.c
@@ -177,7 +177,7 @@ void sub_020933F8 (UnkStruct_020508D4 * param0, UnkStruct_02095C48 * param1)
 
 static BOOL sub_02093448 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020933F8 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_04) {
@@ -267,7 +267,7 @@ static BOOL sub_02093448 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_020935EC (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_020933F8 * v1 = sub_02050A64(param0);
 
     switch (v1->unk_04) {
diff --git a/src/unk_02095CD4.c b/src/unk_02095CD4.c
index 7870c06d68..ad5b2920f1 100644
--- a/src/unk_02095CD4.c
+++ b/src/unk_02095CD4.c
@@ -62,7 +62,7 @@ static int sub_02095CE8 (u8 param0)
 
 void sub_02095CFC (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param3;
+    FieldSystem * v0 = (FieldSystem *)param3;
     UnkStruct_02095E80 * v1 = v0->unk_88;
 
     if (param0 != CommSys_CurNetId()) {
@@ -85,7 +85,7 @@ void sub_02095CFC (int param0, int param1, void * param2, void * param3)
 
 void sub_02095D74 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_02095E80 * v0 = ((UnkStruct_0203CDB0 *)param3)->unk_88;
+    UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88;
     u8 * v1 = (u8 *)param2;
 
     if (param0 != CommSys_CurNetId()) {
@@ -95,7 +95,7 @@ void sub_02095D74 (int param0, int param1, void * param2, void * param3)
 
 void sub_02095D94 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_02095E80 * v0 = ((UnkStruct_0203CDB0 *)param3)->unk_88;
+    UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88;
     u8 * v1 = (u8 *)param2;
 
     v0->unk_60[param0] = *v1;
@@ -113,7 +113,7 @@ void sub_02095DA8 (int param0, int param1, void * param2, void * param3)
 
 void sub_02095DAC (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_02095E80 * v0 = ((UnkStruct_0203CDB0 *)param3)->unk_88;
+    UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88;
     v0->unk_54 = 2;
 }
 
@@ -124,7 +124,7 @@ void sub_02095DB8 (int param0, int param1, void * param2, void * param3)
 
 void sub_02095DBC (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_02095E80 * v0 = ((UnkStruct_0203CDB0 *)param3)->unk_88;
+    UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88;
     u8 * v1 = (u8 *)param2;
 
     v0->unk_2318 = *v1;
@@ -132,7 +132,7 @@ void sub_02095DBC (int param0, int param1, void * param2, void * param3)
 
 void sub_02095DCC (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_0203CDB0 * v0 = (UnkStruct_0203CDB0 *)param3;
+    FieldSystem * v0 = (FieldSystem *)param3;
     int v1;
     u8 * v2 = sub_0202D79C(v0->unk_0C);
     u8 * v3 = (u8 *)param2;
@@ -152,7 +152,7 @@ void sub_02095DCC (int param0, int param1, void * param2, void * param3)
 
 void sub_02095DFC (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_02095E80 * v0 = ((UnkStruct_0203CDB0 *)param3)->unk_88;
+    UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88;
 
     if (CommSys_CurNetId() != param0) {
         sub_02027FEC(v0->unk_227C, (UnkStruct_02027F8C *)param2, 1, 26);
@@ -162,7 +162,7 @@ void sub_02095DFC (int param0, int param1, void * param2, void * param3)
 
 void sub_02095E28 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_02095E80 * v0 = ((UnkStruct_0203CDB0 *)param3)->unk_88;
+    UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88;
 
     if (CommSys_CurNetId() != param0) {
         MI_CpuCopyFast(param2, v0->unk_2E6C[param0], 1000);
@@ -171,7 +171,7 @@ void sub_02095E28 (int param0, int param1, void * param2, void * param3)
     }
 }
 
-void sub_02095E60 (UnkStruct_0203CDB0 * param0, UnkStruct_02095E80 * param1)
+void sub_02095E60 (FieldSystem * param0, UnkStruct_02095E80 * param1)
 {
     param0->unk_88 = param1;
 }
@@ -198,6 +198,6 @@ static int sub_02095E78 (void)
 
 static u8 * sub_02095E80 (int param0, void * param1, int param2)
 {
-    UnkStruct_02095E80 * v0 = ((UnkStruct_0203CDB0 *)param1)->unk_88;
+    UnkStruct_02095E80 * v0 = ((FieldSystem *)param1)->unk_88;
     return (u8 *)v0->unk_234C[param0];
 }
diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c
index bdab84db2c..78c9917965 100644
--- a/src/unk_02097B18.c
+++ b/src/unk_02097B18.c
@@ -317,7 +317,7 @@ static BOOL sub_02097F38 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_02097F38 * v0 = sub_02050A64(param0);
     UnkStruct_02097F18 * v1 = v0->unk_08;
-    UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
+    FieldSystem * v2 = sub_02050A60(param0);
 
     switch (v0->unk_14) {
     case 0:
diff --git a/src/unk_02098218.c b/src/unk_02098218.c
index 671e12bc54..eaacd427f4 100644
--- a/src/unk_02098218.c
+++ b/src/unk_02098218.c
@@ -214,7 +214,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0)
         break;
     case 2:
     {
-        UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
+        FieldSystem * v1 = sub_02050A60(param0);
 
         {
             Pokemon * v2 = v0->unk_0C.unk_00;
@@ -242,7 +242,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0)
     break;
     case 3:
     {
-        UnkStruct_0203CDB0 * v8 = sub_02050A60(param0);
+        FieldSystem * v8 = sub_02050A60(param0);
         int v9;
 
         v9 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_SPECIES, 0);
@@ -259,7 +259,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0)
             Pokemon_SetValue(v0->unk_0C.unk_00, 120, v0->unk_08->unk_18);
 
             {
-                UnkStruct_0203CDB0 * v10 = sub_02050A60(param0);
+                FieldSystem * v10 = sub_02050A60(param0);
                 UnkStruct_0202CD88 * v11 = sub_0202CD88(sub_0203D174(v10));
 
                 sub_0202CF28(v11, (1 + 48));
diff --git a/src/unk_020985E4.c b/src/unk_020985E4.c
index 73cdf9bf5e..ae71ab5801 100644
--- a/src/unk_020985E4.c
+++ b/src/unk_020985E4.c
@@ -41,7 +41,7 @@ void sub_020985E4 (UnkStruct_020508D4 * param0, SaveData * param1)
 
 BOOL sub_0209862C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_0209862C * v1;
 
     v0 = sub_02050A60(param0);
diff --git a/src/unk_02099604.c b/src/unk_02099604.c
index a8a52f7725..f0d80ea926 100644
--- a/src/unk_02099604.c
+++ b/src/unk_02099604.c
@@ -18,8 +18,8 @@
 FS_EXTERN_OVERLAY(overlay82);
 
 UnkStruct_ov82_0223B164 * sub_02099604(int param0, SaveData * param1, int param2, UnkStruct_0202B628 * param3);
-UnkStruct_ov82_0223B164 * sub_02099674(UnkStruct_0203CDB0 * param0, int param1, int param2);
-UnkStruct_ov82_0223B164 * sub_020996A0(UnkStruct_0203CDB0 * param0, int param1, BOOL param2);
+UnkStruct_ov82_0223B164 * sub_02099674(FieldSystem * param0, int param1, int param2);
+UnkStruct_ov82_0223B164 * sub_020996A0(FieldSystem * param0, int param1, BOOL param2);
 
 UnkStruct_ov82_0223B164 * sub_02099604 (int param0, SaveData * param1, int param2, UnkStruct_0202B628 * param3)
 {
@@ -40,7 +40,7 @@ UnkStruct_ov82_0223B164 * sub_02099604 (int param0, SaveData * param1, int param
     return v0;
 }
 
-static void sub_0209964C (UnkStruct_0203CDB0 * param0, UnkStruct_ov82_0223B164 * param1)
+static void sub_0209964C (FieldSystem * param0, UnkStruct_ov82_0223B164 * param1)
 {
     FS_EXTERN_OVERLAY(overlay82);
 
@@ -56,7 +56,7 @@ static void sub_0209964C (UnkStruct_0203CDB0 * param0, UnkStruct_ov82_0223B164 *
     }
 }
 
-UnkStruct_ov82_0223B164 * sub_02099674 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+UnkStruct_ov82_0223B164 * sub_02099674 (FieldSystem * param0, int param1, int param2)
 {
     UnkStruct_ov82_0223B164 * v0;
 
@@ -66,7 +66,7 @@ UnkStruct_ov82_0223B164 * sub_02099674 (UnkStruct_0203CDB0 * param0, int param1,
     return v0;
 }
 
-UnkStruct_ov82_0223B164 * sub_020996A0 (UnkStruct_0203CDB0 * param0, int param1, BOOL param2)
+UnkStruct_ov82_0223B164 * sub_020996A0 (FieldSystem * param0, int param1, BOOL param2)
 {
     UnkStruct_ov82_0223B164 * v0;
 
diff --git a/src/unk_0209AC14.c b/src/unk_0209AC14.c
index c9e4969c7e..1e0327e9a5 100644
--- a/src/unk_0209AC14.c
+++ b/src/unk_0209AC14.c
@@ -13,12 +13,12 @@
 #include "overlay005/ov5_021D0D80.h"
 #include "overlay007/ov7_0224CD28.h"
 
-static u8 sub_0209AC50(UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1);
+static u8 sub_0209AC50(FieldSystem * param0, UnkStruct_ov7_0224D008 * param1);
 static void sub_0209AC80(UnkStruct_020508D4 * param0);
 
 BOOL sub_0209AC14 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_ov7_0224D008 * v1;
 
     v0 = sub_02050A60(param0);
@@ -36,7 +36,7 @@ BOOL sub_0209AC14 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static u8 sub_0209AC50 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1)
+static u8 sub_0209AC50 (FieldSystem * param0, UnkStruct_ov7_0224D008 * param1)
 {
     if (sub_020509B4(param0)) {
         return 16;
@@ -52,7 +52,7 @@ static u8 sub_0209AC50 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * pa
 
 static void sub_0209AC80 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0;
+    FieldSystem * v0;
     UnkStruct_ov7_0224D008 * v1;
 
     v0 = sub_02050A60(param0);
diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c
index c028256b9d..1c4c137945 100644
--- a/src/unk_0209ACF4.c
+++ b/src/unk_0209ACF4.c
@@ -35,7 +35,7 @@
 #include "overlay005/ov5_021D0D80.h"
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     Strbuf* unk_04;
     Strbuf* unk_08;
     StringFormatter * unk_0C;
@@ -68,7 +68,7 @@ static int sub_0209B288(UnkStruct_0209AD84 * param0);
 
 void sub_0209ACF4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0209AD84 * v1 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0209AD84));
 
     v1->unk_00 = v0;
diff --git a/src/unk_0209B344.c b/src/unk_0209B344.c
index 076856d0e0..6d806c63cd 100644
--- a/src/unk_0209B344.c
+++ b/src/unk_0209B344.c
@@ -21,7 +21,7 @@
 #include "overlay005/ov5_021D0D80.h"
 
 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
     StringFormatter * unk_04;
     Sentence unk_08;
     UnkStruct_0209747C * unk_10;
@@ -36,7 +36,7 @@ static BOOL sub_0209B3C4(UnkStruct_020508D4 * param0);
 
 void sub_0209B344 (UnkStruct_020508D4 * param0, u16 * param1)
 {
-    UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
+    FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0209B3AC * v1 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0209B3AC));
 
     v1->unk_00 = v0;
diff --git a/src/unk_0209BA18.c b/src/unk_0209BA18.c
index 36f440539f..ebd1d477ff 100644
--- a/src/unk_0209BA18.c
+++ b/src/unk_0209BA18.c
@@ -15,12 +15,12 @@
 #include "unk_0203CC84.h"
 #include "unk_0209BA18.h"
 
-UnkStruct_ov104_02230BE4 * sub_0209BA18(UnkStruct_0203CDB0 * param0, void * param1);
+UnkStruct_ov104_02230BE4 * sub_0209BA18(FieldSystem * param0, void * param1);
 BOOL ov104_02239624(UnkStruct_ov104_0222E930 * param0);
 BOOL ov104_02239660(UnkStruct_ov104_0222E930 * param0);
 static BOOL ov104_02239C88(UnkStruct_0209BBA4 * param0, u16 param1, u16 param2);
 
-UnkStruct_ov104_02230BE4 * sub_0209BA18 (UnkStruct_0203CDB0 * param0, void * param1)
+UnkStruct_ov104_02230BE4 * sub_0209BA18 (FieldSystem * param0, void * param1)
 {
     UnkStruct_ov104_02230BE4 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov104_02230BE4));
 
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index b186ed5b0d..220ecb71da 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -29,7 +29,7 @@ typedef struct {
     int unk_04;
     UnkStruct_0209C194_1 unk_08;
     UnkStruct_0209C194 * unk_28;
-    UnkStruct_0203CDB0 * unk_2C;
+    FieldSystem * unk_2C;
     PartyManagementData * unk_30;
     PokemonSummary * unk_34;
 } UnkStruct_0209C1EC;
@@ -62,7 +62,7 @@ BOOL sub_0209C1E8 (UnkStruct_0209C194 * param0)
     return param0->unk_10;
 }
 
-void * sub_0209C1EC (UnkStruct_0203CDB0 * param0)
+void * sub_0209C1EC (FieldSystem * param0)
 {
     UnkStruct_0209C1EC * v0;