Merge branch 'master' into doc-cinnabar

This commit is contained in:
GriffinR
2020-01-22 11:38:44 -05:00
committed by GitHub
53 changed files with 871 additions and 810 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 EventScript_1C555B[];
extern const u8 Test_EventScript_Sign[];
// new_game
extern const u8 EventScript_ResetAllMapFlags[];