Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz
2019-10-24 01:42:52 +08:00
1127 changed files with 79056 additions and 34785 deletions
+1 -1
View File
@@ -1162,7 +1162,7 @@ extern const u8 EventScript_TryDoNormalTrainerBattle[];
extern const u8 EventScript_TryDoDoubleRematchBattle[];
extern const u8 EventScript_TryDoRematchBattle[];
extern const u8 gUnknown_81A4EB4[];
extern const u8 gUnknown_81C555B[];
extern const u8 EventScript_1C555B[];
// new_game
extern const u8 EventScript_ResetAllMapFlags[];