Merge 'Fix TCG key text ID with Key Appearance Matches Dungeon' (#2192)

OoTRandomizer · Mar 15, 2024 · 5067a09 · 5067a09
2 parents 0978e14 + 03f3c45
commit 5067a09
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 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
@@ -326,7 +326,7 @@ item_row_t item_table[] = {
     [0x0115] = ITEM_ROW(0x53,      SILVER_CHEST, 0x41, -1, 0x009F, 0x019F, 0x86, no_upgrade, give_small_key, GTG_ID,    -1, resolve_text_small_keys), // Gerudo Training Small Key
     [0x0116] = ITEM_ROW(0x53,      SILVER_CHEST, 0x41, -1, 0x00A0, 0x01A0, 0x87, no_upgrade, give_small_key, FORT_ID,   -1, resolve_text_small_keys), // Thieves' Hideout Small Key
     [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)
+    [0x0118] = ITEM_ROW(0x53,      SILVER_CHEST, 0x41, -1, 0x00F3, 0x01A2, 0x89, no_upgrade, give_small_key, TCG_ID,    -1, resolve_text_small_keys_cmg), // Small Key (Chest Game)
 };
 
 /*  Determine which message to display based on the number of silver rupees collected.

diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt
diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.0.24'
+__version__ = '8.0.25'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0