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/include/pokemon.h
+++ b/include/pokemon.h
@@ -87,7 +87,7 @@
 #define MON_DATA_RIBBONS           83
 #define MON_DATA_ATK2              84
 #define MON_DATA_DEF2              85
-#define MON_DATA_SPD2              86
+#define MON_DATA_SPEED2            86
 #define MON_DATA_SPATK2            87
 #define MON_DATA_SPDEF2            88