summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/event_objects.h2
-rw-r--r--include/constants/flags.h2
-rwxr-xr-xinclude/constants/metatile_behaviors.h4
-rw-r--r--include/constants/vars.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 9973477da..07ed2d40c 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -274,6 +274,8 @@
#define TRACKS_FOOT 1
#define TRACKS_BIKE_TIRE 2
+#define FIRST_DECORATION_SPRITE_GFX EVENT_OBJ_GFX_PICHU_DOLL
+
#define EVENT_OBJ_ID_PLAYER 0xFF
#define EVENT_OBJ_ID_CAMERA 0x7F
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 0450e988d..c56e9013d 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -287,7 +287,7 @@
#define FLAG_RECEIVED_TM41 0x109
#define FLAG_RECEIVED_LAVARIDGE_EGG 0x10A
#define FLAG_RECEIVED_REVIVED_FOSSIL_MON 0x10B
-#define FLAG_DECORATION_16 0x10C
+#define FLAG_SECRET_BASE_REGISTRY_ENABLED 0x10C
#define FLAG_RECEIVED_TM46 0x10D
#define FLAG_CONTEST_SKETCH_CREATED 0x10E
#define FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE 0x10F
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
index d8d75066c..44bbd9729 100755
--- a/include/constants/metatile_behaviors.h
+++ b/include/constants/metatile_behaviors.h
@@ -182,7 +182,7 @@
#define MB_SECRET_BASE_UNUSED 0xB2
#define MB_BLOCK_DECORATION 0xB3
#define MB_SECRET_BASE_DECORATION 0xB4
-#define MB_SECRET_BASE_LARGE_MAT_EDGE 0xB5
+#define MB_HOLDS_SMALL_DECORATION 0xB5
#define MB_UNUSED_B6 0xB6
#define MB_SECRET_BASE_NORTH_WALL 0xB7
#define MB_SECRET_BASE_BALLOON 0xB8
@@ -196,7 +196,7 @@
#define MB_IMPASSABLE_SOUTH_AND_NORTH 0xC0
#define MB_IMPASSABLE_WEST_AND_EAST 0xC1
#define MB_SECRET_BASE_HOLE 0xC2
-#define MB_LARGE_MAT_CENTER 0xC3
+#define MB_HOLDS_LARGE_DECORATION 0xC3
#define MB_SECRET_BASE_TV_SHIELD 0xC4
#define MB_PLAYER_ROOM_PC_ON 0xC5
#define MB_C6 0xC6
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 20524611b..6fd1c16dd 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -1,8 +1,6 @@
#ifndef GUARD_CONSTANTS_VARS_H
#define GUARD_CONSTANTS_VARS_H
-#define UNKNOWN_VAR_OFFSET_3F20 0x3F20
-
#define VARS_START 0x4000
// temporary vars