Merge branch 'master' into reverts

This commit is contained in:
aaaaaa123456789
2020-10-26 12:16:36 -03:00
382 changed files with 22866 additions and 22447 deletions
+1 -1
View File
@@ -493,7 +493,7 @@ struct BattleScripting
u8 field_20;
u8 reshowMainState;
u8 reshowHelperState;
u8 field_23;
u8 levelUpHP;
u8 windowsType; // 0 - normal, 1 - battle arena
u8 multiplayerId;
u8 specialTrainerBattleType;