Merge "Render correct model for TCG Keys when they're not shuffled and unique key models are enabled" (OoTRandomizer#2466)

# Conflicts:
#	ASM/build/asm_symbols.txt
#	ASM/build/bundle.o
#	ASM/build/c_symbols.txt
#	data/generated/patch_symbols.json
#	data/generated/rom_patch.txt
#	data/generated/symbols.json

Author: fenhl

ASM/build/asm_symbols.txt

@@ -238,79 +238,79 @@ void item_etcetera_draw(z64_actor_t* actor, z64_game_t* game) {
             .flag = 0x0A,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x0008 && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x0008 && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 1 Bottom Chest item inside chest
         override_key_t key = {
             .scene = 0x10,
             .type = OVR_CHEST,
             .flag = 0x00,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x010D && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x010D && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 1 Top Chest item inside chest
         override_key_t key = {
             .scene = 0x10,
             .type = OVR_CHEST,
             .flag = 0x01,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x0208 && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x0208 && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 2 Bottom Chest item inside chest
         override_key_t key = {
             .scene = 0x10,
             .type = OVR_CHEST,
             .flag = 0x02,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x030D && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x030D && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 2 Top Chest item inside chest
         override_key_t key = {
             .scene = 0x10,
             .type = OVR_CHEST,
             .flag = 0x03,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x0409 && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x0409 && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 3 Bottom Chest item inside chest
         override_key_t key = {
             .scene = 0x10,
             .type = OVR_CHEST,
             .flag = 0x04,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x050D && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x050D && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 3 Top Chest item inside chest
         override_key_t key = {
             .scene = 0x10,
             .type = OVR_CHEST,
             .flag = 0x05,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x0609 && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x0609 && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 4 Bottom Chest item inside chest
         override_key_t key = {
             .scene = 0x10,
             .type = OVR_CHEST,
             .flag = 0x06,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x070D && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x070D && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 4 Top Chest item inside chest
         override_key_t key = {
             .scene = 0x10,
             .type = OVR_CHEST,
             .flag = 0x07,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x080A && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x080A && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 5 Bottom Chest item inside chest
         override_key_t key = {
             .scene = 0x10,
             .type = OVR_CHEST,
             .flag = 0x08,
         };
         override = lookup_override_by_key(key);
-    } else if (actor->variable == 0x090D && SHUFFLE_CHEST_GAME) {
+    } else if (actor->variable == 0x090D && (SHUFFLE_CHEST_GAME || CUSTOM_KEY_MODELS)) {
         //Chest Game Room 5 Top Chest item inside chest
         override_key_t key = {
             .scene = 0x10,

ASM/build/bundle.o

@@ -5,6 +5,8 @@
 #include "override.h"
 #include <stdint.h>
 
+extern uint8_t CUSTOM_KEY_MODELS;
+
 typedef struct model_t {
     uint16_t object_id;
     uint8_t graphic_id;

ASM/build/c_symbols.txt

@@ -15,6 +15,7 @@
 * Fix a bug where the starting health capacity in game might be miscalculated when starting with a heart piece.
 * Fix the Chicken (child trade quest item) using the same get item text box as the Pocket Cucco (adult trade quest item).
 * Fix a vanilla bug where playing the ocarina with vibrato before recording the Scarecrow's Song could prevent Pierre from spawning.
+* Fix unshuffled treasure box shop keys showing the wrong item model while inside the chests if `Key Appearance Matches Dungeon` is enabled.
 
 # 9.0