some minor stuff

OoTRandomizer · Sep 1, 2024 · 253c738 · 253c738
1 parent 5a7b7cc
commit 253c738
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ASM/c/objects.c b/ASM/c/objects.c
@@ -1,6 +1,7 @@
 #include "objects.h"
 #include "z64.h"
 #include "get_items.h"
+#include "item_table.h"
 
 extern uint8_t FIX_BROKEN_DROPS;
 
@@ -27,10 +28,10 @@ void enitem00_set_link_incoming_item_id(z64_actor_t* actor, z64_game_t* game, in
     // Run z64_ActorOfferGetItem regardless of FIX_BROKEN_DROPS
     if (!z64_ActorOfferGetItem(&this->actor, game, incoming_item_id, 50.0f, 10.0f) && FIX_BROKEN_DROPS) {
         switch (incoming_item_id) {
-            case 0x43: // GI_MAGIC_SMALL
+            case GI_MAGIC_JAR_SMALL: // GI_MAGIC_SMALL
                 z64_GiveItem(game, Z64_ITEM_MAGIC_SMALL);
                 break;
-            case 0x44: // GI_MAGIC_LARGE
+            case GI_MAGIC_JAR_LARGE: // GI_MAGIC_LARGE
                 z64_GiveItem(game, Z64_ITEM_MAGIC_LARGE);
                 break;
         }

diff --git a/Patches.py b/Patches.py
@@ -2138,8 +2138,8 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p
         rom.write_byte(symbol, 0x01)
 
         # Autocollect incoming_item_id for magic jars are swapped in vanilla code
-        rom.write_int16(0xA88066, 0x0044)  # Change GI_MAGIC_SMALL to GI_MAGIC_LARGE
-        rom.write_int16(0xA88072, 0x0043)  # Change GI_MAGIC_LARGE to GI_MAGIC_SMALL
+        rom.write_int16(0xA88066, 0x0044)  # Change GI_MAGIC_JAR_SMALL to GI_MAGIC_JAR_LARGE
+        rom.write_int16(0xA88072, 0x0043)  # Change GI_MAGIC_JAR_LARGE to GI_MAGIC_JAR_SMALL
     else:
         # Remove deku shield drop from spirit pot because it's "vanilla behavior"
         # Replace actor parameters in scene 06, room 27 actor list