Merge branch 'master' into doc-cinnabar

This commit is contained in:
GriffinR authored and GitHub committed 2020-01-19 17:00:39 -05:00
commit 84c198ac76
57 files changed
+3414 -8469

No files matched your search

+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