Merge branch 'master' into trainer_card

2019-01-22 21:59:32 +01:00
parent b6e5b4ee1a 900f294011
commit 524db6068e
4 changed files with 8 additions and 7 deletions
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -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