also fix ambiguous MON_DATA_SPD_EV and MON_DATA_SPD2 constants

9 files changed, 17 insertions, 17 deletions

diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 83b690719..edfd7e675 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -713,7 +713,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -1019,7 +1019,7 @@ void sub_8038900(u8 a)
         SetMonData(&gEnemyParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gEnemyParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index ca20f6262..335ebcb12 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -669,7 +669,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -976,7 +976,7 @@ void sub_811EC68(u8 a)
         SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index cf90d5817..d03ef2967 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -677,7 +677,7 @@ u32 sub_8033598(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -991,7 +991,7 @@ void sub_8033E24(u8 a)
         SetMonData(&gEnemyParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gEnemyParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index dd94b2f4b..7f5c6c490 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -1849,7 +1849,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -2164,7 +2164,7 @@ void dp01_setattr_by_ch1_for_player_pokemon(u8 a)
         SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 97c78ecd8..3531c1771 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -645,7 +645,7 @@ u32 sub_8137A84(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -951,7 +951,7 @@ void sub_8138294(u8 a)
         SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 4c749c4c7..2bc94f118 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -596,7 +596,7 @@ u8 sub_80BC298(struct Pokemon *mon) { // 80bc298
     u16 evsum = GetMonData(mon, MON_DATA_HP_EV);
     evsum += GetMonData(mon, MON_DATA_ATK_EV);
     evsum += GetMonData(mon, MON_DATA_DEF_EV);
-    evsum += GetMonData(mon, MON_DATA_SPD_EV);
+    evsum += GetMonData(mon, MON_DATA_SPEED_EV);
     evsum += GetMonData(mon, MON_DATA_SPATK_EV);
     evsum += GetMonData(mon, MON_DATA_SPDEF_EV);
     return (u8)(evsum / 6);
diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c
index 345a9668b..204baddbf 100644
--- a/src/pokemon/pokemon_1.c
+++ b/src/pokemon/pokemon_1.c
@@ -314,7 +314,7 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src)
     SetMonData(mon, MON_DATA_HP_EV, (u8 *)&src->hpEV);
     SetMonData(mon, MON_DATA_ATK_EV, (u8 *)&src->attackEV);
     SetMonData(mon, MON_DATA_DEF_EV, (u8 *)&src->defenseEV);
-    SetMonData(mon, MON_DATA_SPD_EV, (u8 *)&src->speedEV);
+    SetMonData(mon, MON_DATA_SPEED_EV, (u8 *)&src->speedEV);
     SetMonData(mon, MON_DATA_SPATK_EV, (u8 *)&src->spAttackEV);
     SetMonData(mon, MON_DATA_SPDEF_EV, (u8 *)&src->spDefenseEV);
     value = src->altAbility;
@@ -356,7 +356,7 @@ void sub_803AF78(struct Pokemon *mon, struct UnknownPokemonStruct *dest)
     dest->hpEV = GetMonData(mon, MON_DATA_HP_EV, NULL);
     dest->attackEV = GetMonData(mon, MON_DATA_ATK_EV, NULL);
     dest->defenseEV = GetMonData(mon, MON_DATA_DEF_EV, NULL);
-    dest->speedEV = GetMonData(mon, MON_DATA_SPD_EV, NULL);
+    dest->speedEV = GetMonData(mon, MON_DATA_SPEED_EV, NULL);
     dest->spAttackEV = GetMonData(mon, MON_DATA_SPATK_EV, NULL);
     dest->spDefenseEV = GetMonData(mon, MON_DATA_SPDEF_EV, NULL);
     dest->friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL);
@@ -415,7 +415,7 @@ void CalculateMonStats(struct Pokemon *mon)
     s32 defenseIV = GetMonData(mon, MON_DATA_DEF_IV, NULL);
     s32 defenseEV = GetMonData(mon, MON_DATA_DEF_EV, NULL);
     s32 speedIV = GetMonData(mon, MON_DATA_SPEED_IV, NULL);
-    s32 speedEV = GetMonData(mon, MON_DATA_SPD_EV, NULL);
+    s32 speedEV = GetMonData(mon, MON_DATA_SPEED_EV, NULL);
     s32 spAttackIV = GetMonData(mon, MON_DATA_SPATK_IV, NULL);
     s32 spAttackEV = GetMonData(mon, MON_DATA_SPATK_EV, NULL);
     s32 spDefenseIV = GetMonData(mon, MON_DATA_SPDEF_IV, NULL);
diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c
index eaa0b86b8..447d95768 100644
--- a/src/pokemon/pokemon_2.c
+++ b/src/pokemon/pokemon_2.c
@@ -422,7 +422,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
     case MON_DATA_DEF_EV:
         retVal = substruct2->defenseEV;
         break;
-    case MON_DATA_SPD_EV:
+    case MON_DATA_SPEED_EV:
         retVal = substruct2->speedEV;
         break;
     case MON_DATA_SPATK_EV:
@@ -784,7 +784,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const u8 *data)
     case MON_DATA_DEF_EV:
         SET8(substruct2->defenseEV);
         break;
-    case MON_DATA_SPD_EV:
+    case MON_DATA_SPEED_EV:
         SET8(substruct2->speedEV);
         break;
     case MON_DATA_SPATK_EV:
diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c
index 6414134fb..b74f8045a 100644
--- a/src/pokemon/pokemon_data.c
+++ b/src/pokemon/pokemon_data.c
@@ -93,7 +93,7 @@ const u8 gUnknown_082082F2[] = {
     MON_DATA_HP_EV,
     MON_DATA_ATK_EV,
     MON_DATA_DEF_EV,
-    MON_DATA_SPD_EV,
+    MON_DATA_SPEED_EV,
     MON_DATA_SPDEF_EV,
     MON_DATA_SPATK_EV
 };