diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-10-26 13:47:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-10-26 13:47:14 -0500 |
| commit | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (patch) | |
| tree | e702c9204f8f6e11d5b6576bc6d0311c0fe6f73f /src | |
| parent | 1bb931245b5030746b7150e3965520954d0068a7 (diff) | |
also fix ambiguous MON_DATA_SPD_EV and MON_DATA_SPD2 constants
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon_1.c | 4 | ||||
| -rw-r--r-- | src/pokemon_2.c | 6 | ||||
| -rwxr-xr-x | src/pokemon_summary_screen.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_1.c b/src/pokemon_1.c index 79fa15343..f56ade967 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -305,7 +305,7 @@ void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src) SetMonData(mon, MON_DATA_HP_EV, &src->hpEV); SetMonData(mon, MON_DATA_ATK_EV, &src->attackEV); SetMonData(mon, MON_DATA_DEF_EV, &src->defenseEV); - SetMonData(mon, MON_DATA_SPD_EV, &src->speedEV); + SetMonData(mon, MON_DATA_SPEED_EV, &src->speedEV); SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV); SetMonData(mon, MON_DATA_SPDEF_EV, &src->spDefenseEV); value = src->altAbility; @@ -369,7 +369,7 @@ void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lv SetMonData(mon, MON_DATA_HP_EV, &src->hpEV); SetMonData(mon, MON_DATA_ATK_EV, &src->attackEV); SetMonData(mon, MON_DATA_DEF_EV, &src->defenseEV); - SetMonData(mon, MON_DATA_SPD_EV, &src->speedEV); + SetMonData(mon, MON_DATA_SPEED_EV, &src->speedEV); SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV); SetMonData(mon, MON_DATA_SPDEF_EV, &src->spDefenseEV); value = src->altAbility; diff --git a/src/pokemon_2.c b/src/pokemon_2.c index e14949d48..587773836 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -351,7 +351,7 @@ u32 GetMonData(struct Pokemon *mon, s32 field, u8* data) case MON_DATA_DEF2: ret = mon->defense; break; - case MON_DATA_SPD2: + case MON_DATA_SPEED2: ret = mon->speed; break; case MON_DATA_SPATK2: @@ -512,7 +512,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: @@ -880,7 +880,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) 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_summary_screen.c b/src/pokemon_summary_screen.c index b3682825d..838e91d90 100755 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -720,7 +720,7 @@ bool8 sub_81C00F0(struct Pokemon *a) sum->def = GetMonData(a, MON_DATA_DEF2); sum->spatk = GetMonData(a, MON_DATA_SPATK2); sum->spdef = GetMonData(a, MON_DATA_SPDEF2); - sum->speed = GetMonData(a, MON_DATA_SPD2); + sum->speed = GetMonData(a, MON_DATA_SPEED2); } break; case 3: |