diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-26 23:13:09 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-26 23:13:09 +0200 |
| commit | 5e285c3bca0972d2565685f41db0eb4ff556e9e7 (patch) | |
| tree | ce3caf5ce226fd87129aa6d9f2fa0359b81cea95 /src | |
| parent | 15061844651c0d0cdbe5ec0a3097b054d58e7f88 (diff) | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
Merge branch 'master' into decompile_battle_controllers
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon_2.c | 2 | ||||
| -rwxr-xr-x | src/pokemon_summary_screen.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index b78fd3db8..9b2394184 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -352,7 +352,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: 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: |