summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-16 19:14:14 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-16 19:14:14 -0500
commit31a322fdc589c381af6ec4b4c4781d28cb394cc1 (patch)
treee43fc56221de9ddcb8a8324f6a87ab4cf3f063db /src/field
parent9e4d9171e3a2d1d239cb66f1fdff09f069941589 (diff)
use game stat defines
Diffstat (limited to 'src/field')
-rw-r--r--src/field/field_control_avatar.c2
-rw-r--r--src/field/field_player_avatar.c2
-rw-r--r--src/field/field_weather_effects.c2
-rw-r--r--src/field/fldeff_cut.c4
-rw-r--r--src/field/item_use.c2
-rw-r--r--src/field/safari_zone.c2
-rw-r--r--src/field/shop.c2
-rw-r--r--src/field/start_menu.c4
-rw-r--r--src/field/wild_encounter.c2
9 files changed, 11 insertions, 11 deletions
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();
}