4 files changed, 15 insertions, 34 deletions
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h
new file mode 100644
index 000000000..c173a8730
--- /dev/null
+++ b/include/constants/battle_anim.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_BATTLEANIM_CONSTANTS_H
+#define GUARD_BATTLEANIM_CONSTANTS_H
+
+#define ANIM_BANK_ATTACKER    0
+#define ANIM_BANK_TARGET      1
+#define ANIM_BANK_ATK_PARTNER 2
+#define ANIM_BANK_DEF_PARTNER 3
+
+#endif
diff --git a/include/constants/decorations.h b/include/constants/decorations.h
index 2e3558721..c361ccdf1 100644
--- a/include/constants/decorations.h
+++ b/include/constants/decorations.h
@@ -123,4 +123,6 @@
 #define DECOR_REGICE_DOLL      119
 #define DECOR_REGISTEEL_DOLL   120
 
+#define DECOR_COUNT 121
+
 #endif  // GUARD_CONSTANTS_DECORATIONS_H
diff --git a/include/constants/items.h b/include/constants/items.h
index 9b88db1da..a52c72599 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -363,42 +363,12 @@
 #define ITEM_15B 347
 #define ITEM_15C 348
 
-// FireRed/LeafGreen
-#define ITEM_OAKS_PARCEL 349
-#define ITEM_POKE_FLUTE 350
-#define ITEM_SECRET_KEY 351
-#define ITEM_BIKE_VOUCHER 352
-#define ITEM_GOLD_TEETH 353
-#define ITEM_OLD_AMBER 354
-#define ITEM_CARD_KEY 355
-#define ITEM_LIFT_KEY 356
-#define ITEM_HELIX_FOSSIL 357
-#define ITEM_DOME_FOSSIL 358
-#define ITEM_SILPH_SCOPE 359
-#define ITEM_BICYCLE 360
-#define ITEM_TOWN_MAP 361
-#define ITEM_VS_SEEKER 362
-#define ITEM_FAME_CHECKER 363
-#define ITEM_TM_CASE 364
-#define ITEM_BERRY_POUCH 365
-#define ITEM_TEACHY_TV 366
-#define ITEM_TRI_PASS 367
-#define ITEM_RAINBOW_PASS 368
-#define ITEM_TEA 369
-#define ITEM_MYSTIC_TICKET 370
-#define ITEM_AURORA_TICKET 371
-#define ITEM_POWDER_JAR 372
-#define ITEM_RUBY 373
-#define ITEM_SAPPHIRE 374
-
-// Emerald
-#define ITEM_MAGMA_EMBLEM 375
-#define ITEM_OLD_SEA_MAP 376
-
 #define NUM_TECHNICAL_MACHINES 50
 #define NUM_HIDDEN_MACHINES     8
 
 // Check if the item is one that can be used on a Pokemon.
 #define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
 
+#define IS_ITEM_MAIL(item) ((item) >= ITEM_ORANGE_MAIL && (item) <= ITEM_RETRO_MAIL)
+
 #endif  // GUARD_CONSTANTS_ITEMS_H
diff --git a/include/constants/weather.h b/include/constants/weather.h
index 946316984..1110be7a2 100644
--- a/include/constants/weather.h
+++ b/include/constants/weather.h
@@ -12,7 +12,7 @@
 #define WEATHER_SANDSTORM      8
 #define WEATHER_FOG_2          9
 #define WEATHER_FOG_3          10
-#define WEATHER_DARK           11
+#define WEATHER_SHADE          11
 #define WEATHER_DROUGHT        12
 #define WEATHER_RAIN_HEAVY     13
 #define WEATHER_BUBBLES        14
@@ -31,7 +31,7 @@
 #define COORD_EVENT_WEATHER_FOG_2          7
 #define COORD_EVENT_WEATHER_ASH            8
 #define COORD_EVENT_WEATHER_SANDSTORM      9
-#define COORD_EVENT_WEATHER_DARK           10
+#define COORD_EVENT_WEATHER_SHADE          10
 #define COORD_EVENT_WEATHER_DROUGHT        11
 #define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20
 #define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21