Merge branch 'master' into decompile_battle_controllers

2017-10-26 23:13:09 +02:00
parent 1506184465 5ea2f463d7
commit 5e285c3bca
3 changed files with 3 additions and 3 deletions
--- 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: