summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/flags.h24
-rw-r--r--include/constants/vars.h22
2 files changed, 23 insertions, 23 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 641d74f19..6c1400410 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -199,7 +199,7 @@
#define FLAG_0x0C4 0xC4
#define FLAG_0x0C5 0xC5
#define FLAG_0x0C6 0xC6
-#define FLAG_0x0C7 0xC7
+#define FLAG_RUSTURF_TUNNEL_OPENED 0xC7
#define FLAG_0x0C8 0xC8
#define FLAG_0x0C9 0xC9
#define FLAG_0x0CA 0xCA
@@ -532,10 +532,10 @@
#define FLAG_0x210 0x210
#define FLAG_0x211 0x211
#define FLAG_0x212 0x212
-#define FLAG_0x213 0x213
-#define FLAG_0x214 0x214
-#define FLAG_0x215 0x215
-#define FLAG_0x216 0x216
+#define FLAG_HIDDEN_ITEM_1F 0x213
+#define FLAG_HIDDEN_ITEM_20 0x214
+#define FLAG_HIDDEN_ITEM_21 0x215
+#define FLAG_HIDDEN_ITEM_22 0x216
#define FLAG_0x217 0x217
#define FLAG_0x218 0x218
#define FLAG_0x219 0x219
@@ -597,7 +597,7 @@
#define FLAG_0x251 0x251
#define FLAG_0x252 0x252
#define FLAG_0x253 0x253
-#define FLAG_0x254 0x254
+#define FLAG_HIDDEN_ITEM_BLACK_GLASSES 0x254
#define FLAG_0x255 0x255
#define FLAG_0x256 0x256
#define FLAG_0x257 0x257
@@ -790,10 +790,10 @@
#define FLAG_0x312 0x312
#define FLAG_0x313 0x313
#define FLAG_0x314 0x314
-#define FLAG_0x315 0x315
-#define FLAG_0x316 0x316
-#define FLAG_0x317 0x317
-#define FLAG_0x318 0x318
+#define FLAG_HIDE_FANCLUB_OLD_LADY 0x315
+#define FLAG_HIDE_FANCLUB_BOY 0x316
+#define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317
+#define FLAG_HIDE_FANCLUB_LADY 0x318
#define FLAG_0x319 0x319
#define FLAG_0x31A 0x31A
#define FLAG_0x31B 0x31B
@@ -932,8 +932,8 @@
#define FLAG_0x3A0 0x3A0
#define FLAG_0x3A1 0x3A1
#define FLAG_0x3A2 0x3A2
-#define FLAG_0x3A3 0x3A3
-#define FLAG_0x3A4 0x3A4
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4
#define FLAG_0x3A5 0x3A5
#define FLAG_0x3A6 0x3A6
#define FLAG_0x3A7 0x3A7
diff --git a/include/constants/vars.h b/include/constants/vars.h
index ed4a7797b..7cf232efe 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -49,13 +49,13 @@
#define VAR_RECYCLE_GOODS 0x4020
#define VAR_REPEL_STEP_COUNT 0x4021
#define VAR_ICE_STEP_COUNT 0x4022
-#define VAR_FIRST_POKE 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip
+#define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip
#define VAR_MIRAGE_RND_H 0x4024
#define VAR_MIRAGE_RND_L 0x4025
#define VAR_SECRET_BASE_MAP 0x4026
-#define VAR_0x4027 0x4027
-#define VAR_0x4028 0x4028
-#define VAR_0x4029 0x4029
+#define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027
+#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028
+#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029
#define VAR_HAPPINESS_STEP_COUNTER 0x402A
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
@@ -81,8 +81,8 @@
#define VAR_ALTERING_CAVE_WILD_SET 0x403E
#define VAR_0x403F 0x403F
#define VAR_DAYS 0x4040
-#define VAR_0x4041 0x4041
-#define VAR_0x4042 0x4042
+#define VAR_FANCLUB_UNKNOWN_1 0x4041
+#define VAR_FANCLUB_UNKNOWN_2 0x4042
#define VAR_DEPT_STORE_FLOOR 0x4043
#define VAR_0x4044 0x4044
#define VAR_POKELOT_PRIZE 0x4045
@@ -165,12 +165,12 @@
#define VAR_0x4092 0x4092
#define VAR_0x4093 0x4093
#define VAR_0x4094 0x4094
-#define VAR_0x4095 0x4095
+#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095
#define VAR_0x4096 0x4096
#define VAR_0x4097 0x4097
#define VAR_0x4098 0x4098
#define VAR_0x4099 0x4099
-#define VAR_0x409A 0x409A
+#define VAR_RUSTURF_TUNNEL_STATE 0x409A
#define VAR_0x409B 0x409B
#define VAR_0x409C 0x409C
#define VAR_0x409D 0x409D
@@ -185,7 +185,7 @@
#define VAR_0x40A6 0x40A6
#define VAR_0x40A7 0x40A7
#define VAR_0x40A8 0x40A8
-#define VAR_0x40A9 0x40A9
+#define VAR_CYCLING_CHALLENGE_STATE 0x40A9
#define VAR_0x40AA 0x40AA
#define VAR_0x40AB 0x40AB
#define VAR_0x40AC 0x40AC
@@ -196,7 +196,7 @@
#define VAR_0x40B1 0x40B1
#define VAR_0x40B2 0x40B2
#define VAR_WEATHER_INSTITUTE_STATE 0x40B3
-#define VAR_PORTHOLE 0x40B4
+#define VAR_PORTHOLE_STATE 0x40B4
#define VAR_0x40B5 0x40B5
#define VAR_0x40B6 0x40B6
#define VAR_0x40B7 0x40B7
@@ -210,7 +210,7 @@
#define VAR_0x40BF 0x40BF
#define VAR_0x40C0 0x40C0
#define VAR_0x40C1 0x40C1
-#define VAR_0x40C2 0x40C2
+#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2
#define VAR_0x40C3 0x40C3
#define VAR_0x40C4 0x40C4
#define VAR_0x40C5 0x40C5