summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2020-03-12 12:46:40 -0700
committerultima-soul <akshayjhanji@hotmail.com>2020-03-12 12:46:40 -0700
commit339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (patch)
tree337fa55cb5d6af5a28dade5f7e3b28d6f7becae9 /include/constants
parent65690ca7dc880f08a4c63d490797f4b16ce5195e (diff)
Decompile/port event_object_movement
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/event_objects.h7
-rw-r--r--include/constants/field_effects.h4
-rw-r--r--include/constants/global.h1
3 files changed, 10 insertions, 2 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 0a94dc03b..3e48cf029 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -1,6 +1,13 @@
#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H
#define GUARD_CONSTANTS_EVENT_OBJECTS_H
+#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 OBJ_EVENT_GFX_VARS (NUM_OBJ_EVENT_GFX + 1)
+
#define OBJ_EVENT_ID_PLAYER 0xFF
#define OBJ_EVENT_ID_CAMERA 0x7F
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 3ed7d8ce2..e8246ccc5 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -1,7 +1,7 @@
#ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H
#define GUARD_CONSTANTS_FIELD_EFFECTS_H
-#define FLDEFF_EXCLAMATION_MARK_ICON_1 0
+#define FLDEFF_EXCLAMATION_MARK_ICON 0
#define FLDEFF_USE_CUT_ON_GRASS 1
#define FLDEFF_USE_CUT_ON_TREE 2
#define FLDEFF_SHADOW 3
@@ -34,7 +34,7 @@
#define FLDEFF_NPCFLY_OUT 30
#define FLDEFF_USE_FLY 31
#define FLDEFF_FLY_IN 32
-#define FLDEFF_EXCLAMATION_MARK_ICON_2 33
+#define FLDEFF_QUESTION_MARK_ICON 33
#define FLDEFF_FEET_IN_FLOWING_WATER 34
#define FLDEFF_BIKE_TIRE_TRACKS 35
#define FLDEFF_SAND_DISGUISE 36
diff --git a/include/constants/global.h b/include/constants/global.h
index 7f3c80bb4..e398cc5be 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -31,6 +31,7 @@
#define BAG_POKEBALLS_COUNT 13
#define BAG_TMHM_COUNT 58
#define BAG_BERRIES_COUNT 43
+#define OBJECT_EVENT_TEMPLATES_COUNT 64
#define QUEST_LOG_SCENE_COUNT 4