summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-17 18:34:37 -0500
committerhuderlem <huderlem@gmail.com>2020-01-18 08:49:34 -0600
commita40f05490040350b8973728fdebe5a48360d4fac (patch)
tree4dd4aba29b3c3adf37d0ff42924729c7345fa076 /include/constants
parentaa631825fcf8661f7ef57afe0cb652a4147ca77a (diff)
Move/rename gfx start/end vars
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/event_objects.h36
1 files changed, 19 insertions, 17 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 07ed2d40c..b30527c80 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -240,27 +240,29 @@
#define EVENT_OBJ_GFX_LINK_RS_MAY 236
#define EVENT_OBJ_GFX_LUGIA 237
#define EVENT_OBJ_GFX_HOOH 238
-#define EVENT_OBJ_GFX_BARD_2 239
+
+#define NUM_OBJ_EVENT_GFX 239
// These are dynamic object gfx ids.
// They correspond with the values of the VAR_OBJ_GFX_ID_X vars.
// More info about them in include/constants/vars.h
-#define EVENT_OBJ_GFX_VAR_0 240
-#define EVENT_OBJ_GFX_VAR_1 241
-#define EVENT_OBJ_GFX_VAR_2 242
-#define EVENT_OBJ_GFX_VAR_3 243
-#define EVENT_OBJ_GFX_VAR_4 244
-#define EVENT_OBJ_GFX_VAR_5 245
-#define EVENT_OBJ_GFX_VAR_6 246
-#define EVENT_OBJ_GFX_VAR_7 247
-#define EVENT_OBJ_GFX_VAR_8 248
-#define EVENT_OBJ_GFX_VAR_9 249
-#define EVENT_OBJ_GFX_VAR_A 250
-#define EVENT_OBJ_GFX_VAR_B 251
-#define EVENT_OBJ_GFX_VAR_C 252
-#define EVENT_OBJ_GFX_VAR_D 253
-#define EVENT_OBJ_GFX_VAR_E 254
-#define EVENT_OBJ_GFX_VAR_F 255
+#define OBJ_EVENT_GFX_VARS (NUM_OBJ_EVENT_GFX + 1)
+#define EVENT_OBJ_GFX_VAR_0 (OBJ_EVENT_GFX_VARS + 0x0) // 240
+#define EVENT_OBJ_GFX_VAR_1 (OBJ_EVENT_GFX_VARS + 0x1)
+#define EVENT_OBJ_GFX_VAR_2 (OBJ_EVENT_GFX_VARS + 0x2)
+#define EVENT_OBJ_GFX_VAR_3 (OBJ_EVENT_GFX_VARS + 0x3)
+#define EVENT_OBJ_GFX_VAR_4 (OBJ_EVENT_GFX_VARS + 0x4)
+#define EVENT_OBJ_GFX_VAR_5 (OBJ_EVENT_GFX_VARS + 0x5)
+#define EVENT_OBJ_GFX_VAR_6 (OBJ_EVENT_GFX_VARS + 0x6)
+#define EVENT_OBJ_GFX_VAR_7 (OBJ_EVENT_GFX_VARS + 0x7)
+#define EVENT_OBJ_GFX_VAR_8 (OBJ_EVENT_GFX_VARS + 0x8)
+#define EVENT_OBJ_GFX_VAR_9 (OBJ_EVENT_GFX_VARS + 0x9)
+#define EVENT_OBJ_GFX_VAR_A (OBJ_EVENT_GFX_VARS + 0xA)
+#define EVENT_OBJ_GFX_VAR_B (OBJ_EVENT_GFX_VARS + 0xB)
+#define EVENT_OBJ_GFX_VAR_C (OBJ_EVENT_GFX_VARS + 0xC)
+#define EVENT_OBJ_GFX_VAR_D (OBJ_EVENT_GFX_VARS + 0xD)
+#define EVENT_OBJ_GFX_VAR_E (OBJ_EVENT_GFX_VARS + 0xE)
+#define EVENT_OBJ_GFX_VAR_F (OBJ_EVENT_GFX_VARS + 0xF) // 255
#define SHADOW_SIZE_S 0
#define SHADOW_SIZE_M 1