Update gold skulltula actor check in key override.

Z3DR · Jul 7, 2024 · 0e234f1 · 0e234f1
1 parent 69ad906
commit 0e234f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/include/game/actor.h b/code/include/game/actor.h
@@ -48,6 +48,8 @@ namespace game::act {
     EnJs = 0x0085,
     // Cursed Man Spider House
     EnSsh = 0x0090,
+    // Gold Skullutla
+    EnSi = 0x0099,
     // Powder Keg Trial Goron
     EnGo = 0x00D5,
     // [1] Deku Palace / Woodfall Temple moving platforms (after player lands on them)

diff --git a/code/source/rnd/item_override.cpp b/code/source/rnd/item_override.cpp
@@ -88,8 +88,8 @@ namespace rnd {
       retKey.scene = scene;
       retKey.type = ItemOverride_Type::OVR_COLLECTABLE;
       retKey.flag = actor->overlay_info->info->flags;
-    } else if (actor->id == (game::act::Id)game::ItemId::GoldSkulltula) {  // Gold Skulltula Token
-      retKey.scene = (actor->params >> 8) & 0x1F;
+    } else if (actor->id == game::act::Id::EnSi) {  // Gold Skulltula Token
+      retKey.scene = scene;
       retKey.type = ItemOverride_Type::OVR_SKULL;
       retKey.flag = actor->params & 0xFF;
     } else if (scene == 0x14C0 && actor->id == (game::act::Id)0x0075) {  // Grotto Salesman