Merge branch 'master' into battle

2019-10-25 09:22:50 +08:00
parent 6ca932e5e9 7579fc65c1
commit 2f87855072
136 changed files with 3963 additions and 6605 deletions
@@ -317,7 +317,7 @@ struct BattleTowerPokemon
             u32 gap:1;
             u32 abilityNum:1;
    /*0x1C*/ u32 personality;
-    /*0x20*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
+    /*0x20*/ u8 nickname[11];
    /*0x2B*/ u8 friendship;
 };