Merge branch 'upcoming' into timefunctionfixes

include/constants/items.h

@@ -51,11 +51,13 @@
 #define ITEM_LEMONADE 37
 #define ITEM_MOOMOO_MILK 38
 #define ITEM_ENERGY_POWDER 39
+#define ITEM_ENERGYPOWDER ITEM_ENERGY_POWDER // Pre-Gen VI name
 #define ITEM_ENERGY_ROOT 40
 #define ITEM_HEAL_POWDER 41
 #define ITEM_REVIVAL_HERB 42
 #define ITEM_ANTIDOTE 43
 #define ITEM_PARALYZE_HEAL 44
+#define ITEM_PARLYZ_HEAL ITEM_PARALYZE_HEAL // Pre-Gen VI name
 #define ITEM_BURN_HEAL 45
 #define ITEM_ICE_HEAL 46
 #define ITEM_AWAKENING 47
@@ -63,7 +65,9 @@
 #define ITEM_ETHER 49
 #define ITEM_MAX_ETHER 50
 #define ITEM_ELIXIR 51
+#define ITEM_ELIXER ITEM_ELIXIR // Pre-Gen III name
 #define ITEM_MAX_ELIXIR 52
+#define ITEM_MAX_ELIXER ITEM_MAX_ELIXIR // Pre-Gen III name
 #define ITEM_BERRY_JUICE 53
 #define ITEM_SACRED_ASH 54
 #define ITEM_SWEET_HEART 55
@@ -72,6 +76,7 @@
 // Regional Specialties
 #define ITEM_PEWTER_CRUNCHIES 57
 #define ITEM_RAGE_CANDY_BAR 58
+#define ITEM_RAGECANDYBAR ITEM_RAGE_CANDY_BAR // Pre-Gen VI name
 #define ITEM_LAVA_COOKIE 59
 #define ITEM_OLD_GATEAU 60
 #define ITEM_CASTELIACONE 61
@@ -91,11 +96,17 @@
 
 // EV Feathers
 #define ITEM_HEALTH_FEATHER 73
+#define ITEM_HEALTH_WING ITEM_HEALTH_FEATHER // Pre-Gen VIII name
 #define ITEM_MUSCLE_FEATHER 74
+#define ITEM_MUSCLE_WING ITEM_MUSCLE_FEATHER // Pre-Gen VIII name
 #define ITEM_RESIST_FEATHER 75
+#define ITEM_RESIST_WING ITEM_RESIST_FEATHER // Pre-Gen VIII name
 #define ITEM_GENIUS_FEATHER 76
+#define ITEM_GENIUS_WING ITEM_GENIUS_FEATHER // Pre-Gen VIII name
 #define ITEM_CLEVER_FEATHER 77
+#define ITEM_CLEVER_WING ITEM_CLEVER_FEATHER // Pre-Gen VIII name
 #define ITEM_SWIFT_FEATHER 78
+#define ITEM_SWIFT_WING ITEM_SWIFT_FEATHER // Pre-Gen VIII name
 
 // Ability Modifiers
 #define ITEM_ABILITY_CAPSULE 79
@@ -155,7 +166,9 @@
 // X Items
 #define ITEM_X_ATTACK 121
 #define ITEM_X_DEFENSE 122
+#define ITEM_X_DEFEND ITEM_X_DEFENSE // Pre-Gen VI name
 #define ITEM_X_SP_ATK 123
+#define ITEM_X_SPECIAL ITEM_X_SP_ATK // Pre-Gen VI name
 #define ITEM_X_SP_DEF 124
 #define ITEM_X_SPEED 125
 #define ITEM_X_ACCURACY 126
@@ -176,8 +189,10 @@
 #define ITEM_NUGGET 135
 #define ITEM_BIG_NUGGET 136
 #define ITEM_TINY_MUSHROOM 137
+#define ITEM_TINYMUSHROOM ITEM_TINY_MUSHROOM // Pre-Gen VI name
 #define ITEM_BIG_MUSHROOM 138
 #define ITEM_BALM_MUSHROOM 139
+#define ITEM_BALMMUSHROOM ITEM_BALM_MUSHROOM // Pre-Gen VI name
 #define ITEM_PEARL 140
 #define ITEM_BIG_PEARL 141
 #define ITEM_PEARL_STRING 142
@@ -195,6 +210,7 @@
 #define ITEM_RARE_BONE 154
 #define ITEM_ODD_KEYSTONE 155
 #define ITEM_PRETTY_FEATHER 156
+#define ITEM_PRETTY_WING ITEM_PRETTY_FEATHER // Pre-Gen VIII name
 #define ITEM_RELIC_COPPER 157
 #define ITEM_RELIC_SILVER 158
 #define ITEM_RELIC_GOLD 159
@@ -234,11 +250,17 @@
 // Apricorns
 #define ITEM_RED_APRICORN 188
 #define ITEM_BLUE_APRICORN 189
+#define ITEM_BLU_APRICORN ITEM_BLUE_APRICORN // Pre-Gen VI name
 #define ITEM_YELLOW_APRICORN 190
+#define ITEM_YLW_APRICORN ITEM_YELLOW_APRICORN // Pre-Gen VI name
 #define ITEM_GREEN_APRICORN 191
+#define ITEM_GRN_APRICORN ITEM_GREEN_APRICORN // Pre-Gen VI name
 #define ITEM_PINK_APRICORN 192
+#define ITEM_PNK_APRICORN ITEM_PINK_APRICORN // Pre-Gen VI name
 #define ITEM_WHITE_APRICORN 193
+#define ITEM_WHT_APRICORN ITEM_WHITE_APRICORN // Pre-Gen VI name
 #define ITEM_BLACK_APRICORN 194
+#define ITEM_BLK_APRICORN ITEM_BLACK_APRICORN // Pre-Gen VI name
 
 #define ITEM_WISHING_PIECE 195
 #define ITEM_GALARICA_TWIG 196
@@ -265,6 +287,7 @@
 #define ITEM_FIRE_STONE 211
 #define ITEM_WATER_STONE 212
 #define ITEM_THUNDER_STONE 213
+#define ITEM_THUNDERSTONE ITEM_THUNDER_STONE // Pre-Gen VI name
 #define ITEM_LEAF_STONE 214
 #define ITEM_ICE_STONE 215
 #define ITEM_SUN_STONE 216
@@ -280,6 +303,7 @@
 #define ITEM_GALARICA_WREATH 226
 #define ITEM_DRAGON_SCALE 227
 #define ITEM_UPGRADE 228
+#define ITEM_UP_GRADE ITEM_UPGRADE // Pre-Gen VIII name
 #define ITEM_PROTECTOR 229
 #define ITEM_ELECTIRIZER 230
 #define ITEM_MAGMARIZER 231
@@ -465,12 +489,15 @@
 // Species-specific Held Items
 #define ITEM_LIGHT_BALL 392
 #define ITEM_LEEK 393
+#define ITEM_STICK ITEM_LEEK // Pre-Gen VIII name
 #define ITEM_THICK_CLUB 394
 #define ITEM_LUCKY_PUNCH 395
 #define ITEM_METAL_POWDER 396
 #define ITEM_QUICK_POWDER 397
 #define ITEM_DEEP_SEA_SCALE 398
+#define ITEM_DEEPSEASCALE ITEM_DEEP_SEA_SCALE // Pre-Gen VI name
 #define ITEM_DEEP_SEA_TOOTH 399
+#define ITEM_DEEPSEATOOTH ITEM_DEEP_SEA_TOOTH // Pre-Gen VI name
 #define ITEM_SOUL_DEW 400
 #define ITEM_ADAMANT_ORB 401
 #define ITEM_LUSTROUS_ORB 402
@@ -510,16 +537,21 @@
 #define ITEM_MAGNET 428
 #define ITEM_MIRACLE_SEED 429
 #define ITEM_NEVER_MELT_ICE 430
+#define ITEM_NEVERMELTICE ITEM_NEVER_MELT_ICE // Pre-Gen VI name
 #define ITEM_BLACK_BELT 431
+#define ITEM_BLACKBELT ITEM_BLACK_BELT // Gen II name
 #define ITEM_POISON_BARB 432
 #define ITEM_SOFT_SAND 433
 #define ITEM_SHARP_BEAK 434
 #define ITEM_TWISTED_SPOON 435
+#define ITEM_TWISTEDSPOON ITEM_TWISTED_SPOON // Pre-Gen VI name
 #define ITEM_SILVER_POWDER 436
+#define ITEM_SILVERPOWDER ITEM_SILVER_POWDER // Pre-Gen VI name
 #define ITEM_HARD_STONE 437
 #define ITEM_SPELL_TAG 438
 #define ITEM_DRAGON_FANG 439
 #define ITEM_BLACK_GLASSES 440
+#define ITEM_BLACKGLASSES ITEM_BLACK_GLASSES // Pre-Gen VI name
 #define ITEM_METAL_COAT 441
 
 // Choice Items
@@ -551,8 +583,10 @@
 
 // Misc. Held Items
 #define ITEM_BRIGHT_POWDER 459
+#define ITEM_BRIGHTPOWDER ITEM_BRIGHT_POWDER // Pre-Gen VI name
 #define ITEM_WHITE_HERB 460
 #define ITEM_EXP_SHARE 461
+#define ITEM_EXP_ALL ITEM_EXP_SHARE // Gen I name
 #define ITEM_QUICK_CLAW 462
 #define ITEM_SOOTHE_BELL 463
 #define ITEM_MENTAL_HERB 464
@@ -834,11 +868,14 @@
 #define ITEM_GOOD_ROD 710
 #define ITEM_SUPER_ROD 711
 #define ITEM_DOWSING_MACHINE 712
+#define ITEM_ITEMFINDER ITEM_DOWSING_MACHINE // Pre-Gen IV name
+#define ITEM_DOWSING_MCHN ITEM_DOWSING_MACHINE // Gen IV-V name
 #define ITEM_TOWN_MAP 713
 #define ITEM_VS_SEEKER 714
 #define ITEM_TM_CASE 715
 #define ITEM_BERRY_POUCH 716
 #define ITEM_POKEMON_BOX_LINK 717
+#define ITEM_POKEMON_BOX ITEM_POKEMON_BOX_LINK // Pre-Gen VIII name
 #define ITEM_COIN_CASE 718
 #define ITEM_POWDER_JAR 719
 #define ITEM_WAILMER_PAIL 720
@@ -857,19 +894,25 @@
 #define ITEM_OLD_SEA_MAP 731
 #define ITEM_LETTER 732
 #define ITEM_DEVON_PARTS 733
+#define ITEM_DEVON_GOODS ITEM_DEVON_PARTS // Pre-Gen VI name
 #define ITEM_GO_GOGGLES 734
 #define ITEM_DEVON_SCOPE 735
 #define ITEM_BASEMENT_KEY 736
 #define ITEM_SCANNER 737
 #define ITEM_STORAGE_KEY 738
 #define ITEM_KEY_TO_ROOM_1 739
+#define ITEM_RM_1_KEY ITEM_KEY_TO_ROOM_1 // Pre-Gen VI name
 #define ITEM_KEY_TO_ROOM_2 740
+#define ITEM_RM_2_KEY ITEM_KEY_TO_ROOM_2 // Pre-Gen VI name
 #define ITEM_KEY_TO_ROOM_4 741
+#define ITEM_RM_4_KEY ITEM_KEY_TO_ROOM_4 // Pre-Gen VI name
 #define ITEM_KEY_TO_ROOM_6 742
+#define ITEM_RM_6_KEY ITEM_KEY_TO_ROOM_6 // Pre-Gen VI name
 #define ITEM_METEORITE 743
 #define ITEM_MAGMA_EMBLEM 744
 #define ITEM_CONTEST_PASS 745
-#define ITEM_OAKS_PARCEL 746
+#define ITEM_PARCEL 746
+#define ITEM_OAKS_PARCEL ITEM_PARCEL // Pre-Gen IV name
 #define ITEM_SECRET_KEY 747
 #define ITEM_BIKE_VOUCHER 748
 #define ITEM_GOLD_TEETH 749

include/constants/moves.h

@@ -5,14 +5,18 @@
 #define MOVE_POUND 1
 #define MOVE_KARATE_CHOP 2
 #define MOVE_DOUBLE_SLAP 3
+#define MOVE_DOUBLESLAP MOVE_DOUBLE_SLAP // Pre-Gen VI name
 #define MOVE_COMET_PUNCH 4
 #define MOVE_MEGA_PUNCH 5
 #define MOVE_PAY_DAY 6
 #define MOVE_FIRE_PUNCH 7
 #define MOVE_ICE_PUNCH 8
 #define MOVE_THUNDER_PUNCH 9
+#define MOVE_THUNDERPUNCH MOVE_THUNDER_PUNCH // Pre-Gen VI name
 #define MOVE_SCRATCH 10
 #define MOVE_VISE_GRIP 11
+#define MOVE_VICEGRIP MOVE_VISE_GRIP // Pre-Gen VI name
+#define MOVE_VICE_GRIP MOVE_VISE_GRIP // Pre-Gen VIII name
 #define MOVE_GUILLOTINE 12
 #define MOVE_RAZOR_WIND 13
 #define MOVE_SWORDS_DANCE 14
@@ -51,6 +55,7 @@
 #define MOVE_SING 47
 #define MOVE_SUPERSONIC 48
 #define MOVE_SONIC_BOOM 49
+#define MOVE_SONICBOOM MOVE_SONIC_BOOM // Pre-Gen VI name
 #define MOVE_DISABLE 50
 #define MOVE_ACID 51
 #define MOVE_EMBER 52
@@ -63,6 +68,7 @@
 #define MOVE_BLIZZARD 59
 #define MOVE_PSYBEAM 60
 #define MOVE_BUBBLE_BEAM 61
+#define MOVE_BUBBLEBEAM MOVE_BUBBLE_BEAM // Pre-Gen VI name
 #define MOVE_AURORA_BEAM 62
 #define MOVE_HYPER_BEAM 63
 #define MOVE_PECK 64
@@ -78,7 +84,9 @@
 #define MOVE_GROWTH 74
 #define MOVE_RAZOR_LEAF 75
 #define MOVE_SOLAR_BEAM 76
+#define MOVE_SOLARBEAM MOVE_SOLAR_BEAM // Pre-Gen VI name
 #define MOVE_POISON_POWDER 77
+#define MOVE_POISONPOWDER MOVE_POISON_POWDER // Pre-Gen VI name
 #define MOVE_STUN_SPORE 78
 #define MOVE_SLEEP_POWDER 79
 #define MOVE_PETAL_DANCE 80
@@ -86,6 +94,7 @@
 #define MOVE_DRAGON_RAGE 82
 #define MOVE_FIRE_SPIN 83
 #define MOVE_THUNDER_SHOCK 84
+#define MOVE_THUNDERSHOCK MOVE_THUNDER_SHOCK // Pre-Gen VI name
 #define MOVE_THUNDERBOLT 85
 #define MOVE_THUNDER_WAVE 86
 #define MOVE_THUNDER 87
@@ -122,6 +131,7 @@
 #define MOVE_METRONOME 118
 #define MOVE_MIRROR_MOVE 119
 #define MOVE_SELF_DESTRUCT 120
+#define MOVE_SELFDESTRUCT MOVE_SELF_DESTRUCT // Pre-Gen VI name
 #define MOVE_EGG_BOMB 121
 #define MOVE_LICK 122
 #define MOVE_SMOG 123
@@ -137,7 +147,9 @@
 #define MOVE_AMNESIA 133
 #define MOVE_KINESIS 134
 #define MOVE_SOFT_BOILED 135
+#define MOVE_SOFTBOILED MOVE_SOFT_BOILED // Pre-Gen VI name
 #define MOVE_HIGH_JUMP_KICK 136
+#define MOVE_HI_JUMP_KICK MOVE_HIGH_JUMP_KICK // Pre-Gen VI name
 #define MOVE_GLARE 137
 #define MOVE_DREAM_EATER 138
 #define MOVE_POISON_GAS 139
@@ -187,6 +199,7 @@
 #define MOVE_MACH_PUNCH 183
 #define MOVE_SCARY_FACE 184
 #define MOVE_FEINT_ATTACK 185
+#define MOVE_FAINT_ATTACK MOVE_FEINT_ATTACK // Pre-Gen VI name
 #define MOVE_SWEET_KISS 186
 #define MOVE_BELLY_DRUM 187
 #define MOVE_SLUDGE_BOMB 188
@@ -225,8 +238,10 @@
 #define MOVE_SACRED_FIRE 221
 #define MOVE_MAGNITUDE 222
 #define MOVE_DYNAMIC_PUNCH 223
+#define MOVE_DYNAMICPUNCH MOVE_DYNAMIC_PUNCH // Pre-Gen VI name
 #define MOVE_MEGAHORN 224
 #define MOVE_DRAGON_BREATH 225
+#define MOVE_DRAGONBREATH MOVE_DRAGON_BREATH // Pre-Gen VI name
 #define MOVE_BATON_PASS 226
 #define MOVE_ENCORE 227
 #define MOVE_PURSUIT 228
@@ -247,7 +262,9 @@
 #define MOVE_MIRROR_COAT 243
 #define MOVE_PSYCH_UP 244
 #define MOVE_EXTREME_SPEED 245
+#define MOVE_EXTREMESPEED MOVE_EXTREME_SPEED // Pre-Gen VI name
 #define MOVE_ANCIENT_POWER 246
+#define MOVE_ANCIENTPOWER MOVE_ANCIENT_POWER // Pre-Gen VI name
 #define MOVE_SHADOW_BALL 247
 #define MOVE_FUTURE_SIGHT 248
 #define MOVE_ROCK_SMASH 249
@@ -267,6 +284,7 @@
 #define MOVE_FACADE 263
 #define MOVE_FOCUS_PUNCH 264
 #define MOVE_SMELLING_SALTS 265
+#define MOVE_SMELLINGSALT MOVE_SMELLING_SALTS // Pre-Gen VI name
 #define MOVE_FOLLOW_ME 266
 #define MOVE_NATURE_POWER 267
 #define MOVE_CHARGE 268
@@ -299,6 +317,7 @@
 #define MOVE_LUSTER_PURGE 295
 #define MOVE_MIST_BALL 296
 #define MOVE_FEATHER_DANCE 297
+#define MOVE_FEATHERDANCE MOVE_FEATHER_DANCE // Pre-Gen VI name
 #define MOVE_TEETER_DANCE 298
 #define MOVE_BLAZE_KICK 299
 #define MOVE_MUD_SPORT 300
@@ -322,6 +341,7 @@
 #define MOVE_SILVER_WIND 318
 #define MOVE_METAL_SOUND 319
 #define MOVE_GRASS_WHISTLE 320
+#define MOVE_GRASSWHISTLE MOVE_GRASS_WHISTLE // Pre-Gen VI name
 #define MOVE_TICKLE 321
 #define MOVE_COSMIC_POWER 322
 #define MOVE_WATER_SPOUT 323

include/graphics.h

@@ -9985,8 +9985,8 @@ extern const u32 gItemIcon_MagmaEmblem[];
 extern const u32 gItemIconPalette_MagmaEmblem[];
 extern const u32 gItemIcon_ContestPass[];
 extern const u32 gItemIconPalette_ContestPass[];
-extern const u32 gItemIcon_OaksParcel[];
+extern const u32 gItemIcon_Parcel[];
-extern const u32 gItemIconPalette_OaksParcel[];
+extern const u32 gItemIconPalette_Parcel[];
 extern const u32 gItemIcon_SecretKey[];
 extern const u32 gItemIconPalette_SecretKey[];
 extern const u32 gItemIcon_BikeVoucher[];

src/data/graphics/items.h

@@ -1918,8 +1918,8 @@ const u32 gItemIconPalette_MagmaEmblem[] = INCBIN_U32("graphics/items/icon_palet
 const u32 gItemIcon_ContestPass[] = INCBIN_U32("graphics/items/icons/contest_pass.4bpp.lz");
 const u32 gItemIconPalette_ContestPass[] = INCBIN_U32("graphics/items/icon_palettes/contest_pass.gbapal.lz");
 
-const u32 gItemIcon_OaksParcel[] = INCBIN_U32("graphics/items/icons/oaks_parcel.4bpp.lz");
+const u32 gItemIcon_Parcel[] = INCBIN_U32("graphics/items/icons/parcel.4bpp.lz");
-const u32 gItemIconPalette_OaksParcel[] = INCBIN_U32("graphics/items/icon_palettes/oaks_parcel.gbapal.lz");
+const u32 gItemIconPalette_Parcel[] = INCBIN_U32("graphics/items/icon_palettes/parcel.gbapal.lz");
 
 const u32 gItemIcon_SecretKey[] = INCBIN_U32("graphics/items/icons/secret_key.4bpp.lz");
 const u32 gItemIconPalette_SecretKey[] = INCBIN_U32("graphics/items/icon_palettes/secret_key.gbapal.lz");

src/data/item_icon_table.h

@@ -791,7 +791,7 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
     [ITEM_METEORITE] = {gItemIcon_Meteorite, gItemIconPalette_Meteorite},
     [ITEM_MAGMA_EMBLEM] = {gItemIcon_MagmaEmblem, gItemIconPalette_MagmaEmblem},
     [ITEM_CONTEST_PASS] = {gItemIcon_ContestPass, gItemIconPalette_ContestPass},
-    [ITEM_OAKS_PARCEL] = {gItemIcon_OaksParcel, gItemIconPalette_OaksParcel},
+    [ITEM_PARCEL] = {gItemIcon_Parcel, gItemIconPalette_Parcel},
     [ITEM_SECRET_KEY] = {gItemIcon_SecretKey, gItemIconPalette_SecretKey},
     [ITEM_BIKE_VOUCHER] = {gItemIcon_BikeVoucher, gItemIconPalette_BikeVoucher},
     [ITEM_GOLD_TEETH] = {gItemIcon_GoldTeeth, gItemIconPalette_GoldTeeth},

src/data/items.h

@@ -9063,11 +9063,11 @@ const struct Item gItems[] =
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
     },
 
-    [ITEM_OAKS_PARCEL] =
+    [ITEM_PARCEL] =
     {
-        .name = _("Oak's Parcel"),
+        .name = _("Parcel"),
         .price = 0,
-        .description = sOaksParcelDesc,
+        .description = sParcelDesc,
         .importance = 2,
         .pocket = POCKET_KEY_ITEMS,
         .type = ITEM_USE_BAG_MENU,

src/data/text/item_descriptions.h

@@ -3754,7 +3754,7 @@ static const u8 sContestPassDesc[] = _(
     "for entering\n"
     "Pokémon Contests.");
 
-static const u8 sOaksParcelDesc[] = _(
+static const u8 sParcelDesc[] = _(
     "A parcel for Prof.\n"
     "Oak from a Pokémon\n"
     "Mart's clerk.");