summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-17 20:26:13 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-17 20:26:13 +0100
commit7517f6a030756366607c755c1e95046a2c08c5e1 (patch)
tree04ed40c9947bc42e3b20018b3f37a998b61cf485 /include/constants
parentbb82032208a328a9332839f55df92c9b73d2c5a0 (diff)
parent6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff)
fix battle setup conflicts
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/vars.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 6828614bf..6dc8d0ccd 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -50,11 +50,14 @@
#define VAR_RESET_RTC_ENABLE 0x402C
#define VAR_0x402D 0x402D
#define VAR_0x402E 0x402E
-#define VAR_0x402F 0x402F
-#define VAR_0x4030 0x4030
-#define VAR_0x4031 0x4031
-#define VAR_0x4032 0x4032
-#define VAR_0x4033 0x4033
+
+#define VAR_FRONTIER_MANIAC_FACILITY 0x402F
+
+#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030
+#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031
+#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032
+#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033
+
#define VAR_0x4034 0x4034
#define VAR_0x4035 0x4035
#define VAR_STORAGE_UNKNOWN 0x4036