Merge branch 'master' into doc-cinnabar

This commit is contained in:
GriffinR
2020-01-22 11:41:40 -05:00
committed by GitHub
126 changed files with 1878 additions and 1914 deletions
+4 -4
View File
@@ -1148,10 +1148,10 @@ extern const u8 EventScript_FldEffStrength[];
extern const u8 EventScript_FailSweetScent[];
extern const u8 EventScript_FldEffRockSmash[];
extern const u8 EventScript_SafariTimesUp[];
extern const u8 EventScript_SafariRetire[];
extern const u8 EventScript_SafariWarpOut[];
extern const u8 EventScript_SafariOutOfBalls[];
extern const u8 SafariZone_EventScript_TimesUp[];
extern const u8 SafariZone_EventScript_RetirePrompt[];
extern const u8 SafariZone_EventScript_OutOfBallsMidBattle[];
extern const u8 SafariZone_EventScript_OutOfBalls[];
extern const u8 EventScript_ItemfinderDigUpUnderfootItem[];