Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz committed 2019-10-24 01:42:52 +08:00
commit 1dc0b25c1e
1127 files changed
+79056 -34785

No files matched your search

+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[];