Merge branch 'master' into doc-cinnabar

This commit is contained in:
GriffinR
2020-01-19 17:00:39 -05:00
committed by GitHub
57 changed files with 3414 additions and 8469 deletions
+2
View File
@@ -1195,4 +1195,6 @@ extern const u8 Text_MonSentToBoxInBillsPC[];
extern const u8 Text_MonSentToBoxSomeonesBoxFull[];
extern const u8 Text_MonSentToBoxBillsBoxFull[];
extern const u8 EventScript_BagItemCanBeRegistered[];
#endif //GUARD_EVENT_SCRIPTS_H