Fix item table entries for fairy and nothing

fenhl · Feb 1, 2024 · 0581b83 · 0581b83
1 parent 39dd0c8
commit 0581b83
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o
diff --git a/ASM/c/item_table.c b/ASM/c/item_table.c
@@ -328,8 +328,8 @@ item_row_t item_table[] = {
     [0x0117] = ITEM_ROW(0x53,      SILVER_CHEST, 0x41, -1, 0x00A1, 0x01A1, 0x88, no_upgrade, give_small_key, CASTLE_ID, -1, resolve_text_small_keys), // Ganon's Castle Small Key
     [0x0118] = ITEM_ROW(0x53,      SILVER_CHEST, 0x41, -1, 0x913E, 0x01A2, 0x89, no_upgrade, give_small_key, TCG_ID,    -1, resolve_text_small_keys_cmg), // Small Key (Chest Game)
 
-    [0x1009] = ITEM_ROW(0x53,       BROWN_CHEST, 0x41, -1, 0x90B4, 0x0177, 0x9E, no_upgrade, full_heal, -1, -1, NULL), // Fairy
-    [0x100A] = ITEM_ROW(0x53,       BROWN_CHEST, 0x41, -1, 0x90B5, 0x0177, 0x9F, no_upgrade, no_effect, -1, -1, NULL), // Nothing :)
+    [0x0119] = ITEM_ROW(0x53,       BROWN_CHEST, 0x41, -1, 0x90B4, 0x0177, 0x9E, no_upgrade, full_heal, -1, -1, NULL), // Fairy
+    [0x011A] = ITEM_ROW(0x53,       BROWN_CHEST, 0x41, -1, 0x90B5, 0x0177, 0x9F, no_upgrade, no_effect, -1, -1, NULL), // Nothing :)
 
     // New items in dev-fenhl which are not in main Dev
     // Some previously used IDs may be skipped, to simplify auto-tracker support

diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt
diff --git a/version.py b/version.py
@@ -1,7 +1,7 @@
 __version__ = '8.0.11'
 
 # This is a supplemental version number for branches based off of main dev.
-supplementary_version = 4
+supplementary_version = 5
 
 # Pick a unique identifier byte for your fork if you are intending to have a long-lasting branch.
 # This will be 0x00 for main releases and 0x01 for main dev.