Merge branch 'master' into trainer_card

This commit is contained in:
DizzyEggg committed 2019-01-22 21:59:32 +01:00
commit 524db6068e
4 files changed
+8 -7

No files matched your search

+1
View File
@@ -297,5 +297,6 @@
#define VAR_MON_BOX_ID 0x8012
#define VAR_MON_BOX_POS 0x8013
#define VAR_0x8014 0x8014
#define VAR_0x8015 0x8015
#endif // GUARD_CONSTANTS_VARS_H