Include dungeon rewards in MW_SEND_OWN_ITEMS

OoTRandomizer · Feb 27, 2025 · c00a2e3 · c00a2e3
1 parent b24bfec
commit c00a2e3
Show file tree

Hide file tree

Showing 8 changed files with 35,685 additions and 35,674 deletions.
diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt
diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o
diff --git a/ASM/build/c_symbols.txt b/ASM/build/c_symbols.txt
diff --git a/ASM/c/blue_warp.c b/ASM/c/blue_warp.c
@@ -13,6 +13,7 @@
 extern uint8_t PLAYER_ID;
 extern uint8_t PLAYER_NAME_ID;
 extern bool REWARDS_AS_ITEMS;
+extern uint8_t MW_SEND_OWN_ITEMS;
 
 // Original function copied over
 int32_t DoorWarp1_PlayerInRange(z64_actor_t* actor, z64_game_t* game) {
@@ -39,6 +40,10 @@ int32_t DoorWarp1_PlayerInRange_Overwrite(z64_actor_t* actor, z64_game_t* game)
                 override_t override = lookup_override_by_key(override_key);
                 uint16_t resolved_item_id = resolve_upgrades(override);
                 item_row_t* item_row = get_item_row(resolved_item_id);
+                if (MW_SEND_OWN_ITEMS) {
+                    // Also send to multiworld plugin for informational purposes if requested
+                    push_outgoing_override(&override);
+                }
                 call_effect_function(item_row);
                 PLAYER_NAME_ID = override.value.base.player;
                 z64_DisplayTextbox(&z64_game, resolve_item_text_id(item_row, PLAYER_NAME_ID != PLAYER_ID), 0);

diff --git a/ASM/c/get_items.h b/ASM/c/get_items.h
@@ -13,6 +13,7 @@ void item_overrides_init();
 void handle_pending_items();
 void push_delayed_item(uint8_t flag);
 void pop_pending_item();
+void push_outgoing_override(override_t* override);
 enum override_type {
     OVR_BASE_ITEM = 0,
     OVR_CHEST = 1,

diff --git a/data/generated/patch_symbols.json b/data/generated/patch_symbols.json