diff --git a/include/unk_020530C8.h b/include/field_map_change.h
similarity index 82%
rename from include/unk_020530C8.h
rename to include/field_map_change.h
index 01b37f8cc3..1dcb9365af 100644
--- a/include/unk_020530C8.h
+++ b/include/field_map_change.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_UNK_020530C8_H
-#define POKEPLATINUM_UNK_020530C8_H
+#ifndef POKEPLATINUM_UNK_FIELD_MAP_CHANGE_H
+#define POKEPLATINUM_UNK_FIELD_MAP_CHANGE_H
 
 #include "field/field_system_decl.h"
 #include "struct_defs/struct_02049FA8.h"
@@ -11,9 +11,9 @@ void FieldSystem_MapChange_UpdateGameData(FieldSystem * fieldSystem, BOOL param1
 void FieldSystem_MapChange_UpdateGameDataDistortionWorld(FieldSystem * fieldSystem, BOOL param1);
 void sub_02053494(FieldSystem * fieldSystem);
 void FieldSystem_SetLoadMapFromNewGameTask(FieldSystem * fieldSystem);
-void sub_02053704(FieldSystem * fieldSystem);
-void sub_02053808(FieldSystem * fieldSystem);
-void sub_02053900(TaskManager * param0, const Location * param1);
+void FieldSystem_SetLoadMapFromContinueGameTask(FieldSystem * fieldSystem);
+void FieldSystem_StartLoadMapFromErrorTask(FieldSystem * fieldSystem);
+void FieldSystem_StartChangeMapTask(TaskManager * param0, const Location * param1);
 void sub_020539A0(TaskManager * param0, const Location * param1);
 void sub_020539E8(TaskManager * param0, int param1, int param2, int param3, int param4, int param5);
 void sub_02053A80(TaskManager * param0, int param1, int param2, int param3, int param4, int param5);
@@ -32,4 +32,4 @@ void sub_02054708(TaskManager * param0);
 void sub_02054800(TaskManager * param0, int param1, int param2, int param3, int param4, int param5);
 void sub_02054864(TaskManager * param0);
 
-#endif // POKEPLATINUM_UNK_020530C8_H
+#endif // POKEPLATINUM_UNK_FIELD_MAP_CHANGE_H
diff --git a/include/unk_0202B604.h b/include/unk_0202B604.h
index c7fdbcf3ea..bfc8c283cc 100644
--- a/include/unk_0202B604.h
+++ b/include/unk_0202B604.h
@@ -9,7 +9,7 @@
 int Journal_SaveSize(void);
 void Journal_Init(Journal * param0);
 Journal * SaveData_GetJournal(SaveData * param0);
-Journal * sub_0202B634(Journal * param0, BOOL param1);
+Journal * Journal_GetSavedPage(Journal * param0, BOOL param1);
 BOOL Journal_CheckOpenOnContinue(Journal * param0, BOOL param1);
 void sub_0202B758(Journal * param0, void * param1, u8 param2);
 void * sub_0202BC58(u16 param0, u32 param1);
diff --git a/include/unk_0206A8DC.h b/include/unk_0206A8DC.h
index 12d941708e..2c003a4363 100644
--- a/include/unk_0206A8DC.h
+++ b/include/unk_0206A8DC.h
@@ -27,8 +27,8 @@ BOOL sub_0206AAA8(FieldEvents * param0, int param1);
 BOOL sub_0206AB00(FieldEvents * param0, int param1);
 u16 sub_0206AB68(FieldEvents * param0, int param1);
 void sub_0206AD9C(FieldEvents * param0);
-void sub_0206ADAC(FieldEvents * param0);
-BOOL sub_0206ADBC(FieldEvents * param0);
+void FieldEvents_ResetCommClub(FieldEvents * param0);
+BOOL FieldEvents_CheckCommClub(FieldEvents * param0);
 BOOL EventFlag_VisitedContestHall(FieldEvents * param0);
 BOOL sub_0206ADDC(FieldEvents * param0);
 BOOL sub_0206ADEC(FieldEvents * param0);
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 93d313da83..870c2be48b 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -223,7 +223,7 @@ Static main
 	Object main.nef.p/src_unk_02051D8C.c.o
 	Object main.nef.p/src_unk_020528D0.c.o
 	Object main.nef.p/src_unk_02052C6C.c.o
-	Object main.nef.p/src_unk_020530C8.c.o
+	Object main.nef.p/src_field_map_change.c.o
 	Object main.nef.p/src_unk_02054884.c.o
 	Object main.nef.p/src_unk_02054BD0.c.o
 	Object main.nef.p/src_unk_02054D00.c.o
diff --git a/src/unk_020530C8.c b/src/field_map_change.c
similarity index 96%
rename from src/unk_020530C8.c
rename to src/field_map_change.c
index 4f19939834..ad16e16309 100644
--- a/src/unk_020530C8.c
+++ b/src/field_map_change.c
@@ -52,7 +52,7 @@
 #include "unk_0203E880.h"
 #include "unk_020507CC.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_02054BD0.h"
 #include "unk_02054D00.h"
 #include "unk_020553DC.h"
@@ -438,7 +438,7 @@ static void Location_SetToPlayerLocation (Location * location, const FieldSystem
     Location_Set(location, fieldSystem->location->mapId, -1, Player_GetXPos(fieldSystem->playerAvatar), Player_GetZPos(fieldSystem->playerAvatar), 1);
 }
 
-static BOOL sub_02053518 (const FieldSystem * fieldSystem)
+static BOOL FieldSystem_IsSavedInUnionRoom (const FieldSystem * fieldSystem)
 {
     if (MapHeader_IsPokemonCenter2F(fieldSystem->location->mapId)
         && (fieldSystem->location->x == 7) && (fieldSystem->location->z == 6)) {
@@ -448,7 +448,7 @@ static BOOL sub_02053518 (const FieldSystem * fieldSystem)
     }
 }
 
-static void sub_02053540 (FieldSystem * fieldSystem)
+static void FieldSystem_SetLocationToUnionRoomExit (FieldSystem * fieldSystem)
 {
     Location * v0 = sub_0203A730(SaveData_GetFieldStatus(fieldSystem->saveData));
     FieldEvents * events = SaveData_GetFieldEvents(fieldSystem->saveData);
@@ -503,17 +503,17 @@ static BOOL FieldTask_LoadMapFromContinueGame (TaskManager * taskMan)
             break;
         }
     case 1:
-        fieldSystem->unk_9C = sub_0202B634(SaveData_GetJournal(fieldSystem->saveData), inline_020535E8(events));
+        fieldSystem->unk_9C = Journal_GetSavedPage(SaveData_GetJournal(fieldSystem->saveData), inline_020535E8(events));
 
-        if (sub_0206ADBC(events)) {
-            FieldStatus * v3 = SaveData_GetFieldStatus(fieldSystem->saveData);
+        if (FieldEvents_CheckCommClub(events)) {
+            FieldStatus * fieldStatus = SaveData_GetFieldStatus(fieldSystem->saveData);
 
-            if (sub_02053518(fieldSystem)) {
-                sub_02053540(fieldSystem);
+            if (FieldSystem_IsSavedInUnionRoom(fieldSystem)) {
+                FieldSystem_SetLocationToUnionRoomExit(fieldSystem);
             }
 
-            sub_0206ADAC(events);
-            FieldSystem_MapChange_SetNewLocation(fieldSystem, sub_0203A730(v3));
+            FieldEvents_ResetCommClub(events);
+            FieldSystem_MapChange_SetNewLocation(fieldSystem, sub_0203A730(fieldStatus));
             sub_020533CC(fieldSystem);
             FieldSystem_MapChange_UpdateGameData(fieldSystem, 0);
             FieldSystem_MapChange_CreateObjects(fieldSystem);
@@ -544,13 +544,13 @@ static BOOL FieldTask_LoadMapFromContinueGame (TaskManager * taskMan)
     return FALSE;
 }
 
-void sub_02053704 (FieldSystem * fieldSystem)
+void FieldSystem_SetLoadMapFromContinueGameTask (FieldSystem * fieldSystem)
 {
     fieldSystem->unk_70 = 0;
     FieldTask_Set(fieldSystem, FieldTask_LoadMapFromContinueGame, NULL);
 }
 
-static BOOL sub_02053718 (TaskManager * taskMan)
+static BOOL FieldTask_LoadMapFromError (TaskManager * taskMan)
 {
     FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan);
     UnkStruct_02053718 * v1 = TaskManager_Environment(taskMan);
@@ -562,7 +562,7 @@ static BOOL sub_02053718 (TaskManager * taskMan)
         sub_0200F344(0, 0x0);
         sub_0200F344(1, 0x0);
         sub_0202878C(fieldSystem->saveData);
-        fieldSystem->unk_9C = sub_0202B634(SaveData_GetJournal(fieldSystem->saveData), inline_020535E8(v2));
+        fieldSystem->unk_9C = Journal_GetSavedPage(SaveData_GetJournal(fieldSystem->saveData), inline_020535E8(v2));
         (*state)++;
         break;
     case 1:
@@ -597,19 +597,19 @@ static BOOL sub_02053718 (TaskManager * taskMan)
     return 0;
 }
 
-void sub_02053808 (FieldSystem * fieldSystem)
+void FieldSystem_StartLoadMapFromErrorTask (FieldSystem * fieldSystem)
 {
     UnkStruct_02053718 * v1;
 
     if (MapHeader_IsUnionRoom(fieldSystem->location->mapId)) {
         
-    } else if (sub_02053518(fieldSystem)) {
-        FieldEvents * v2 = SaveData_GetFieldEvents(fieldSystem->saveData);
+    } else if (FieldSystem_IsSavedInUnionRoom(fieldSystem)) {
+        FieldEvents * events = SaveData_GetFieldEvents(fieldSystem->saveData);
 
-        sub_02053540(fieldSystem);
-        sub_0206AD9C(v2);
+        FieldSystem_SetLocationToUnionRoomExit(fieldSystem);
+        sub_0206AD9C(events);
     } else {
-        sub_02053704(fieldSystem);
+        FieldSystem_SetLoadMapFromContinueGameTask(fieldSystem);
         return;
     }
 
@@ -618,7 +618,7 @@ void sub_02053808 (FieldSystem * fieldSystem)
 
     Location_Set(&v1->unk_04, 466, -1, 8, 14, 0);
     fieldSystem->unk_70 = 2;
-    FieldTask_Set(fieldSystem, sub_02053718, v1);
+    FieldTask_Set(fieldSystem, FieldTask_LoadMapFromError, v1);
 }
 
 static BOOL FieldTask_ChangeMap (TaskManager * taskMan)
@@ -649,13 +649,13 @@ static BOOL FieldTask_ChangeMap (TaskManager * taskMan)
         break;
     case 3:
         Heap_FreeToHeap(v1);
-        return 1;
+        return TRUE;
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_02053900 (TaskManager * taskMan, const Location * nextLocation)
+void FieldSystem_StartChangeMapTask (TaskManager * taskMan, const Location * nextLocation)
 {
     UnkStruct_02053900 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053900));
 
@@ -883,10 +883,8 @@ static void sub_02053C70 (TaskManager * taskMan)
         return;
     }
 
-    {
-        v1->unk_04 = ov6_02245CCC(fieldSystem, PlayerAvatar_Gender(fieldSystem->playerAvatar));
-        FieldTask_Start(taskMan, sub_02053CB4, v1);
-    }
+    v1->unk_04 = ov6_02245CCC(fieldSystem, PlayerAvatar_Gender(fieldSystem->playerAvatar));
+    FieldTask_Start(taskMan, sub_02053CB4, v1);
 }
 
 static BOOL sub_02053CB4 (TaskManager * taskMan)
@@ -1586,5 +1584,5 @@ void sub_02054864 (TaskManager * taskMan)
     Location * v1 = sub_0203A730(SaveData_GetFieldStatus(fieldSystem->saveData));
 
     fieldSystem->unk_70 = 0;
-    sub_02053900(fieldSystem->unk_10, v1);
+    FieldSystem_StartChangeMapTask(fieldSystem->unk_10, v1);
 }
diff --git a/src/field_system.c b/src/field_system.c
index a639e65705..de809d5922 100644
--- a/src/field_system.c
+++ b/src/field_system.c
@@ -26,7 +26,7 @@
 #include "unk_0203A6DC.h"
 #include "field_system.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "comm_player_manager.h"
 #include "unk_0205F180.h"
 #include "pokeradar.h"
@@ -63,9 +63,9 @@ static int FieldSystem_InitContinue (OverlayManager * overlayMan, int * param1)
     sFieldSystem = FieldSystem_Init(overlayMan);
 
     if (v0->unk_04) {
-        sub_02053808(sFieldSystem);
+        FieldSystem_StartLoadMapFromErrorTask(sFieldSystem);
     } else {
-        sub_02053704(sFieldSystem);
+        FieldSystem_SetLoadMapFromContinueGameTask(sFieldSystem);
     }
 
     v0->unk_04 = 0;
diff --git a/src/meson.build b/src/meson.build
index 84d82f443c..0b444587b8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -211,7 +211,7 @@ pokeplatinum_c = files(
     'unk_02051D8C.c',
     'unk_020528D0.c',
     'unk_02052C6C.c',
-    'unk_020530C8.c',
+    'field_map_change.c',
     'unk_02054884.c',
     'unk_02054BD0.c',
     'unk_02054D00.c',
diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c
index 080aaf11f2..ce5ac0ee1a 100644
--- a/src/overlay005/fieldmap.c
+++ b/src/overlay005/fieldmap.c
@@ -53,7 +53,7 @@
 #include "field_system.h"
 #include "unk_0203E880.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_020553DC.h"
 #include "unk_020556C4.h"
 #include "unk_020559DC.h"
diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c
index b3b4f3abf1..4b6a92e7ee 100644
--- a/src/overlay005/ov5_021D1C30.c
+++ b/src/overlay005/ov5_021D1C30.c
@@ -36,7 +36,7 @@
 #include "unk_0203E880.h"
 #include "unk_020507CC.h"
 #include "unk_02050A74.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_02054884.h"
 #include "unk_02054D00.h"
 #include "unk_020562F8.h"
diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c
index c8c0f2ef1f..c1b2e3ee8b 100644
--- a/src/overlay006/ov6_02247100.c
+++ b/src/overlay006/ov6_02247100.c
@@ -18,7 +18,7 @@
 #include "unk_0203A6DC.h"
 #include "unk_0203A7D8.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "player_avatar.h"
 #include "unk_020655F4.h"
 #include "overlay005/ov5_021F0EB0.h"
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index ddea6a59d3..2e03c5dd70 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -44,7 +44,7 @@
 #include "field_system.h"
 #include "unk_020507CC.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_02054D00.h"
 #include "unk_020573FC.h"
 #include "comm_player_manager.h"
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index ca7841d356..28dfb5e411 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -48,7 +48,7 @@
 #include "unk_0202854C.h"
 #include "communication_system.h"
 #include "field_system.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "comm_player_manager.h"
 #include "player_avatar.h"
 #include "unk_0206A780.h"
diff --git a/src/unk_0202B604.c b/src/unk_0202B604.c
index 372c8a63d0..cb395d0824 100644
--- a/src/unk_0202B604.c
+++ b/src/unk_0202B604.c
@@ -137,7 +137,7 @@ Journal * SaveData_GetJournal (SaveData * param0)
     return SaveData_SaveTable(param0, 18);
 }
 
-Journal * sub_0202B634 (Journal * param0, BOOL param1)
+Journal * Journal_GetSavedPage (Journal * param0, BOOL param1)
 {
     RTCDate v0;
     s32 v1;
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 5fd8d0c16a..954514a594 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -145,7 +145,7 @@
 #include "unk_02050A74.h"
 #include "unk_020528D0.h"
 #include "unk_02052C6C.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_020553DC.h"
 #include "unk_02055808.h"
 #include "unk_020559DC.h"
@@ -6172,7 +6172,7 @@ static BOOL ScrCmd_1CC (ScriptContext * ctx)
     FieldSystem * fieldSystem = ctx->fieldSystem;
 
     inline_02044528(SaveData_GetFieldEvents(fieldSystem->saveData));
-    fieldSystem->unk_9C = sub_0202B634(SaveData_GetJournal(fieldSystem->saveData), 1);
+    fieldSystem->unk_9C = Journal_GetSavedPage(SaveData_GetJournal(fieldSystem->saveData), 1);
     sub_02053494(fieldSystem);
 
     return 0;
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index 16d7a3f4e4..e6422ceea9 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -236,7 +236,7 @@ void sub_02049FA8 (FieldSystem * fieldSystem)
 
 void sub_02049FE8 (FieldSystem * fieldSystem)
 {
-    sub_0206ADAC(SaveData_GetFieldEvents(fieldSystem->saveData));
+    FieldEvents_ResetCommClub(SaveData_GetFieldEvents(fieldSystem->saveData));
 }
 
 u16 sub_02049FF8 (SaveData * param0, u16 param1)
diff --git a/src/unk_02050568.c b/src/unk_02050568.c
index 7b749a06e0..b871bff559 100644
--- a/src/unk_02050568.c
+++ b/src/unk_02050568.c
@@ -20,7 +20,7 @@
 #include "unk_02050568.h"
 #include "unk_020507CC.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_02055808.h"
 #include "unk_02056B30.h"
 #include "player_avatar.h"
diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c
index 89857a2e6a..7d99f889b8 100644
--- a/src/unk_02050A74.c
+++ b/src/unk_02050A74.c
@@ -36,7 +36,7 @@
 #include "enc_effects.h"
 #include "unk_02051D8C.h"
 #include "unk_020528D0.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_0205578C.h"
 #include "unk_02055808.h"
 #include "unk_020562F8.h"
diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c
index 54e2e8a59b..fc1a17700d 100644
--- a/src/unk_020528D0.c
+++ b/src/unk_020528D0.c
@@ -37,7 +37,7 @@
 #include "unk_0203E880.h"
 #include "unk_020508D4.h"
 #include "unk_020528D0.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_020553DC.h"
 #include "unk_02055808.h"
 #include "unk_02070428.h"
diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c
index 90c8921a68..802c0d136f 100644
--- a/src/unk_02056B30.c
+++ b/src/unk_02056B30.c
@@ -20,7 +20,7 @@
 #include "unk_02020020.h"
 #include "map_header.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_02054D00.h"
 #include "unk_020553DC.h"
 #include "unk_02055808.h"
diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c
index f13ebf1780..b02621fd1e 100644
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -41,7 +41,7 @@
 #include "unk_0203E880.h"
 #include "unk_020507CC.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_02054D00.h"
 #include "unk_020553DC.h"
 #include "unk_02055C50.h"
diff --git a/src/unk_0206A8DC.c b/src/unk_0206A8DC.c
index dc1093f7b9..22fc42d91e 100644
--- a/src/unk_0206A8DC.c
+++ b/src/unk_0206A8DC.c
@@ -342,13 +342,13 @@ void sub_0206AD9C (FieldEvents * param0)
     return;
 }
 
-void sub_0206ADAC (FieldEvents * param0)
+void FieldEvents_ResetCommClub (FieldEvents * param0)
 {
     sub_0206A8E4(param0, (2400 + 6));
     return;
 }
 
-BOOL sub_0206ADBC (FieldEvents * param0)
+BOOL FieldEvents_CheckCommClub (FieldEvents * param0)
 {
     return sub_0206A8EC(param0, (2400 + 6));
 }
diff --git a/src/unk_0206C0E8.c b/src/unk_0206C0E8.c
index ed8fd71095..91aba5e694 100644
--- a/src/unk_0206C0E8.c
+++ b/src/unk_0206C0E8.c
@@ -17,7 +17,7 @@
 #include "heap.h"
 #include "unk_020507CC.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_02055808.h"
 #include "unk_02056B30.h"
 #include "player_avatar.h"
diff --git a/src/unk_0206C784.c b/src/unk_0206C784.c
index 5c517b172d..d8b1a37b2f 100644
--- a/src/unk_0206C784.c
+++ b/src/unk_0206C784.c
@@ -17,7 +17,7 @@
 #include "unk_02020020.h"
 #include "unk_0203D1B8.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "unk_02054D00.h"
 #include "unk_020553DC.h"
 #include "unk_02055808.h"
diff --git a/src/unk_0207064C.c b/src/unk_0207064C.c
index 5d6b756604..68e416f46a 100644
--- a/src/unk_0207064C.c
+++ b/src/unk_0207064C.c
@@ -11,7 +11,7 @@
 #include "heap.h"
 #include "unk_0203A7D8.h"
 #include "unk_020508D4.h"
-#include "unk_020530C8.h"
+#include "field_map_change.h"
 #include "player_avatar.h"
 #include "unk_0207064C.h"
 #include "overlay006/ov6_02243258.h"