Merge branch 'Dev' into dev-fenhl

# Conflicts: # ASM/build/asm_symbols.txt # ASM/build/bundle.o # ASM/build/c_symbols.txt # data/generated/rom_patch.txt # data/generated/symbols.json
fenhl · Jul 23, 2024 · 1de9ed6 · 1de9ed6
2 parents 326e6d7 + f4aed4c
commit 1de9ed6
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 78 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/get_items.c b/ASM/c/get_items.c
@@ -51,6 +51,8 @@ uint32_t active_item_fast_chest = 0;
 uint16_t incoming_junk = 0;
 
 uint8_t satisfied_pending_frames = 0;
+// Minimum number that prevents Sheik at Temple and ToT Reward from Rauru from overlapping, see https://github.com/OoTRandomizer/OoT-Randomizer/issues/2247
+const uint8_t REQUIRED_PENDING_FRAMES = 6;
 
 // These tables contain the flag bit offset for a particular scene/room/setup. These tables also index into xflag_room_blob to obtain the bit assignment for each actor in that room
 // xlflag_room_blob contains a compressed table of actor bit assignments for each scene/room/setup.
@@ -433,7 +435,7 @@ inline uint32_t link_is_ready() {
     } else {
         satisfied_pending_frames = 0;
     }
-    if (satisfied_pending_frames >= 2) {
+    if (satisfied_pending_frames >= REQUIRED_PENDING_FRAMES) {
         satisfied_pending_frames = 0;
         return 1;
     }

diff --git a/ASM/c/gfx.c b/ASM/c/gfx.c
@@ -9,7 +9,7 @@ extern uint8_t DPAD_RESOURCE[];
 extern uint8_t TRIFORCE_SPRITE_RESOURCE[];
 
 z64_disp_buf_t* rando_db __attribute__ ((aligned (16)));
-const unsigned int RANDO_DB_SIZE = 0x4000;
+const unsigned int RANDO_DB_SIZE = 0x5000;
 
 #if DEBUG_MODE
 z64_disp_buf_t* debug_db __attribute__ ((aligned (16)));

diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt