Merge pull request #2946 from 2dos/misc-fixes-dec

theballaam96 · web-flow · commit 254bebc5f97f · 2025-12-13T12:38:47.000-06:00
Misc fixes dec
diff --git a/base-hack/asm/symbols.asm b/base-hack/asm/symbols.asm
@@ -148,6 +148,7 @@
 
 .definelabel ExitPointer, 0x807FC900
 .definelabel ExitCount, 0x807FC904
+.definelabel CheatBitfield, 0x80744544
 
 .definelabel screenCenterX, 0x80744490
 .definelabel screenCenterY, 0x80744494
diff --git a/base-hack/include/dk64.h b/base-hack/include/dk64.h
@@ -562,6 +562,7 @@ extern unsigned short PositionFacingAngle;
 extern char ChimpyCam;
 extern char ScreenRatio;
 extern char SoundType;
+extern unsigned short CheatBitfield;
 extern actorData* LastSpawnedActor;
 extern char LoadedActorCount;
 extern loadedActorArr LoadedActorArray[64];
diff --git a/base-hack/include/global.h b/base-hack/include/global.h
@@ -540,4 +540,5 @@ extern unsigned char pregiven_status[56];
 extern StartingItemsStruct starting_item_data;
 extern coinHUDStruct CoinHUDElements[8];
 extern unsigned short guard_tag_timer;
-extern spoiler_struct spoiler_items[SPOILER_COUNT];
+extern spoiler_struct spoiler_items[SPOILER_COUNT];
+extern char k_rool_text[9];
diff --git a/base-hack/src/misc/file_screen.c b/base-hack/src/misc/file_screen.c
@@ -13,6 +13,7 @@
 static char balanced_igt[20] = "";
 static char perc_str[7] = "";
 static char gb_str[5] = "";
+char k_rool_text[9] = "& K.ROOL";
 
 #define LINE_GAP 0x8C
 static char updated_tracker = 0;
diff --git a/base-hack/src/misc/hud.c b/base-hack/src/misc/hud.c
@@ -330,7 +330,6 @@ void initHUDDirection(placementData* hud_data, int item) {
 }
 
 void allocateHUD(int reallocate) {
-    int cheat_bitfield = 0; // TODO: Hook this up
     int world = getWorld(CurrentMap, 1);
     if (reallocate) {
         HUD = dk_malloc(ITEMID_TERMINATOR * 0x30);
@@ -356,8 +355,8 @@ void allocateHUD(int reallocate) {
         int written_cheat = 0;
         // Write Stuff, normally in switch case
         if (element_def->cheat) {
-            if (cheat_bitfield & element_def->cheat) {
-                *(element->item_count_pointer) = correctRefillCap(i, 0);
+            if (CheatBitfield & element_def->cheat) {
+                *(element_def->counter) = correctRefillCap(i, 0);
                 written_cheat = 1;
             }
         }
diff --git a/base-hack/src/pause/lib.c b/base-hack/src/pause/lib.c
@@ -44,7 +44,7 @@ Gfx* printLevelIGT(Gfx* dl, int x, int y, float scale, char* str) {
             level_index = i;
         }
     }
-    if (Rando.spoiler_hints) {
+    if (Rando.spoiler_hints == 2) {
         unsigned short left = 0;
         unsigned short total = 0;
         getLevelPoints(level_index, &left, &total);
diff --git a/morpher.html b/morpher.html
@@ -44,7 +44,7 @@ <h5>String Transposer</h5>
             <div class="modal-dialog modal-dialog-centered">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h5 class="modal-title">Modal title</h5>
+                        <h5 class="modal-title"></h5>
                         <button id="close_button" type="button" class="btn-close d-none" data-bs-dismiss="modal" aria-label="Close"></button>
                     </div>
                     <div class="modal-body">
diff --git a/randomizer/Patching/ASMPatcher.py b/randomizer/Patching/ASMPatcher.py
@@ -1706,6 +1706,18 @@ def patchAssembly(ROM_COPY, spoiler):
     # Fix Null Lag Boost
     writeHook(ROM_COPY, 0x806CCA90, Overlay.Static, "fixNullLagBoost", offset_dict)
 
+    if settings.win_condition_spawns_ship:
+        writeValue(ROM_COPY, 0x80029706, Overlay.Menu, getHiSym("k_rool_text"), offset_dict)
+        writeValue(ROM_COPY, 0x8002970A, Overlay.Menu, getLoSym("k_rool_text"), offset_dict)
+        writeFloatUpper(ROM_COPY, 0x800296D2, Overlay.Menu, 280, offset_dict)
+        writeFloatUpper(ROM_COPY, 0x800296D6, Overlay.Menu, 192, offset_dict)
+        writeValue(ROM_COPY, 0x8002974E, Overlay.Menu, 0x3ECC, offset_dict)
+        writeValue(ROM_COPY, 0x80029752, Overlay.Menu, 0xCCCD, offset_dict)
+        writeFloat(ROM_COPY, 0x80033CA4, Overlay.Menu, 1, offset_dict)
+    else:
+        writeValue(ROM_COPY, 0x8002975C, Overlay.Menu, 0x02401025, offset_dict, 4)
+        writeValue(ROM_COPY, 0x80029760, Overlay.Menu, 0, offset_dict, 4)
+
     if settings.less_fragile_boulders:
         # Thrown boulders/vases/etc require getting thrown at a wall to destroy
         writeValue(ROM_COPY, 0x8069C1C2, Overlay.Static, 4, offset_dict)  # Contact with wall: Destroy
diff --git a/randomizer/Patching/CosmeticColors.py b/randomizer/Patching/CosmeticColors.py
@@ -685,6 +685,23 @@ def __init__(self, table: int, image: int, tex_format: TextureFormat, width: int
         self.default_count = default_count
 
 
+def writeWinConImage(settings: Settings, image: Image, ROM_COPY: LocalROM):
+    """Wrap function for writing a win con image, detecting K Rool win con."""
+    # if settings.win_condition_spawns_ship:
+    #     base_im = Image.new(mode="RGBA", size=(64, 64))
+    #     left_im = getImageFile(ROM_COPY, TableNames.TexturesGeometry, 0x383, True, 32, 64, TextureFormat.RGBA5551)
+    #     right_im = getImageFile(ROM_COPY, TableNames.TexturesGeometry, 0x384, True, 32, 64, TextureFormat.RGBA5551)
+    #     base_im.paste(left_im, (0, 0), left_im)
+    #     base_im.paste(right_im, (32, 0), right_im)
+    #     base_im = base_im.transpose(Image.FLIP_TOP_BOTTOM)
+    #     base_im = base_im.resize((32, 32))
+    #     base_im.paste(image, (0, 0), image)
+    # else:
+    #     base_im = image
+    base_im = image
+    writeColorImageToROM(base_im, 14, 195, 32, 32, False, TextureFormat.RGBA5551, ROM_COPY)
+
+
 def showWinCondition(settings: Settings, ROM_COPY: LocalROM):
     """Alter the image that's shown on the main menu to display the win condition."""
     win_con = settings.win_condition_item
@@ -710,25 +727,25 @@ def showWinCondition(settings: Settings, ROM_COPY: LocalROM):
             pos_y = 32 * img[2]
             output_image.paste(local_img, (pos_x, pos_y), local_img)
         output_image = output_image.resize((32, 32)).transpose(Image.FLIP_TOP_BOTTOM)
-        writeColorImageToROM(output_image, 14, 195, 32, 32, False, TextureFormat.RGBA5551, ROM_COPY)
+        writeWinConImage(settings, output_image, LocalROM)
     if win_con == WinConditionComplex.get_key8:
         output_image = Image.open(BytesIO(js.getFile("base-hack/assets/displays/key8.png")))
         output_image = output_image.resize((32, 32))
-        writeColorImageToROM(output_image, 14, 195, 32, 32, False, TextureFormat.RGBA5551, ROM_COPY)
+        writeWinConImage(settings, output_image, LocalROM)
         return
     if win_con == WinConditionComplex.req_bean:
         output_image = Image.open(BytesIO(js.getFile("base-hack/assets/arcade_jetpac/arcade/bean.png")))
         output_image = output_image.resize((32, 32))
-        writeColorImageToROM(output_image, 14, 195, 32, 32, False, TextureFormat.RGBA5551, ROM_COPY)
+        writeWinConImage(settings, output_image, LocalROM)
         return
     if win_con == WinConditionComplex.krem_kapture:
         item_im = getImageFile(ROM_COPY, 14, 0x90, True, 32, 32, TextureFormat.RGBA5551)
-        writeColorImageToROM(item_im, 14, 195, 32, 32, False, TextureFormat.RGBA5551, ROM_COPY)
+        writeWinConImage(settings, item_im, ROM_COPY)
         return
     if win_con == WinConditionComplex.dk_rap_items:
         item_im = getImageFile(ROM_COPY, 7, 0x3D3, False, 40, 40, TextureFormat.RGBA5551)
         item_im = item_im.resize((32, 32)).transpose(Image.FLIP_TOP_BOTTOM)
-        writeColorImageToROM(item_im, 14, 195, 32, 32, False, TextureFormat.RGBA5551, ROM_COPY)
+        writeWinConImage(settings, item_im, ROM_COPY)
         return
     if win_con == WinConditionComplex.kill_the_rabbit:
         output_image = Image.open(BytesIO(js.getFile("base-hack/assets/displays/kill_the_rabbit.png")))
@@ -771,4 +788,4 @@ def showWinCondition(settings: Settings, ROM_COPY: LocalROM):
     base_im = base_im.resize((32, 32))
     num_im = numberToImage(settings.win_condition_count, (20, 20), ROM_COPY)
     base_im.paste(num_im, (6, 6), num_im)
-    writeColorImageToROM(base_im, 14, 195, 32, 32, False, TextureFormat.RGBA5551, ROM_COPY)
+    writeWinConImage(settings, base_im, ROM_COPY)
diff --git a/randomizer/Settings.py b/randomizer/Settings.py
@@ -2437,7 +2437,7 @@ def resolve_settings(self):
 
     def isBadIceTrapLocation(self, location: Locations):
         """Determine whether an ice trap is safe to house an ice trap outside of individual cases."""
-        bad_fake_types = [Types.TrainingBarrel, Types.PreGivenMove]
+        bad_fake_types = [Types.TrainingBarrel, Types.PreGivenMove, Types.Hint]
         is_bad = location.type in bad_fake_types
         if self.ice_traps_damage:
             if self.damage_amount in (DamageAmount.quad, DamageAmount.ohko) or self.perma_death or self.wipe_file_on_death:
diff --git a/static/js/rando_options.js b/static/js/rando_options.js
@@ -49,6 +49,28 @@ function getItemCap(item) {
   return null;
 }
 
+function isItemShuffled(item_type, is_dummy = false) {
+  let limit = 5;
+  if (document.getElementById("decouple_item_rando").checked) {
+    limit = 10;
+  }
+  for (let i = 0; i < limit; i++) {
+    if ((i == 0) || (i == 5)) {
+      continue;
+    }
+    if ((i < 5) && (is_dummy) && (limit == 10)) {
+      continue;
+    }
+    const list_items = document.getElementById(`item_rando_list_${i}`).getElementsByTagName("li");
+    for (let j = 0; j < list_items.length; j++) {
+      if (list_items[j].getAttribute("value") == "item_type") {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 // Attach the function as an event listener to the "change" event on the "logic_type" element
 document
   .getElementById("logic_type")
@@ -253,17 +275,7 @@ document
 
 // Enable or disable custom locations for battle arenas
 function plando_disable_arena_custom_locations() {
-  const itemRandoPool = document.getElementById(
-    "item_rando_list_selected"
-  ).options;
-  let crownsShuffled = false;
-
-  for (let option of itemRandoPool) {
-    if (option.value === "crown") {
-      crownsShuffled = option.selected;
-    }
-  }
-
+  let crownsShuffled = isItemShuffled("crown");
   const randomCrowns = document.getElementById("crown_placement_rando").checked;
   const customCrownsElem = document.getElementById("plando_place_arenas");
   let tooltip = "Allows the user to specify locations for each battle arena.";
@@ -289,17 +301,7 @@ document
 
 // Enable or disable custom locations for melon crates
 function plando_disable_crate_custom_locations() {
-  const itemRandoPool = document.getElementById(
-    "item_rando_list_selected"
-  ).options;
-  let cratesShuffled = false;
-
-  for (let option of itemRandoPool) {
-    if (option.value === "crateitem") {
-      cratesShuffled = option.selected;
-    }
-  }
-
+  let cratesShuffled = isItemShuffled("dummyitem_crateitem", true) || isItemShuffled("crateitem");
   const randomCrates = document.getElementById("random_crates").checked;
   const customCratesElem = document.getElementById("plando_place_crates");
   let tooltip = "Allows the user to specify locations for each melon crate.";
@@ -324,17 +326,7 @@ document
   .addEventListener("click", plando_disable_crate_custom_locations);
 
 function plando_disable_fairy_custom_locations() {
-  const itemRandoPool = document.getElementById(
-    "item_rando_list_selected"
-  ).options;
-  let fairiesShuffled = false;
-
-  for (let option of itemRandoPool) {
-    if (option.value === "fairy") {
-      fairiesShuffled = option.selected;
-    }
-  }
-
+  let fairiesShuffled = isItemShuffled("fairy");
   const randomFairies = document.getElementById("random_fairies").checked;
   const customFairiesElem = document.getElementById("plando_place_fairies");
   let tooltip = "Allows the user to specify locations for each banana fairy.";
@@ -360,17 +352,7 @@ document
 
 // Enable or disable custom locations for Kasplats
 function plando_disable_kasplat_custom_locations() {
-  const itemRandoPool = document.getElementById(
-    "item_rando_list_selected"
-  ).options;
-  let kasplatsShuffled = false;
-
-  for (let option of itemRandoPool) {
-    if (option.value === "blueprint") {
-      kasplatsShuffled = option.selected;
-    }
-  }
-
+  let kasplatsShuffled = isItemShuffled("blueprint");
   const kasplatShuffle = document.getElementById("kasplat_rando_setting").value;
   const customKasplatsElem = document.getElementById("plando_place_kasplats");
   let tooltip = "Allows the user to specify locations for each Kasplat.";
diff --git a/static/patches/shrink-dk64.bps b/static/patches/shrink-dk64.bps
diff --git a/static/patches/symbols.json b/static/patches/symbols.json

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,6 @@ void initHUDDirection(placementData* hud_data, int item) {`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`void allocateHUD(int reallocate) {`
`333`		`- int cheat_bitfield = 0; // TODO: Hook this up`
`334`	`333`	`int world = getWorld(CurrentMap, 1);`
`335`	`334`	`if (reallocate) {`
`336`	`335`	`HUD = dk_malloc(ITEMID_TERMINATOR * 0x30);`
`@@ -356,8 +355,8 @@ void allocateHUD(int reallocate) {`
`356`	`355`	`int written_cheat = 0;`
`357`	`356`	`// Write Stuff, normally in switch case`
`358`	`357`	`if (element_def->cheat) {`
`359`		`- if (cheat_bitfield & element_def->cheat) {`
`360`		`- *(element->item_count_pointer) = correctRefillCap(i, 0);`
	`358`	`+ if (CheatBitfield & element_def->cheat) {`
	`359`	`+ *(element_def->counter) = correctRefillCap(i, 0);`
`361`	`360`	`written_cheat = 1;`
`362`	`361`	`}`
`363`	`362`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ Gfx* printLevelIGT(Gfx* dl, int x, int y, float scale, char* str) {`
`44`	`44`	`level_index = i;`
`45`	`45`	`}`
`46`	`46`	`}`
`47`		`- if (Rando.spoiler_hints) {`
	`47`	`+ if (Rando.spoiler_hints == 2) {`
`48`	`48`	`unsigned short left = 0;`
`49`	`49`	`unsigned short total = 0;`
`50`	`50`	`getLevelPoints(level_index, &left, &total);`