use game stat defines

15 files changed, 39 insertions, 39 deletions

diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index b4ff407fc..892be1029 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -520,8 +520,8 @@ static void DoStandardWildBattle(void)
     gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = 0;
     CreateBattleStartTask(GetWildBattleTransition(), 0);
-    IncrementGameStat(7);
-    IncrementGameStat(8);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
 void BattleSetup_StartRoamerBattle(void)
@@ -532,8 +532,8 @@ void BattleSetup_StartRoamerBattle(void)
     gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_ROAMER;
     CreateBattleStartTask(GetWildBattleTransition(), 0);
-    IncrementGameStat(7);
-    IncrementGameStat(8);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
 static void DoSafariBattle(void)
@@ -549,8 +549,8 @@ static void DoSafariBattle(void)
 static void StartTheBattle(void)
 {
     CreateBattleStartTask(GetTrainerBattleTransition(), 0);
-    IncrementGameStat(7);
-    IncrementGameStat(9);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
 }
 
 //Initiates battle where Wally catches Ralts
@@ -569,8 +569,8 @@ void BattleSetup_StartScriptedWildBattle(void)
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = 0;
     CreateBattleStartTask(GetWildBattleTransition(), 0);
-    IncrementGameStat(7);
-    IncrementGameStat(8);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
 void ScrSpecial_StartSouthernIslandBattle(void)
@@ -579,8 +579,8 @@ void ScrSpecial_StartSouthernIslandBattle(void)
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
     CreateBattleStartTask(GetWildBattleTransition(), 0);
-    IncrementGameStat(7);
-    IncrementGameStat(8);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
 void ScrSpecial_StartRayquazaBattle(void)
@@ -589,8 +589,8 @@ void ScrSpecial_StartRayquazaBattle(void)
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
     CreateBattleStartTask(B_TRANSITION_BLUR, BGM_BATTLE34);
-    IncrementGameStat(7);
-    IncrementGameStat(8);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
 void ScrSpecial_StartGroudonKyogreBattle(void)
@@ -602,8 +602,8 @@ void ScrSpecial_StartGroudonKyogreBattle(void)
         CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON
     else
         CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE
-    IncrementGameStat(7);
-    IncrementGameStat(8);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
 void ScrSpecial_StartRegiBattle(void)
@@ -612,8 +612,8 @@ void ScrSpecial_StartRegiBattle(void)
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
     CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE36);
-    IncrementGameStat(7);
-    IncrementGameStat(8);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
 static void CB2_EndWildBattle(void)
@@ -879,8 +879,8 @@ static void CB2_StartFirstBattle(void)
         SetMainCallback2(sub_800E7C4);
         prev_quest_postbuffer_cursor_backup_reset();
         overworld_poison_timer_set();
-        IncrementGameStat(7);
-        IncrementGameStat(8);
+        IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+        IncrementGameStat(GAME_STAT_WILD_BATTLES);
     }
 }
 
diff --git a/src/battle/post_battle_event_funcs.c b/src/battle/post_battle_event_funcs.c
index 0617763f6..a44cf028b 100644
--- a/src/battle/post_battle_event_funcs.c
+++ b/src/battle/post_battle_event_funcs.c
@@ -26,8 +26,8 @@ int GameClear(void)
         FlagSet(FLAG_SYS_GAME_CLEAR);
     }
 
-    if (!GetGameStat(1))
-        SetGameStat(1, (gSaveBlock2.playTimeHours << 16) | (gSaveBlock2.playTimeMinutes << 8) | gSaveBlock2.playTimeSeconds);
+    if (!GetGameStat(GAME_STAT_FIRST_HOF_PLAY_TIME))
+        SetGameStat(GAME_STAT_FIRST_HOF_PLAY_TIME, (gSaveBlock2.playTimeHours << 16) | (gSaveBlock2.playTimeMinutes << 8) | gSaveBlock2.playTimeSeconds);
 
     SetSecretBase2Field_9();
 
@@ -54,7 +54,7 @@ int GameClear(void)
 
     if (ribbonGet == TRUE)
     {
-        IncrementGameStat(42);
+        IncrementGameStat(GAME_STAT_RECEIVED_RIBBONS);
         FlagSet(FLAG_SYS_RIBBON_GET);
     }
 
diff --git a/src/engine/save.c b/src/engine/save.c
index be907edcc..250b29a87 100644
--- a/src/engine/save.c
+++ b/src/engine/save.c
@@ -674,8 +674,8 @@ u8 Save_WriteDataInternal(u8 saveType)
             EraseFlashSector(i);
         // fall through
     case SAVE_HALL_OF_FAME: // hall of fame.
-        if (GetGameStat(10) < 999)
-            IncrementGameStat(10);
+        if (GetGameStat(GAME_STAT_ENTERED_HOF) < 999)
+            IncrementGameStat(GAME_STAT_ENTERED_HOF);
         for (i = 0; i < NUM_HALL_OF_FAME_SECTORS; i++)
             HandleWriteSectorNBytes(HALL_OF_FAME_SECTOR + i, sHallOfFameChunks[i].data, sHallOfFameChunks[i].size);
         SaveSerializedGame();
diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c
index 52e66f16e..c156df035 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
@@ -181,7 +181,7 @@ int sub_8068024(struct FieldInput *input)
         return TRUE;
     if (input->input_field_0_6)
     {
-        IncrementGameStat(5);
+        IncrementGameStat(GAME_STAT_STEPS);
         if (sub_80687E4(&position, r4, r6) == 1)
             return TRUE;
     }
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index 9a29e2e92..ba45e506d 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -523,7 +523,7 @@ u8 CheckForFieldObjectCollision(struct MapObject *a, s16 x, s16 y, u8 direction,
         return 5;
     if (ShouldJumpLedge(x, y, direction))
     {
-        IncrementGameStat(0x2B);
+        IncrementGameStat(GAME_STAT_JUMPED_DOWN_LEDGES);
         return COLLISION_LEDGE_JUMP;
     }
     if (collision == 4 && sub_8058F6C(x, y, direction))
diff --git a/src/field/field_weather_effects.c b/src/field/field_weather_effects.c
index 5a59d6c2a..7406363a5 100644
--- a/src/field/field_weather_effects.c
+++ b/src/field/field_weather_effects.c
@@ -2380,5 +2380,5 @@ void UpdateRainCounter(u8 newWeather, u8 oldWeather)
 {
     if (newWeather != oldWeather
      && (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED))
-        IncrementGameStat(0x28);
+        IncrementGameStat(GAME_STAT_GOT_RAINED_ON);
 }
diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c
index e4328acfc..513107729 100644
--- a/src/field/fldeff_cut.c
+++ b/src/field/fldeff_cut.c
@@ -122,7 +122,7 @@ bool8 FldEff_UseCutOnGrass(void)
 
     gTasks[taskId].data[8] = (u32)sub_80A2684 >> 16;
     gTasks[taskId].data[9] = (u32)sub_80A2684;
-    IncrementGameStat(0x12);
+    IncrementGameStat(GAME_STAT_USED_CUT);
     return FALSE;
 }
 
@@ -138,7 +138,7 @@ bool8 FldEff_UseCutOnTree(void)
 
     gTasks[taskId].data[8] = (u32)sub_80A2B00 >> 16;
     gTasks[taskId].data[9] = (u32)sub_80A2B00;
-    IncrementGameStat(0x12);
+    IncrementGameStat(GAME_STAT_USED_CUT);
     return FALSE;
 }
 
diff --git a/src/field/item_use.c b/src/field/item_use.c
index 55fb21814..9346cf42e 100644
--- a/src/field/item_use.c
+++ b/src/field/item_use.c
@@ -259,7 +259,7 @@ void ItemUseOnFieldCB_Rod(u8 taskId)
 
 void ItemUseOutOfBattle_Itemfinder(u8 var)
 {
-    IncrementGameStat(0x27);
+    IncrementGameStat(GAME_STAT_USED_ITEMFINDER);
     gFieldItemUseCallback = (void *)ItemUseOnFieldCB_Itemfinder;
     SetUpItemUseOnFieldCallback(var);
 }
diff --git a/src/field/safari_zone.c b/src/field/safari_zone.c
index e9ca3a9f9..6c7c8b391 100644
--- a/src/field/safari_zone.c
+++ b/src/field/safari_zone.c
@@ -56,7 +56,7 @@ void ResetSafariZoneFlag(void)
 
 void EnterSafariMode(void)
 {
-    IncrementGameStat(0x11);
+    IncrementGameStat(GAME_STAT_ENTERED_SAFARI_ZONE);
     SetSafariZoneFlag();
     ClearAllPokeblockFeeders();
     gNumSafariBalls = 30;
diff --git a/src/field/shop.c b/src/field/shop.c
index 5a47b033b..beed50a41 100644
--- a/src/field/shop.c
+++ b/src/field/shop.c
@@ -657,7 +657,7 @@ static void Shop_DoPremierBallCheck(u8 taskId)
 
 static void Shop_DoItemTransaction(u8 taskId)
 {
-    IncrementGameStat(0x26);
+    IncrementGameStat(GAME_STAT_SHOPPED);
     RemoveMoney(&gSaveBlock1.money, gMartTotalCost);
     PlaySE(SE_REGI);
     UpdateMoneyWindow(gSaveBlock1.money, 0, 0);
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 87597eb6a..110351016 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -345,7 +345,7 @@ static u8 StartMenu_PokedexCallback(void)
 {
     if (!gPaletteFade.active)
     {
-        IncrementGameStat(0x29);
+        IncrementGameStat(GAME_STAT_CHECKED_POKEDEX);
         PlayRainSoundEffect();
         SetMainCallback2(CB2_InitPokedex);
         return 1;
@@ -666,7 +666,7 @@ static u8 SaveDialogCB_DoSave(void)
 {
     u8 saveStatus;
 
-    IncrementGameStat(0);
+    IncrementGameStat(GAME_STAT_SAVED_GAME);
     if (gDifferentSaveFile == TRUE)
     {
         saveStatus = Save_WriteData(SAVE_OVERWRITE_DIFFERENT_FILE);
diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c
index 4bf83cad8..79542422e 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/wild_encounter.c
@@ -4254,7 +4254,7 @@ void FishingWildEncounter(u8 rod)
           gWildMonHeaders[GetCurrentMapWildMonHeader()].fishingMonsInfo,
           rod);
     }
-    IncrementGameStat(12);
+    IncrementGameStat(GAME_STAT_FISHING_CAPTURES);
     sub_80BEA50(species);
     BattleSetup_StartWildBattle();
 }
diff --git a/src/rom6.c b/src/rom6.c
index e71484b0a..62fbc987c 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -142,7 +142,7 @@ int FldEff_RockSmash(void)
 
     gTasks[taskId].data[8] = (u32)sub_810B58C >> 16;
     gTasks[taskId].data[9] = (u32)sub_810B58C;
-    IncrementGameStat(0x13);
+    IncrementGameStat(GAME_STAT_USED_ROCK_SMASH);
     return 0;
 }
 
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index b59d02939..0a7e14e4e 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -2567,9 +2567,9 @@ static void sub_8050954(void)
         if (Blender_PrintBlendingResults())
         {
             if (gInGameOpponentsNo == 0)
-                IncrementGameStat(34);
+                IncrementGameStat(GAME_STAT_POKEBLOCKS_WITH_FRIENDS);
             else
-                IncrementGameStat(33);
+                IncrementGameStat(GAME_STAT_POKEBLOCKS);
             gBerryBlenderData->field_6F++;
         }
         break;
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c
index 931ec0d4d..3ba325574 100644
--- a/src/scene/evolution_scene.c
+++ b/src/scene/evolution_scene.c
@@ -649,7 +649,7 @@ static void Task_EvolutionScene(u8 taskID)
             EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
             GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2);
             GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3);
-            IncrementGameStat(14);
+            IncrementGameStat(GAME_STAT_EVOLVED_POKEMON);
         }
         break;
     case 14: // check if it wants to learn a new move
@@ -991,7 +991,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
             GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2);
             GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3);
-            IncrementGameStat(14);
+            IncrementGameStat(GAME_STAT_EVOLVED_POKEMON);
         }
         break;
     case 13: