more labels (#165)

* more labels and match sub_810745C

* formatting

* move BattleStruct to battle.h and combine both loose structs

* oops

* more labels for rom4.c

14 files changed, 126 insertions, 212 deletions

diff --git a/src/battle_ai.c b/src/battle_ai.c
index 19ccfef99..1bb57cc59 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai.c
@@ -16,24 +16,24 @@ enum
 	USER
 };
 
+extern void move_effectiveness_something(u16, u8, u8);
+
 extern u16 gBattleTypeFlags;
 extern u8 gUnknown_02024A60;
-extern u8 gUnknown_02024C07; 
-extern u8 gUnknown_02024C08;
-extern u8 gUnknown_02024C0C;
-extern u16 gUnknown_02024DEC;
-extern u8 gUnknown_02024C68;
-extern u32 gUnknown_02024BEC;
-extern u8 gUnknown_0201601C;
-extern u8 gUnknown_0201601F;
 extern u16 gUnknown_02024BE6;
-extern u8 gCritMultiplier;
+extern u32 gUnknown_02024BEC;
+extern u8 gUnknown_02024C07; // something player?
+extern u8 gUnknown_02024C08; // something opponent?
+extern u8 gUnknown_02024C0C; 
+extern u8 gUnknown_02024C68;
+extern u16 gUnknown_02024DEC;
 extern u16 gUnknown_02024C34[];
 extern u32 gUnknown_02024ACC[];
 extern u32 gUnknown_02024C98[];
 extern u16 gUnknown_02024C7A[];
 extern struct BattlePokemon gUnknown_02024A8C[];
 extern u8 gUnknown_030042E0[];
+extern u8 gCritMultiplier;
 extern u16 gTrainerBattleOpponent;
 extern u32 gBitTable[];
 extern u8 *BattleAIs[];
@@ -61,43 +61,12 @@ struct UnknownStruct1
 /* 0x2C */ u8 unk8;
 };
 
-struct AI_ThinkingStruct /* 0x2016800 */
-{
-/* 0x00 */ u8 unk0;
-/* 0x01 */ u8 moveConsidered;
-/* 0x02 */ u16 unk2;
-/* 0x04 */ s8 score[4]; // score?
-/* 0x08 */ u32 unk8;
-/* 0x0C */ u32 aiFlags;
-/* 0x10 */ u8 unk10;
-/* 0x11 */ u8 aiLogicId;
-/* 0x12 */ u8 filler12[6];
-/* 0x18 */ u8 unk18[4];
-};
-
 struct UnknownStruct3
 {
     u8 filler0[0x20];
     u8 unk20;
 };
 
-struct SmallBattleStruct1
-{
-	u8 unk1;
-	u8 unk2;
-	u8 unk3;
-	u8 unk4;
-};
-
-// move to battle.h before PR.
-struct BattleStruct /* 0x2000000 */
-{
-	u8 filler0[0x1601C];
-	struct SmallBattleStruct1 unk;
-};
-
-extern struct BattleStruct unk_2000000;
-extern struct AI_ThinkingStruct gAIThinkingSpace;
 extern struct UnknownStruct1 unk_2016A00;
 extern struct UnknownStruct3 unk_2016C00;
 
@@ -263,63 +232,20 @@ void BattleAI_DoAIProcessing(void)
     }
 }
 
-#ifdef NONMATCHING
 void sub_810745C(void)
 {
     s32 i;
     
     for(i = 0; i < 8; i++)
     {
-        if(unk_2016A00.unk0[gUnknown_02024C08 / 2][i] == 0)
+        // this is the same as dividing it by 2, but for some reason, >> 1 is needed to match the asm.
+        if(unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] == 0)
         {
-            //gUnknown_02024C34[gUnknown_02024C08] += 0;
-            unk_2016A00.unk0[gUnknown_02024C08 / 2][i] = gUnknown_02024C34[gUnknown_02024C08];
+            unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] = gUnknown_02024C34[gUnknown_02024C08];
             return;
         }
     }
 }
-#else
-__attribute__((naked))
-void sub_810745C(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    movs r2, 0\n\
-    ldr r3, _08107488 @ =gUnknown_02024C08\n\
-    ldr r5, _0810748C @ =0x02016a00\n\
-    ldr r6, _08107490 @ =gUnknown_02024C34\n\
-    adds r4, r3, 0\n\
-_08107468:\n\
-    lsls r0, r2, 1\n\
-    ldrb r1, [r4]\n\
-    lsrs r1, 1\n\
-    lsls r1, 4\n\
-    adds r0, r1\n\
-    adds r1, r0, r5\n\
-    ldrh r0, [r1]\n\
-    cmp r0, 0\n\
-    bne _08107494\n\
-    ldrb r0, [r3]\n\
-    lsls r0, 1\n\
-    adds r0, r6\n\
-    ldrh r0, [r0]\n\
-    strh r0, [r1]\n\
-    b _0810749A\n\
-    .align 2, 0\n\
-_08107488: .4byte gUnknown_02024C08\n\
-_0810748C: .4byte 0x02016a00\n\
-_08107490: .4byte gUnknown_02024C34\n\
-_08107494:\n\
-    adds r2, 0x1\n\
-    cmp r2, 0x7\n\
-    ble _08107468\n\
-_0810749A:\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .syntax divided");
-}
-#endif
 
 void unref_sub_81074A0(u8 a)
 {
@@ -1321,37 +1247,22 @@ void BattleAICmd_get_ability(void)
     }
 }
 
-// this should probably be in battle.h after this file is fully decompiled.
-extern struct
-{
-    u8 unknownStuff[0x16000];
-    struct
-    {
-        u8 filler0[0x1C];
-        u8 unk1C;
-        u8 filler1D[2];
-        u8 unk1F;
-        u8 filler16020[0x7E0];
-    } unk_2016000;
-    struct AI_ThinkingStruct gAIThinkingSpace;
-} ewram; //0x02000000
-
 #ifdef NONMATCHING
 void BattleAICmd_unk_30(void)
 {
-	s32 loopCounter;
+	s32 i;
     
 	gUnknown_02024DEC = 0;
-    ewram.unk_2016000.unk1C = 0;
-    ewram.unk_2016000.unk1F = 1;
+    unk_2000000.unk.unk1 = 0;
+    unk_2000000.unk.unk4 = 1;
 	gUnknown_02024C68 = 0;
 	gCritMultiplier = 1;
-	ewram.gAIThinkingSpace.unk8 = 0;
+	unk_2000000.ai.unk0 = 0;
 	
-	for(loopCounter = 0; loopCounter <= 3; loopCounter++)
+	for(i = 0; i < 4; i++)
 	{
 		gUnknown_02024BEC = 40;
-		gUnknown_02024BE6 = gBattleMons[gUnknown_02024C07].moves[loopCounter];
+		gUnknown_02024BE6 = gBattleMons[gUnknown_02024C07].moves[i];
 		
 		if (gUnknown_02024BE6)
 		{
@@ -1370,8 +1281,8 @@ void BattleAICmd_unk_30(void)
 			if(gUnknown_02024C68 & 8)
 				gUnknown_02024BEC = 0;
 			
-			if (ewram.gAIThinkingSpace.unk8 < gUnknown_02024BEC)
-				ewram.gAIThinkingSpace.unk8 = gUnknown_02024BEC;
+			if (unk_2000000.ai.unk0 < gUnknown_02024BEC)
+				unk_2000000.ai.unk0 = gUnknown_02024BEC;
 		}
 	}
 	gAIScriptPtr += 1;
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 5296f1923..1c3e8e836 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -26,6 +26,7 @@
 
 extern u16 gScriptResult;
 
+// IV + LEVEL + SPECIES
 struct TrainerPartyMember0
 {
     u16 iv;
@@ -33,6 +34,7 @@ struct TrainerPartyMember0
     u16 species;
 };
 
+// IV + LEVEL + SPECIES + MOVES
 struct TrainerPartyMember1
 {
     u16 iv;
@@ -41,6 +43,7 @@ struct TrainerPartyMember1
     u16 moves[4];
 };
 
+// IV + LEVEL + SPECIES + ITEMS
 struct TrainerPartyMember2
 {
     u16 iv;
@@ -49,6 +52,7 @@ struct TrainerPartyMember2
     u16 heldItem;
 };
 
+// IV + LEVEL + SPECIES + ITEMS + MOVES
 struct TrainerPartyMember3
 {
     u16 iv;
@@ -167,8 +171,8 @@ void StartBattle_StandardWild(void)
     gMain.savedCallback = HandleWildBattleEnd;
     gBattleTypeFlags = 0;
     task_add_01_battle_start(GetWildBattleTransition(), 0);
-    sav12_xor_increment(7);
-    sav12_xor_increment(8);
+    IncrementGameStat(7);
+    IncrementGameStat(8);
 }
 
 void StartBattle_Roamer(void)
@@ -179,8 +183,8 @@ void StartBattle_Roamer(void)
     gMain.savedCallback = HandleWildBattleEnd;
     gBattleTypeFlags = BATTLE_TYPE_ROAMER;
     task_add_01_battle_start(GetWildBattleTransition(), 0);
-    sav12_xor_increment(7);
-    sav12_xor_increment(8);
+    IncrementGameStat(7);
+    IncrementGameStat(8);
 }
 
 void StartBattle_Safari(void)
@@ -196,8 +200,8 @@ void StartBattle_Safari(void)
 void task_add_01_battle_start_with_music_and_stats(void)
 {
     task_add_01_battle_start(GetTrainerBattleTransition(), 0);
-    sav12_xor_increment(7);
-    sav12_xor_increment(9);
+    IncrementGameStat(7);
+    IncrementGameStat(9);
 }
 
 //Initiates battle where Wally catches Ralts
@@ -216,8 +220,8 @@ void StartBattle_ScriptedWild(void)
     gMain.savedCallback = HandleScriptedWildBattleEnd;
     gBattleTypeFlags = 0;
     task_add_01_battle_start(GetWildBattleTransition(), 0);
-    sav12_xor_increment(7);
-    sav12_xor_increment(8);
+    IncrementGameStat(7);
+    IncrementGameStat(8);
 }
 
 void StartBattle_SouthernIsland(void)
@@ -226,8 +230,8 @@ void StartBattle_SouthernIsland(void)
     gMain.savedCallback = HandleScriptedWildBattleEnd;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
     task_add_01_battle_start(GetWildBattleTransition(), 0);
-    sav12_xor_increment(7);
-    sav12_xor_increment(8);
+    IncrementGameStat(7);
+    IncrementGameStat(8);
 }
 
 void StartBattle_Rayquaza(void)
@@ -236,8 +240,8 @@ void StartBattle_Rayquaza(void)
     gMain.savedCallback = HandleScriptedWildBattleEnd;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
     task_add_01_battle_start(0, BGM_BATTLE34);
-    sav12_xor_increment(7);
-    sav12_xor_increment(8);
+    IncrementGameStat(7);
+    IncrementGameStat(8);
 }
 
 void StartBattle_GroudonKyogre(void)
@@ -249,8 +253,8 @@ void StartBattle_GroudonKyogre(void)
         task_add_01_battle_start(0xB, BGM_BATTLE34); // KYOGRE
     else
         task_add_01_battle_start(0x6, BGM_BATTLE34); // GROUDON
-    sav12_xor_increment(7);
-    sav12_xor_increment(8);
+    IncrementGameStat(7);
+    IncrementGameStat(8);
 }
 
 void StartBattle_Regi(void)
@@ -259,8 +263,8 @@ void StartBattle_Regi(void)
     gMain.savedCallback = HandleScriptedWildBattleEnd;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
     task_add_01_battle_start(0xA, BGM_BATTLE36);
-    sav12_xor_increment(7);
-    sav12_xor_increment(8);
+    IncrementGameStat(7);
+    IncrementGameStat(8);
 }
 
 void HandleWildBattleEnd(void)
@@ -270,7 +274,7 @@ void HandleWildBattleEnd(void)
 
     if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE)
     {
-        SetMainCallback2(c2_whiteout);
+        SetMainCallback2(CB2_WhiteOut);
     }
     else
     {
@@ -285,7 +289,7 @@ void HandleScriptedWildBattleEnd(void)
     ResetOamRange(0, 128);
 
     if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE)
-        SetMainCallback2(c2_whiteout);
+        SetMainCallback2(CB2_WhiteOut);
     else
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
 }
@@ -448,7 +452,7 @@ u8 GetWildBattleTransition(void)
 u8 GetTrainerBattleTransition(void)
 {
     struct Trainer *trainer;
-    u8 partyCount;
+    u8 minPartyCount;
     u8 flashVar;
     u8 level;
 
@@ -474,14 +478,14 @@ u8 GetTrainerBattleTransition(void)
         return 16;
 
     if (trainer[gTrainerBattleOpponent].doubleBattle == TRUE)
-        partyCount = 2; // double battles always at least have 2 pokemon.
+        minPartyCount = 2; // double battles always at least have 2 pokemon.
     else
-        partyCount = 1;
+        minPartyCount = 1;
 
     flashVar = GetBattleTransitionTypeByMap();
-    level = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent, partyCount);
+    level = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent, minPartyCount);
 
-    if (level < (u8)GetSumOfPartyMonLevel(partyCount)) // is wild mon level than the player's mon level?
+    if (level < (u8)GetSumOfPartyMonLevel(minPartyCount)) // is wild mon level than the player's mon level?
         return gBattleTransitionTable_Trainer[flashVar][0];
     else
         return gBattleTransitionTable_Trainer[flashVar][1];
@@ -528,8 +532,8 @@ void CB2_StartFirstBattle(void)
         SetMainCallback2(sub_800E7C4);
         prev_quest_postbuffer_cursor_backup_reset();
         overworld_poison_timer_set();
-        sav12_xor_increment(7);
-        sav12_xor_increment(8);
+        IncrementGameStat(7);
+        IncrementGameStat(8);
     }
 }
 
@@ -747,7 +751,7 @@ void sub_808260C(void)
     }
     else if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE)
     {
-        SetMainCallback2(c2_whiteout);
+        SetMainCallback2(CB2_WhiteOut);
     }
     else
     {
@@ -764,7 +768,7 @@ void do_choose_name_or_words_screen(void)
     }
     else if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE)
     {
-        SetMainCallback2(c2_whiteout);
+        SetMainCallback2(CB2_WhiteOut);
     }
     else
     {
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 7e4e5aed6..fdd5ae5c5 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -415,7 +415,7 @@ u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e)
         return 5;
     if (ShouldJumpLedge(b, c, d))
     {
-        sav12_xor_increment(0x2B);
+        IncrementGameStat(0x2B);
         return 6;
     }
     if (sp0 == 4 && sub_8058F6C(b, c, d))
diff --git a/src/field_poison.c b/src/field_poison.c
index 309ec1d71..9b21ac5f3 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -100,7 +100,7 @@ void Task_WhiteOut(u8 taskId)
     }
 }
 
-void DoWhiteOut(void)
+void ExecuteWhiteOut(void)
 {
     CreateTask(Task_WhiteOut, 0x50);
     ScriptContext1_Stop();
diff --git a/src/item_use.c b/src/item_use.c
index af22eddae..557705460 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -231,7 +231,7 @@ void ItemUseOnFieldCB_Rod(u8 taskId)
 
 void ItemUseOutOfBattle_Itemfinder(u8 var)
 {
-	sav12_xor_increment(0x27);
+	IncrementGameStat(0x27);
 	gUnknown_03005D00 = (void *)ItemUseOnFieldCB_Itemfinder;
 	SetUpItemUseOnFieldCallback(var);
 }
diff --git a/src/new_game.c b/src/new_game.c
index aced10a47..4f93e4e3c 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -29,19 +29,19 @@ const struct SB1_2EFC_Struct gUnknown_08216604 =
     }
 };
 
-void write_word_to_mem(u32 a1, u8 *a2)
+void write_word_to_mem(u32 var, u8 *dataPtr)
 {
-    a2[0] = a1;
-    a2[1] = a1 >> 8;
-    a2[2] = a1 >> 16;
-    a2[3] = a1 >> 24;
+    dataPtr[0] = var;
+    dataPtr[1] = var >> 8;
+    dataPtr[2] = var >> 16;
+    dataPtr[3] = var >> 24;
 }
 
-void sub_8052D10(u8 *a1, u8 *a2)
+void copy_word_to_mem(u8 *copyTo, u8 *copyFrom)
 {
     s32 i;
     for (i = 0; i < 4; i++)
-        a1[i] = a2[i];
+        copyTo[i] = copyFrom[i];
 }
 
 void set_player_trainer_id(void)
@@ -49,6 +49,7 @@ void set_player_trainer_id(void)
     write_word_to_mem((Random() << 16) | Random(), gSaveBlock2.playerTrainerId);
 }
 
+// L=A isnt set here for some reason.
 void SetDefaultOptions(void)
 {
     gSaveBlock2.optionsTextSpeed = OPTIONS_TEXT_SPEED_MID;
@@ -59,7 +60,7 @@ void SetDefaultOptions(void)
     gSaveBlock2.regionMapZoom = FALSE;
 }
 
-void sub_8052D78(void)
+void ClearPokedexFlags(void)
 {
     gUnknown_03005CE8 = 0;
     memset(&gSaveBlock2.pokedex.owned, 0, sizeof(gSaveBlock2.pokedex.owned));
@@ -79,7 +80,7 @@ void sub_8052DE4(void)
     CpuFill32(0, &gSaveBlock2.filler_A8, sizeof(gSaveBlock2.filler_A8));
 }
 
-void sub_8052E04(void)
+void WarpToTruck(void)
 {
     warp1_set(25, 40, -1, -1, -1); // inside of truck
     warp_in();
@@ -114,7 +115,7 @@ void NewGameInitData(void)
     gSaveBlock2.specialSaveWarp = 0;
     set_player_trainer_id();
     PlayTimeCounter_Reset();
-    sub_8052D78();
+    ClearPokedexFlags();
     InitEventData();
     sub_80BD7A8();
     sub_80BDAB4();
@@ -122,7 +123,7 @@ void NewGameInitData(void)
     ClearBerryTrees();
     gSaveBlock1.money = 3000;
     sub_80AB1B0();
-    sub_80530AC();
+    ResetGameStats();
     sub_8052DA8();
     InitLinkBattleRecords();
     InitShroomishSizeRecord();
@@ -142,6 +143,6 @@ void NewGameInitData(void)
     sub_80FA17C();
     sub_810FA54();
     ResetLotteryCorner();
-    sub_8052E04();
+    WarpToTruck();
     ScriptContext2_RunNewScript(gUnknown_0819FA81);
 }
diff --git a/src/rom4.c b/src/rom4.c
index e7c28f474..4f3e35fea 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -74,25 +74,25 @@ extern struct UnkTVStruct gUnknown_03004870;
 extern u16 gUnknown_03004898;
 extern u16 gUnknown_0300489C;
 
-extern u8 gUnknown_0819FC74[];
+extern u8 EventScript_LeagueWhiteOut[];
 extern u8 gUnknown_0819FC9F[];
-extern u8 gUnknown_081A436F[];
-extern u8 gUnknown_081A4379[];
-extern u8 gUnknown_081A4383[];
-extern u8 gUnknown_081A439E[];
-extern u8 gUnknown_081A43B9[];
-extern u8 gUnknown_081A43D4[];
-extern u8 gUnknown_081A43F0[];
-extern u8 gUnknown_081A43FA[];
-extern u8 gUnknown_081A4418[];
-extern u8 gUnknown_081A442D[];
-extern u8 gUnknown_081A4442[];
-extern u8 gUnknown_081A4457[];
-extern u8 gUnknown_081A4479[];
-extern u8 gUnknown_081A4487[];
-extern u8 gUnknown_081A4495[];
-extern u8 gUnknown_081A44E5[];
-extern u8 gUnknown_081A44FE[];
+extern u8 SingleBattleColosseum_EventScript_1A436F[];
+extern u8 SingleBattleColosseum_EventScript_1A4379[];
+extern u8 DoubleBattleColosseum_EventScript_1A4383[];
+extern u8 DoubleBattleColosseum_EventScript_1A439E[];
+extern u8 DoubleBattleColosseum_EventScript_1A43B9[];
+extern u8 DoubleBattleColosseum_EventScript_1A43D4[];
+extern u8 TradeCenter_EventScript_1A43F0[];
+extern u8 TradeCenter_EventScript_1A43FA[];
+extern u8 RecordCorner_EventScript_1A4418[];
+extern u8 RecordCorner_EventScript_1A442D[];
+extern u8 RecordCorner_EventScript_1A4442[];
+extern u8 RecordCorner_EventScript_1A4457[];
+extern u8 TradeRoom_ReadTrainerCard1[];
+extern u8 TradeRoom_ReadTrainerCard2[];
+extern u8 TradeRoom_TooBusyToNotice[];
+extern u8 TradeRoom_PromptToCancelLink[];
+extern u8 TradeRoom_TerminateLink[];
 extern u8 gUnknown_081A4508[];
 
 extern struct UCoords32 gUnknown_0821664C[];
@@ -108,9 +108,9 @@ extern s32 gUnknown_0839ACE8;
 extern u32 gUnknown_08216694[];
 
 
-void sub_8052F5C(void)
+void DoWhiteOut(void)
 {
-    ScriptContext2_RunNewScript(gUnknown_0819FC74);
+    ScriptContext2_RunNewScript(EventScript_LeagueWhiteOut);
     gSaveBlock1.money /= 2;
     HealPlayerParty();
     sub_8053050();
@@ -168,14 +168,15 @@ void sub_805308C(void)
     sub_8134348();
 }
 
-void sub_80530AC(void)
+void ResetGameStats(void)
 {
     s32 i;
+
     for (i = 0; i < NUM_GAME_STATS; i++)
         gSaveBlock1.gameStats[i] = 0;
 }
 
-void sav12_xor_increment(u8 index)
+void IncrementGameStat(u8 index)
 {
     if (index < NUM_GAME_STATS)
     {
@@ -186,7 +187,7 @@ void sav12_xor_increment(u8 index)
     }
 }
 
-u32 sub_8053108(u8 index)
+u32 GetGameStat(u8 index)
 {
     if (index >= NUM_GAME_STATS)
         return 0;
@@ -194,7 +195,7 @@ u32 sub_8053108(u8 index)
     return gSaveBlock1.gameStats[index];
 }
 
-void sav12_xor_set(u8 index, u32 value)
+void SetGameStat(u8 index, u32 value)
 {
     if (index < NUM_GAME_STATS)
         gSaveBlock1.gameStats[index] = value;
@@ -512,6 +513,7 @@ bool8 sub_80538D0(u16 x, u16 y)
 void sub_80538F0(u8 mapGroup, u8 mapNum)
 {
     s32 i;
+
     warp1_set(mapGroup, mapNum, -1, -1, -1);
     sub_8053F0C();
     warp_shift();
@@ -530,8 +532,10 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     not_trainer_hill_battle_pyramid();
     sub_8056D38(gMapHeader.mapData);
     apply_map_tileset2_palette(gMapHeader.mapData);
+
     for (i = 6; i < 12; i++)
         sub_807D874(i);
+
     sub_8072ED0();
     mapnumbers_history_shift_sav1_0_2_4_out();
     sub_8134394();
@@ -1106,7 +1110,7 @@ void CB2_NewGame(void)
     SetMainCallback2(c2_overworld);
 }
 
-void c2_whiteout(void)
+void CB2_WhiteOut(void)
 {
     u8 val;
     gMain.state++;
@@ -1115,7 +1119,7 @@ void c2_whiteout(void)
         FieldClearVBlankHBlankCallbacks();
         StopMapMusic();
         ResetSafariZoneFlag_();
-        sub_8052F5C();
+        DoWhiteOut();
         player_avatar_init_params_reset();
         ScriptContext1_Init();
         ScriptContext2_Disable();
@@ -2155,12 +2159,13 @@ u8 *sub_805568C(struct UnkStruct_8054FF8 *a1)
     if (linkPlayerId != 4)
     {
         if (!a1->b)
-            return gUnknown_081A4495;
+            return TradeRoom_TooBusyToNotice;
         if (gUnknown_03000580[linkPlayerId] != 0x80)
-            return gUnknown_081A4495;
+            return TradeRoom_TooBusyToNotice;
         if (!sub_8083BF4(linkPlayerId))
-            return gUnknown_081A4479;
-        return gUnknown_081A4487;
+            return TradeRoom_ReadTrainerCard1;
+		else
+			return TradeRoom_ReadTrainerCard2;
     }
 
     return sub_80682A8(&unkStruct, a1->field_C, a1->d);
@@ -2168,29 +2173,29 @@ u8 *sub_805568C(struct UnkStruct_8054FF8 *a1)
 
 u16 sub_8055758(u8 *script)
 {
-    if (script == gUnknown_081A4383)
+    if (script == DoubleBattleColosseum_EventScript_1A4383)
         return 10;
-    if (script == gUnknown_081A439E)
+    if (script == DoubleBattleColosseum_EventScript_1A439E)
         return 9;
-    if (script == gUnknown_081A43B9)
+    if (script == DoubleBattleColosseum_EventScript_1A43B9)
         return 10;
-    if (script == gUnknown_081A43D4)
+    if (script == DoubleBattleColosseum_EventScript_1A43D4)
         return 9;
-    if (script == gUnknown_081A4418)
+    if (script == RecordCorner_EventScript_1A4418)
         return 10;
-    if (script == gUnknown_081A442D)
+    if (script == RecordCorner_EventScript_1A442D)
         return 9;
-    if (script == gUnknown_081A4442)
+    if (script == RecordCorner_EventScript_1A4442)
         return 10;
-    if (script == gUnknown_081A4457)
+    if (script == RecordCorner_EventScript_1A4457)
         return 9;
-    if (script == gUnknown_081A436F)
+    if (script == SingleBattleColosseum_EventScript_1A436F)
         return 10;
-    if (script == gUnknown_081A4379)
+    if (script == SingleBattleColosseum_EventScript_1A4379)
         return 9;
-    if (script == gUnknown_081A43F0)
+    if (script == TradeCenter_EventScript_1A43F0)
         return 10;
-    if (script == gUnknown_081A43FA)
+    if (script == TradeCenter_EventScript_1A43FA)
         return 9;
     return 0;
 }
@@ -2217,7 +2222,7 @@ void sub_8055808(u8 *script)
 void sub_8055824(void)
 {
     PlaySE(SE_WIN_OPEN);
-    ScriptContext1_SetupScript(gUnknown_081A44E5);
+    ScriptContext1_SetupScript(TradeRoom_PromptToCancelLink);
     ScriptContext2_Enable();
 }
 
@@ -2230,7 +2235,7 @@ void sub_8055840(u8 *script)
 
 void sub_805585C(void)
 {
-    ScriptContext1_SetupScript(gUnknown_081A44FE);
+    ScriptContext1_SetupScript(TradeRoom_TerminateLink);
     ScriptContext2_Enable();
 }
 
diff --git a/src/rom_800D42C.c b/src/rom_800D42C.c
index 43819f991..3df2ee5e3 100644
--- a/src/rom_800D42C.c
+++ b/src/rom_800D42C.c
@@ -3,13 +3,6 @@
 #include "link.h"
 #include "text.h"
 
-struct Unk2000000
-{
-                  u8 filler0[0x160CB];
-    /* 0x160CB */ u8 linkPlayerIndex;
-};
-
-extern struct Unk2000000 unk_2000000;
 extern u16 gBattleTypeFlags;
 extern u8 gUnknown_02024D26;
 
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 6ecb5cc44..08bfbefbf 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -55,7 +55,7 @@ void ResetSafariZoneFlag(void)
 
 void EnterSafariMode(void)
 {
-    sav12_xor_increment(0x11);
+    IncrementGameStat(0x11);
     SetSafariZoneFlag();
     ClearAllPokeblockFeeders();
     gNumSafariBalls = 30;
diff --git a/src/save.c b/src/save.c
index 2771b4ea5..49db679f8 100644
--- a/src/save.c
+++ b/src/save.c
@@ -548,8 +548,8 @@ u8 sub_8125C3C(u8 a1)
         for (i = 28; i < 32; i++)
             EraseFlashSector(i);
     case 3:
-        if (sub_8053108(10) < 999)
-            sav12_xor_increment(10);
+        if (GetGameStat(10) < 999)
+            IncrementGameStat(10);
         for (i = 0; i < 2; i++)
             sub_81253C8(28 + i, gHallOfFameSaveSectionLocations[i].data, gHallOfFameSaveSectionLocations[i].size);
         SaveSerializedGame();
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 4dc7a38dc..d3d28f923 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -543,7 +543,7 @@ bool8 ScrCmd_checkflag(struct ScriptContext *ctx)
 
 bool8 ScrCmd_inccounter(struct ScriptContext *ctx)
 {
-    sav12_xor_increment(ScriptReadByte(ctx));
+    IncrementGameStat(ScriptReadByte(ctx));
     return FALSE;
 }
 
diff --git a/src/start_menu.c b/src/start_menu.c
index 87cb3f593..31ba31766 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -357,7 +357,7 @@ static u8 StartMenu_PokedexCallback(void)
 {
     if(!gPaletteFade.active)
     {
-        sav12_xor_increment(0x29);
+        IncrementGameStat(0x29);
         PlayRainSoundEffect();
         SetMainCallback2(CB2_InitPokedex);
         return 1;
@@ -679,7 +679,7 @@ static u8 SaveDialogCB_DoSave(void)
 {
     u8 a;
     
-    sav12_xor_increment(0);
+    IncrementGameStat(0);
     if(gUnknown_020297EC == TRUE)
     {
         a = sub_8125D44(4);
diff --git a/src/trainer_card.c b/src/trainer_card.c
index d2d6b922d..83551eb2b 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -283,8 +283,8 @@ void sub_8093390(struct TrainerCard *arg1) {
     arg1->playTimeHours = gSaveBlock2.playTimeHours;
     arg1->playTimeMinutes = gSaveBlock2.playTimeMinutes;
 
-    playTime = sub_8053108(GAME_STAT_FIRST_HOF_PLAY_TIME);
-    enteredHallOfFame = sub_8053108(GAME_STAT_ENTERED_HOF);
+    playTime = GetGameStat(GAME_STAT_FIRST_HOF_PLAY_TIME);
+    enteredHallOfFame = GetGameStat(GAME_STAT_ENTERED_HOF);
     if (!enteredHallOfFame) {
         playTime = 0;
     }
@@ -345,7 +345,7 @@ u8 sub_80934C4(u8 id) {
 } 
 
 static u32 sav12_xor_get_clamped_above(u8 index, u32 maxVal) {
-    u32 value = sub_8053108(index);
+    u32 value = GetGameStat(index);
 
     if (value > maxVal) {
         value = maxVal;
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 48e0c1d1c..8e983c300 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -596,7 +596,7 @@ void FishingWildEncounter(u8 rod)
           gWildMonHeaders[GetCurrentMapWildMonHeader()].fishingMonsInfo,
           rod);
     }
-    sav12_xor_increment(12);
+    IncrementGameStat(12);
     sub_80BEA50(species);
     CheckForSafariZoneAndProceed();
 }