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/pokemon_2.c | |
| parent | 1bb931245b5030746b7150e3965520954d0068a7 (diff) | |
also fix ambiguous MON_DATA_SPD_EV and MON_DATA_SPD2 constants
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 6 |
1 files changed, 3 insertions, 3 deletions
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: |