Item Renames from Esme

zeldaret · Nov 7, 2024 · c02b50c · c02b50c
1 parent 66162b2
commit c02b50c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/include/d/a/d_a_itembase.h b/include/d/a/d_a_itembase.h
@@ -26,9 +26,9 @@ enum ITEM_ID {
     /* 0x013 */ ITEM_BOW = 19,
     /* 0x014 */ ITEM_CLAWSHOTS = 20,
     /* 0x015 */ ITEM_BIRD_STATUETTE = 21,
-    /* 0x016 */ ITEM_DEKU_HORNET = 22,
-    /* 0x017 */ ITEM_UNK_23 = 23,
-    /* 0x018 */ ITEM_UNK_24 = 24,
+    /* 0x016 */ ITEM_COMMON_BUG = 22,
+    /* 0x017 */ ITEM_UNCOMMON_BUG = 23,
+    /* 0x018 */ ITEM_RARE_BUG = 24,
     /* 0x019 */ ITEM_AC_BK = 25,
     /* 0x01A */ ITEM_FS_BK = 26,
     /* 0x01B */ ITEM_SSH_BK = 27,
@@ -65,18 +65,18 @@ enum ITEM_ID {
     /* 0x03A */ ITEM_UNK_58 = 58,
     /* 0x03B */ ITEM_UNK_59 = 59,
     /* 0x03C */ ITEM_10_DEKU_SEEDS = 60,
-    /* 0x03D */ ITEM_DUSK_RELIC_MAYBE = 61,
-    /* 0x03E */ ITEM_DUSK_RELIC = 62,
-    /* 0x03F */ ITEM_EVIL_CRYSTAL = 63,
-    /* 0x040 */ ITEM_BLUE_FEATHER_GOLD_SKULL_PLUME = 64,
+    /* 0x03D */ ITEM_COMMON_TREASURE = 61,
+    /* 0x03E */ ITEM_COMMON_TREASURE2 = 62,
+    /* 0x03F */ ITEM_UNCOMMON_TREASURE = 63,
+    /* 0x040 */ ITEM_RARE_TREASURE = 64,
     /* 0x041 */ ITEM_GUARDIAN_POTION = 65,
     /* 0x042 */ ITEM_GUARDIAN_POTION_PLUS = 66,
     /* 0x043 */ ITEM_UNK_67 = 67,
     /* 0x044 */ ITEM_WATER_SCALE = 68,
     /* 0x045 */ ITEM_UNK_69 = 69,
-    /* 0x046 */ ITEM_FAIRY = 70,
+    /* 0x046 */ ITEM_BUG_MEDAL = 70,
     /* 0x047 */ ITEM_BUG_NET = 71,
-    /* 0x048 */ ITEM_FAIRY_BUG_NET = 72,
+    /* 0x048 */ ITEM_FAIRY = 72,
     /* 0x049 */ ITEM_UNK_73 = 73,
     /* 0x04A */ ITEM_SACRED_WATER = 74,
     /* 0x04B */ ITEM_HOOK_BEETLE = 75,
@@ -92,7 +92,7 @@ enum ITEM_ID {
     /* 0x055 */ ITEM_STAMINA_POTION_PLUS = 85,
     /* 0x056 */ ITEM_AIR_POTION = 86,
     /* 0x057 */ ITEM_AIR_POTION_PLUS = 87,
-    /* 0x058 */ ITEM_FAIRY_FIRST = 88,
+    /* 0x058 */ ITEM_BOTTLED_FAIRY = 88,
     /* 0x059 */ ITEM_UNK_89 = 89,
     /* 0x05A */ ITEM_IRON_BOW = 90,
     /* 0x05B */ ITEM_SACRED_BOW = 91,
@@ -162,22 +162,22 @@ enum ITEM_ID {
     /* 0x09B */ ITEM_HEART_MEDAL_ALSO = 155,
     /* 0x09C */ ITEM_UNK_156 = 156,
     /* 0x09D */ ITEM_UNK_157 = 157,
-    /* 0x09E */ ITEM_CAWLINS_LETTER = 158,
-    /* 0x09F */ ITEM_HORNED_COLOSSOL_BEETLE = 159,
-    /* 0x0A0 */ ITEM_BABY_RATTLE = 160,
+    /* 0x09E */ ITEM_CAWLIN_LETTER = 158,
+    /* 0x09F */ ITEM_BEEDLE_INSECT_CAGE = 159,
+    /* 0x0A0 */ ITEM_RATTLE = 160,
     /* 0x0A1 */ ITEM_HORNET_LARVAE = 161,
     /* 0x0A2 */ ITEM_BIRD_FEATHER = 162,
     /* 0x0A3 */ ITEM_TUMBLE_WEED = 163,
     /* 0x0A4 */ ITEM_LIZARD_TAIL = 164,
     /* 0x0A5 */ ITEM_ELDIN_ORE = 165,
     /* 0x0A6 */ ITEM_ANCIENT_FLOWER = 166,
     /* 0x0A7 */ ITEM_AMBER_RELIC = 167,
-    /* 0x0A8 */ ITEM_DUSK_RELIC_AGAIN = 168,
+    /* 0x0A8 */ ITEM_DUSK_RELIC = 168,
     /* 0x0A9 */ ITEM_JELLY_BLOB = 169,
     /* 0x0AA */ ITEM_MONSTER_CLAW = 170,
     /* 0x0AB */ ITEM_MONSTER_HORN = 171,
     /* 0x0AC */ ITEM_ORNAMENTAL_SKULL = 172,
-    /* 0x0AD */ ITEM_EVIL_CRYSTAL_ITEM = 173,
+    /* 0x0AD */ ITEM_EVIL_CRYSTAL = 173,
     /* 0x0AE */ ITEM_BLUE_BIRD_FEATHER = 174,
     /* 0x0AF */ ITEM_GOLDEN_SKULL = 175,
     /* 0x0B0 */ ITEM_GODDESS_PLUME = 176,
@@ -205,8 +205,8 @@ enum ITEM_ID {
     /* 0x0C6 */ ITEM_LIFE_TREE_FRUIT = 198,
     /* 0x0C7 */ ITEM_EXTRA_WALLET = 199,
     /* 0x0C8 */ ITEM_UNK_200 = 200,
-    /* 0x18D */ ITEM_LIFE_MEDAL_AGAIN = 397,
-    /* 0x18E */ ITEM_POUCH_EXPANSION_GODDESS_CHEST = 398,
+    /* 0x18D */ ITEM_LIFE_MEDAL_AGAIN = 397,              // ?? Prob doesnt exist
+    /* 0x18E */ ITEM_POUCH_EXPANSION_GODDESS_CHEST = 398, // ?? Prob doesnt exist
     /* 0x1FF */ MAX_ITEM_ID = 511
 };
 

diff --git a/src/toBeSorted/special_item_drop_mgr.cpp b/src/toBeSorted/special_item_drop_mgr.cpp
@@ -367,13 +367,11 @@ const LowHealthReplacement LOW_HEALTH_REPLACEMENTS[] = {
      },
 };
 
-int SPECIAL_ITEM_ARRAY[] = {ITEM_NONE,       ITEM_HEART,         ITEM_HEART,         ITEM_GREEN_RUPEE,
-                            ITEM_BLUE_RUPEE, ITEM_RED_RUPEE,     ITEM_FARORE_TEAR,   ITEM_5_BOMBS,
-                            ITEM_10_BOMBS,   ITEM_SINGLE_ARROW,  ITEM_BUNDLE_ARROWS, ITEM_5_DEKU_SEEDS,
-                            ITEM_NONE,       ITEM_NONE,          ITEM_KEY_PIECE,     ITEM_ELDIN_ORE,
-                            ITEM_UNK_58,     ITEM_UNK_59,        ITEM_UNK_183,       ITEM_UNK_184,
-                            ITEM_UNK_185,    ITEM_FAIRY_BUG_NET, ITEM_FAIRY_BUG_NET, ITEM_SMALL_KEY,
-                            ITEM_RUPOOR};
+int SPECIAL_ITEM_ARRAY[] = {ITEM_NONE,          ITEM_HEART,        ITEM_HEART,   ITEM_GREEN_RUPEE, ITEM_BLUE_RUPEE,
+                            ITEM_RED_RUPEE,     ITEM_FARORE_TEAR,  ITEM_5_BOMBS, ITEM_10_BOMBS,    ITEM_SINGLE_ARROW,
+                            ITEM_BUNDLE_ARROWS, ITEM_5_DEKU_SEEDS, ITEM_NONE,    ITEM_NONE,        ITEM_KEY_PIECE,
+                            ITEM_ELDIN_ORE,     ITEM_UNK_58,       ITEM_UNK_59,  ITEM_UNK_183,     ITEM_UNK_184,
+                            ITEM_UNK_185,       ITEM_FAIRY,        ITEM_FAIRY,   ITEM_SMALL_KEY,   ITEM_RUPOOR};
 
 static const u32 sNumDropEntries = 0x36;
 static const struct {