Display the correct item model on Big Octo

Author: fenhl

ASM/build/asm_symbols.txt

@@ -6,17 +6,17 @@
 extern void DemoEffect_DrawJewel(z64_actor_t* this, z64_game_t* globalCtx, void* func);
 extern void* DemoEffect_DrawJewel_AfterHook;
 
+extern override_key_t CFG_BIGOCTO_OVERRIDE_KEY;
+
 void DemoEffect_DrawJewel_Hook(DemoEffect* this, z64_game_t* globalCtx) {
     if (!this->override_initialized) {
         if (globalCtx->scene_index == 0x02) {
-            override_key_t sapphire_override_key = {
-                .scene = 0x13,
-                .type = 0x00,
-                .flag = 0x65,
-            };
-            this->override = lookup_override_by_key(sapphire_override_key);
+            if (CFG_BIGOCTO_OVERRIDE_KEY.all) {
+                this->override = lookup_override_by_key(CFG_BIGOCTO_OVERRIDE_KEY);
+            }
             if (this->override.key.all) {
                 this->actor.rot_2.x = 0;
+                this->actor.scale = (z64_xyzf_t) { 0.02f, 0.02f, 0.02f };
             }
         }
 

ASM/build/bundle.o

@@ -236,6 +236,9 @@ CFG_DUNGEON_INFO_REWARD_WORLDS_ENABLE:
 CFG_DUNGEON_REWARD_WORLDS:
 .endarea
 .align 4
+CFG_BIGOCTO_OVERRIDE_KEY:
+.word 0
+.align 4
 
 ; These configuration values are given fixed addresses to aid auto-trackers.
 ; Any changes made here should be documented in Notes/auto-tracker-ctx.md

ASM/build/c_symbols.txt

@@ -357,15 +357,15 @@
     'Buy Red Potion for 40 Rupees':     ('Shop',     False, 0x30, {'object': 0x00EB, 'price': 40}),
     'Buy Red Potion for 50 Rupees':     ('Shop',     False, 0x31, {'object': 0x00EB, 'price': 50}),
 
-    'Kokiri Emerald':                   ('DungeonReward',    True,  0x0127, {'stone':     True, 'item_id': 0x6C, 'actor_type': 0x13, 'object_id': 0x00AD}),
-    'Goron Ruby':                       ('DungeonReward',    True,  0x0128, {'stone':     True, 'item_id': 0x6D, 'actor_type': 0x14, 'object_id': 0x00AD}),
-    'Zora Sapphire':                    ('DungeonReward',    True,  0x0129, {'stone':     True, 'item_id': 0x6E, 'actor_type': 0x15, 'object_id': 0x00AD}),
-    'Light Medallion':                  ('DungeonReward',    True,  0x012A, {'medallion': True, 'item_id': 0x6B, 'actor_type': 0x0E, 'object_id': 0x00BA}),
-    'Forest Medallion':                 ('DungeonReward',    True,  0x012B, {'medallion': True, 'item_id': 0x66, 'actor_type': 0x0B, 'object_id': 0x00BA}),
-    'Fire Medallion':                   ('DungeonReward',    True,  0x012C, {'medallion': True, 'item_id': 0x67, 'actor_type': 0x09, 'object_id': 0x00BA}),
-    'Water Medallion':                  ('DungeonReward',    True,  0x012D, {'medallion': True, 'item_id': 0x68, 'actor_type': 0x0A, 'object_id': 0x00BA}),
-    'Shadow Medallion':                 ('DungeonReward',    True,  0x012E, {'medallion': True, 'item_id': 0x6A, 'actor_type': 0x0D, 'object_id': 0x00BA}),
-    'Spirit Medallion':                 ('DungeonReward',    True,  0x012F, {'medallion': True, 'item_id': 0x69, 'actor_type': 0x0C, 'object_id': 0x00BA}),
+    'Kokiri Emerald':                   ('DungeonReward',    True,  0x0127, {'stone':     True, 'item_id': 0x6C}),
+    'Goron Ruby':                       ('DungeonReward',    True,  0x0128, {'stone':     True, 'item_id': 0x6D}),
+    'Zora Sapphire':                    ('DungeonReward',    True,  0x0129, {'stone':     True, 'item_id': 0x6E}),
+    'Light Medallion':                  ('DungeonReward',    True,  0x012A, {'medallion': True, 'item_id': 0x6B}),
+    'Forest Medallion':                 ('DungeonReward',    True,  0x012B, {'medallion': True, 'item_id': 0x66}),
+    'Fire Medallion':                   ('DungeonReward',    True,  0x012C, {'medallion': True, 'item_id': 0x67}),
+    'Water Medallion':                  ('DungeonReward',    True,  0x012D, {'medallion': True, 'item_id': 0x68}),
+    'Shadow Medallion':                 ('DungeonReward',    True,  0x012E, {'medallion': True, 'item_id': 0x6A}),
+    'Spirit Medallion':                 ('DungeonReward',    True,  0x012F, {'medallion': True, 'item_id': 0x69}),
 }
 
 REWARD_COLORS: dict[str, str] = {

ASM/c/demo_effect.c

@@ -1837,16 +1837,9 @@ def calculate_traded_flags(world):
     update_message_by_id(messages, 0x4050, new_message)
 
     # Set Dungeon Reward Actor in Jabu Jabu to be accurate
-    #if location is not None and location.item is not None:  # TODO make actor invisible if no item?
-    #    jabu_item = location.item
-    #    jabu_actor_type = jabu_item.special.get('actor_type', 0x15) #TODO handle non-dungeon-reward items
-    #    set_jabu_stone_actors(rom, jabu_actor_type)
-    #    # Also set the right object for the actor, since medallions and stones require different objects
-    #    # MQ is handled separately, as we include both objects in the object list in mqu.json (Scene 2, Room 6)
-    #    if not world.dungeon_mq['Jabu Jabus Belly']:
-    #        jabu_stone_object = jabu_item.special.get('object_id', 0x00AD) #TODO handle non-dungeon-reward items
-    #        rom.write_int16(0x277D068, jabu_stone_object)
-    #        rom.write_int16(0x277D168, jabu_stone_object)
+    if location is not None and location.item is not None:  # TODO make actor invisible if no item?
+        scene, type, default, _, _, _ = get_override_entry(location)
+        rom.write_bytes(rom.sym('CFG_BIGOCTO_OVERRIDE_KEY'), override_key_struct.pack(scene, type, default))
 
     # use faster jabu elevator
     if not world.dungeon_mq['Jabu Jabus Belly'] and world.settings.shuffle_scrubs == 'off':
@@ -2739,6 +2732,7 @@ def get_override_table(world: World):
     return list(filter(lambda val: val is not None, map(get_override_entry, world.get_filled_locations())))
 
 
+override_key_struct = struct.Struct('>BBH')  # match override_key_t in get_items.h
 override_struct = struct.Struct('>BBHxxxxHBxHxx')  # match override_t in get_items.h