From 7600628f28ec2c94fa376aebfe9799dda925fb5a Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 17 Dec 2025 06:00:37 +0900
Subject: [PATCH 01/15] add disable_spikesuit option to maprando logic

includes the patch / updated vanilla bugfixes patch (the message box has a jump exception to NOT kill samus if the dialog box is for spikesuit disabled message)
---
 patches/ips/remove_spikesuits.ips             | Bin 0 -> 57 bytes
 patches/ips/vanilla_bugfixes.ips              | Bin 1662 -> 1929 bytes
 patches/rom_map/Bank 80.txt                   |   2 +-
 patches/rom_map/Bank 85.txt                   |   2 +-
 patches/src/remove_spikesuits.asm             |  30 +++++++++++++++++
 patches/src/vanilla_bugfixes.asm              |  31 +++++++++++-------
 .../Community Race Season 4.json              |   1 +
 rust/data/presets/full-settings/Default.json  |   1 +
 ...nter Tournament - 4 Random Objectives.json |   1 +
 .../Winter Tournament - Double Suit.json      |   1 +
 .../Winter Tournament - Gravity 9 + 1.json    |   1 +
 ...inter Tournament - Metroid Objectives.json |   1 +
 .../Winter Tournament - No Objectives.json    |   1 +
 .../Winter Tournament - Varia + Movement.json |   1 +
 .../templates/generate/game_variations.html   |  13 ++++++++
 .../help/variations/disable_spikesuits.html   |  22 +++++++++++++
 .../templates/generate/scripts.html           |   1 +
 rust/maprando/src/patch.rs                    |   4 +++
 rust/maprando/tests/logic_scenarios.rs        |   1 +
 rust/maprando/tests/presets/v119-Default.json |   1 +
 20 files changed, 102 insertions(+), 13 deletions(-)
 create mode 100644 patches/ips/remove_spikesuits.ips
 create mode 100644 patches/src/remove_spikesuits.asm
 create mode 100644 rust/maprando-web/templates/generate/help/variations/disable_spikesuits.html

diff --git a/patches/ips/remove_spikesuits.ips b/patches/ips/remove_spikesuits.ips
new file mode 100644
index 0000000000000000000000000000000000000000..a11f38facd9c95a2ae43a2689a0567b44444b143
GIT binary patch
literal 57
zcmV-90LK4NK~zIX0Aa8IA+5{`&=Rd^3h)i70050>3aLc^A^@<3sR96vG76mR4QmKg
PyZ{Cwu;GB}>P1gRFVGZ(

literal 0
HcmV?d00001

diff --git a/patches/ips/vanilla_bugfixes.ips b/patches/ips/vanilla_bugfixes.ips
index 21a421e9c2a32e98f98160558940a815220aef0d..50bfbfd8c71146f76597032bb48bf420c02dc05b 100644
GIT binary patch
delta 167
zcmeyz)5*VqiBUdi15?ve24;m+ApH(V7jIx{;Q`WZ8<;jQu<n|y$Y{xW(v{(Z@Z=~)
zCC1;AYZ(<Serv8uSSv4c(t%+EW5P;Ch6Ph}5{@=UHSO8}CO3k~O<-~}nB2ku1iQ8_
zzQD*bS%Aq$^^(qcofA5zbdKoo>s->g0%TtXvJM03OF9R14(gl+${gP8$ZE?70AN)?
A;s5{u

delta 140
zcmeC=|Hrd|iBaBn15?ve24;l>ApH(V=WSqW;Q`W(8<;jQu&ke~$Y?n^o>3{}o2HL{
z(^`3%lMW0U7!xdBIxr-pnyi8gbV+1>(_EDR=dWaBSkS4HaI`t9Y5fK;xe-im0+X8=
RfMETW#kUz*Cf{aT2LMy3HC6xs

diff --git a/patches/rom_map/Bank 80.txt b/patches/rom_map/Bank 80.txt
index 830a074d72..bdc76daf49 100644
--- a/patches/rom_map/Bank 80.txt	
+++ b/patches/rom_map/Bank 80.txt	
@@ -12,7 +12,7 @@ DA00 - DD00: msu1.asm
 DD00 - E100: Palette pointer table for Mosaic
 E100 - E180: area_palette.asm
 E180 - E1B0: fix_horiz_doors.asm
-E1B0 - E2A0: [FREE]
+E1B0 - E2A0: remove_spikesuits.asm
 E2A0 - E3C0: decompression.asm
 E3C0 - E440: disable_etanks.asm
 E440 - E540: load_plms_early.asm
diff --git a/patches/rom_map/Bank 85.txt b/patches/rom_map/Bank 85.txt
index 62deded811..da43322e7a 100644
--- a/patches/rom_map/Bank 85.txt	
+++ b/patches/rom_map/Bank 85.txt	
@@ -18,4 +18,4 @@ $AB00 - $ACA0: map_area.asm
 $ACA0 - $AD00: load_flash_suit
 $AD00 - $AFD0: map_area.asm
 $AFD0 - $B000: [FREE]
-$B000 - $B4B0: vanilla_bugfixes.asm
+$B000 - $D4B0: vanilla_bugfixes.asm
diff --git a/patches/src/remove_spikesuits.asm b/patches/src/remove_spikesuits.asm
new file mode 100644
index 0000000000..e00c0eb793
--- /dev/null
+++ b/patches/src/remove_spikesuits.asm
@@ -0,0 +1,30 @@
+; Removes a spikesuit state from samus 
+
+arch snes.cpu
+lorom
+
+!any_bank_free_space_start = $80E1B0
+!any_bank_free_space_end = $80E2A0
+
+org $90D4BC ; hook end of shinespark crash
+    jsl check_ss
+	nop
+	nop
+
+org !any_bank_free_space_start
+check_ss:
+	LDA $0ACC  		; Samus palette type normal? [regular shinecharge]
+	BNE .skip
+	LDA $0A68  		; special timer non zero? [can spark]
+	BEQ .skip
+	LDA #$0000
+	STA $0A68 		; goodbye spikesuit
+	LDA #$0045		; msg ID
+	JSL $85B000 
+	.skip:
+	LDA #$0002
+	STA $0A32
+	STZ $0DEC
+	RTL
+	
+assert pc() <= !any_bank_free_space_end
diff --git a/patches/src/vanilla_bugfixes.asm b/patches/src/vanilla_bugfixes.asm
index 530f2e25df..0a940d6bba 100644
--- a/patches/src/vanilla_bugfixes.asm
+++ b/patches/src/vanilla_bugfixes.asm
@@ -79,7 +79,7 @@ check_empty:
 .end:
 	rts
 
-warnpc $a0f830
+assert pc() <= $a0f830
 
 ;;; Fixes for the extra save stations in area rando/random start :
 
@@ -123,7 +123,7 @@ save_station_check:
 	jmp search_loop_found
 
 ;;; end of unused space
-warnpc $8485b2
+assert pc() <= $8485b2
 
 
 ; Use door direction ($0791) to check in Big Boy room if we are coming in from the left vs. right.
@@ -181,7 +181,7 @@ fix_camera_alignment:
 	LDA $B1 : SEC
 	RTS
 
-warnpc !bank_80_free_space_end
+assert pc() <= !bank_80_free_space_end
 
 
 ; skip loading special x-ray blocks (only used in BT room during escape, and we repurpose the space for other things)
@@ -209,7 +209,7 @@ check_item_plm:
 	clc
 	rts
 
-warnpc $848398
+assert pc() <= $848398
 org $848398
 special_xray_end:
 
@@ -239,7 +239,7 @@ pause_func:
     stz $9d6                      ; clear reserve health
     rts
 
-warnpc !bank_82_free_space_end
+assert pc() <= !bank_82_free_space_end
 
 ; Fix for powamp projectile bug
 ;
@@ -268,7 +268,7 @@ powamp_fix:
     sta $1a4b,y             ; replaced code
     rts
 
-warnpc !bank_86_free_space_end
+assert pc() <= !bank_86_free_space_end
 
 ; Fix improper clearing of BG2
 ; Noted by PJBoy: https://patrickjohnston.org/bank/80#fA23F
@@ -299,7 +299,7 @@ yapping_maw_crash:
 .skip
     jmp ($d37d,x)           ; valid entry
     
-warnPC !bank_90_free_space_end
+assert pc() <= !bank_90_free_space_end
 
 ;;; Spring ball menu crash fix by strotlog.
 ;;; Fix obscure vanilla bug where: turning off spring ball while bouncing, can crash in $91:EA07,
@@ -314,7 +314,7 @@ org $91f1fc
     jsl spring_ball_crash
 
 !bank_85_free_space_start = $85b000 ; do not change, first jmp used externally
-!bank_85_free_space_end = $85b4b0
+!bank_85_free_space_end = $85d4b0
 
 org !bank_85_free_space_start
     jmp bug_dialog          ; for external calls, do not move
@@ -352,7 +352,8 @@ bug_dialog:                 ; A = msg ID
 
     pla                     ; dlg box parameter
     jsl $858080             ; dlg box
-
+    cmp #$0045              ; spikesuit disabled msg 
+    beq .nokillmsg          ; we don't want to kill samus for spikesuiting so skip the death sequence
     lda #$8000              ; init death sequence (copied from $82db80)
     sta $a78
     lda #$0011
@@ -360,6 +361,7 @@ bug_dialog:                 ; A = msg ID
     
     lda #$0013              ; set gamestate
     sta $998
+    .nokillmsg
     rtl
     
 hook_message_box:
@@ -416,6 +418,7 @@ new_message_boxes:
     dw $83c5, $825a, springball_msg     ; 0x42
     dw $83c5, $825a, yapping_maw_msg    ; 0x43
     dw $83c5, $825a, oob_msg            ; 0x44
+    dw $83c5, $825a, ss_msg             ; 0x45
     dw $0000, $0000, msg_end
 
 table "tables/dialog_chars.tbl",RTL
@@ -443,10 +446,16 @@ oob_msg:
     dw $000e,$000e,$000e, "   SAMUS OUT-OF-BOUNDS!   ", $000e,$000e,$000e
     dw $000e,$000e,$000e, "                          ", $000e,$000e,$000e
     dw $000e,$000e,$000e, "                          ", $000e,$000e,$000e
+
+ss_msg:
+    dw $000e,$000e,$000e, "                          ", $000e,$000e,$000e
+    dw $000e,$000e,$000e, "   SPIKE SUIT DISABLED!   ", $000e,$000e,$000e
+    dw $000e,$000e,$000e, "                          ", $000e,$000e,$000e
+    dw $000e,$000e,$000e, "                          ", $000e,$000e,$000e
     
 msg_end:
 
-warnPC !bank_85_free_space_end
+assert pc() <= !bank_85_free_space_end
 
 org $858093
     jsr hook_message_box
@@ -483,7 +492,7 @@ check_unpause:
     lda #$0008              ; replaced code
     jmp $93be
 
-warnPC !bank_82_free_space2_end
+assert pc() <= !bank_82_free_space2_end
 
 ; Map scrolling bug
 ; Leftmost edge function @ $829f4a has an off-by-one bug when scanning
diff --git a/rust/data/presets/full-settings/Community Race Season 4.json b/rust/data/presets/full-settings/Community Race Season 4.json
index a1189bb38b..8462c7b7e6 100644
--- a/rust/data/presets/full-settings/Community Race Season 4.json	
+++ b/rust/data/presets/full-settings/Community Race Season 4.json	
@@ -4513,6 +4513,7 @@
         "door_locks_size": "Large",
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
+        "disable_spikesuits": false,
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Default.json b/rust/data/presets/full-settings/Default.json
index 5498ce53ab..88a1e064fc 100644
--- a/rust/data/presets/full-settings/Default.json
+++ b/rust/data/presets/full-settings/Default.json
@@ -4514,6 +4514,7 @@
         "door_locks_size": "Large",
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
+        "disable_spikesuits": false,
         "ultra_low_qol": false,
         "race_mode": false,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json b/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json
index 8e49963c2b..44261ef295 100644
--- a/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json	
@@ -4586,6 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
+        "disable_spikesuits": false,
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Double Suit.json b/rust/data/presets/full-settings/Winter Tournament - Double Suit.json
index 4e2fb929db..23d129ca1c 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Double Suit.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Double Suit.json	
@@ -4586,6 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
+        "disable_spikesuits": false,
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json b/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json
index 7605ec9abc..117c67a728 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json	
@@ -4586,6 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
+        "disable_spikesuits": false,
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json b/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json
index 8d4b60c9ea..ef3daa2353 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json	
@@ -4586,6 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
+        "disable_spikesuits": false,
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - No Objectives.json b/rust/data/presets/full-settings/Winter Tournament - No Objectives.json
index 928ce79f4e..92939df5aa 100644
--- a/rust/data/presets/full-settings/Winter Tournament - No Objectives.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - No Objectives.json	
@@ -4586,6 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
+        "disable_spikesuits": false,
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json b/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json
index f121d8bd81..4d06d883a4 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json	
@@ -4586,6 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
+        "disable_spikesuits": false,
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/maprando-web/templates/generate/game_variations.html b/rust/maprando-web/templates/generate/game_variations.html
index 800b5d26d4..ec521f3093 100644
--- a/rust/maprando-web/templates/generate/game_variations.html
+++ b/rust/maprando-web/templates/generate/game_variations.html
@@ -63,6 +63,19 @@
         <label class="btn btn-outline-primary" for="energyFreeShinesparksYes">Yes</label>
     </div>
 </div>
+<div class="form-group row">
+    <div class="col-lg-4 col-md-6 my-2">
+        {% include "help/variations/disable_spikesuits.html" %}
+        <label for="disable_spikesuits">Disable spikesuits</label>
+    </div>
+    <div id="disablespikesuits" class="col-2 btn-group my-2" role="group">
+        <input type="radio" class="btn-check" name="disable_spikesuits" id="disablespikesuitsNo" value="false"
+            checked>
+        <label class="btn btn-outline-primary" for="disablespikesuitsNo">No</label>
+        <input type="radio" class="btn-check" name="disable_spikesuits" id="disablespikesuitsYes" value="true">
+        <label class="btn btn-outline-primary" for="disablespikesuitsYes">Yes</label>
+    </div>
+</div>
 <div class="form-group row">
     <div class="col-lg-4 col-md-6 my-2">
         {% include "help/variations/ultra_low_qol.html" %}
diff --git a/rust/maprando-web/templates/generate/help/variations/disable_spikesuits.html b/rust/maprando-web/templates/generate/help/variations/disable_spikesuits.html
new file mode 100644
index 0000000000..857d954732
--- /dev/null
+++ b/rust/maprando-web/templates/generate/help/variations/disable_spikesuits.html
@@ -0,0 +1,22 @@
+<!-- Button trigger modal -->
+<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#disableSpikesuitsModal">
+  <i class="bi bi-question-circle"></i>
+</button>
+<!-- Modal -->
+<div class="modal" id="disableSpikesuitsModal" tabindex="-1">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h1 class="modal-title fs-5">Disable spikesuits</h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <p>If enabled, Samus will not be able to gain a flashsuit from a glitched shinespark.</p>
+        <p>This setting will disable certain parts of flashsuit logic. A flash suit may still be gained via CF-Interupt but spikesuit, slopespark and R-Mode knockback spark will not generate a flash suit.</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/rust/maprando-web/templates/generate/scripts.html b/rust/maprando-web/templates/generate/scripts.html
index f87f73e2e6..fbddb7e9f1 100644
--- a/rust/maprando-web/templates/generate/scripts.html
+++ b/rust/maprando-web/templates/generate/scripts.html
@@ -291,6 +291,7 @@
             "maps_revealed": formData.get("maps_revealed"),
             "map_station_reveal": formData.get("map_station_reveal"),
             "energy_free_shinesparks": formData.get("energy_free_shinesparks") == "true",
+            "disable_spikesuits": formData.get("disable_spikesuits") == "true",
             "ultra_low_qol": formData.get("ultra_low_qol") == "true",
             "race_mode": formData.get("race_mode") == "true",
             "random_seed": tryParseInt(formData.get("random_seed")),
diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index 69f414e280..fecaa4ddce 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -578,6 +578,10 @@ impl Patcher<'_> {
         if self.settings.other_settings.energy_free_shinesparks {
             patches.push("energy_free_shinesparks");
         }
+        
+        if self.settings.other_settings.disable_spikesuits {
+            patches.push("remove_spikesuits");
+        }
 
         if self.settings.quality_of_life_settings.respin {
             patches.push("respin");
diff --git a/rust/maprando/tests/logic_scenarios.rs b/rust/maprando/tests/logic_scenarios.rs
index 9be955cc2b..82f17f3120 100644
--- a/rust/maprando/tests/logic_scenarios.rs
+++ b/rust/maprando/tests/logic_scenarios.rs
@@ -250,6 +250,7 @@ fn get_settings(scenario: &Scenario) -> Result<RandomizerSettings> {
             door_locks_size: maprando::settings::DoorLocksSize::Large,
             map_station_reveal: maprando::settings::MapStationReveal::Full,
             energy_free_shinesparks: false,
+            disable_spikesuits: false,
             ultra_low_qol: false,
             race_mode: false,
             random_seed: None,
diff --git a/rust/maprando/tests/presets/v119-Default.json b/rust/maprando/tests/presets/v119-Default.json
index 2854762dfd..ee64877ca2 100644
--- a/rust/maprando/tests/presets/v119-Default.json
+++ b/rust/maprando/tests/presets/v119-Default.json
@@ -4346,6 +4346,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
+        "disable_spikesuits": false,
         "ultra_low_qol": false,
         "race_mode": false,
         "random_seed": null

From d9adfc7b4513bc130f273cde2c4a982419d300a3 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 17 Dec 2025 06:07:08 +0900
Subject: [PATCH 02/15] Update download_data.sh

convert lineendings from crlf (windows) to lf (unix)
---
 scripts/download_data.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/download_data.sh b/scripts/download_data.sh
index 28b12c5a30..9636b16278 100644
--- a/scripts/download_data.sh
+++ b/scripts/download_data.sh
@@ -3,7 +3,6 @@ set -e
 
 mkdir -p tmp
 cd tmp
-
 # Download the map pools
 mkdir -p ../maps
 for pool in "v119-small-avro" "v119-standard-avro" "v119-wild-avro"

From 71be9e3743d981e6e0f24283089cad4eddb7b461 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 17 Dec 2025 06:13:14 +0900
Subject: [PATCH 03/15] Update settings.rs

---
 rust/maprando/src/settings.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rust/maprando/src/settings.rs b/rust/maprando/src/settings.rs
index f422215284..01dc427fa0 100644
--- a/rust/maprando/src/settings.rs
+++ b/rust/maprando/src/settings.rs
@@ -347,6 +347,7 @@ pub struct OtherSettings {
     pub door_locks_size: DoorLocksSize,
     pub map_station_reveal: MapStationReveal,
     pub energy_free_shinesparks: bool,
+    pub disable_spikesuits: bool,
     pub ultra_low_qol: bool,
     pub race_mode: bool,
     pub random_seed: Option<usize>,

From 830c9ddab5ed2f015bb2009fb3c00e1775af70c9 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 18 Dec 2025 19:40:33 +0900
Subject: [PATCH 04/15] update remove_spikesuits

change disable to remove and edit helper description
---
 .../full-settings/Community Race Season 4.json     |  2 +-
 rust/data/presets/full-settings/Default.json       |  2 +-
 .../Winter Tournament - 4 Random Objectives.json   |  2 +-
 .../Winter Tournament - Double Suit.json           |  2 +-
 .../Winter Tournament - Gravity 9 + 1.json         |  2 +-
 .../Winter Tournament - Metroid Objectives.json    |  2 +-
 .../Winter Tournament - No Objectives.json         |  2 +-
 .../Winter Tournament - Varia + Movement.json      |  2 +-
 rust/maprando-game/src/lib.rs                      |  3 +++
 .../templates/generate/game_variations.html        | 14 +++++++-------
 ...able_spikesuits.html => remove_spikesuits.html} |  7 ++++---
 rust/maprando-web/templates/generate/scripts.html  |  2 +-
 rust/maprando/src/patch.rs                         | 13 ++++++++-----
 rust/maprando/src/randomize.rs                     | 13 +++++++++----
 rust/maprando/src/settings.rs                      |  8 +++++++-
 rust/maprando/tests/logic_scenarios.rs             |  2 +-
 rust/maprando/tests/presets/v119-Default.json      |  2 +-
 17 files changed, 49 insertions(+), 31 deletions(-)
 rename rust/maprando-web/templates/generate/help/variations/{disable_spikesuits.html => remove_spikesuits.html} (59%)

diff --git a/rust/data/presets/full-settings/Community Race Season 4.json b/rust/data/presets/full-settings/Community Race Season 4.json
index 8462c7b7e6..3984c33cbf 100644
--- a/rust/data/presets/full-settings/Community Race Season 4.json	
+++ b/rust/data/presets/full-settings/Community Race Season 4.json	
@@ -4513,7 +4513,7 @@
         "door_locks_size": "Large",
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
-        "disable_spikesuits": false,
+        "remove_spikesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Default.json b/rust/data/presets/full-settings/Default.json
index 88a1e064fc..efc1315566 100644
--- a/rust/data/presets/full-settings/Default.json
+++ b/rust/data/presets/full-settings/Default.json
@@ -4514,7 +4514,7 @@
         "door_locks_size": "Large",
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
-        "disable_spikesuits": false,
+        "remove_spikesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": false,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json b/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json
index 44261ef295..7fe0cf2204 100644
--- a/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json	
@@ -4586,7 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
-        "disable_spikesuits": false,
+        "remove_spikesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Double Suit.json b/rust/data/presets/full-settings/Winter Tournament - Double Suit.json
index 23d129ca1c..7449f51a4b 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Double Suit.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Double Suit.json	
@@ -4586,7 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
-        "disable_spikesuits": false,
+        "remove_spikesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json b/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json
index 117c67a728..c2b472c5ae 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json	
@@ -4586,7 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
-        "disable_spikesuits": false,
+        "remove_spikesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json b/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json
index ef3daa2353..da09da405b 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json	
@@ -4586,7 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
-        "disable_spikesuits": false,
+        "remove_spikesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - No Objectives.json b/rust/data/presets/full-settings/Winter Tournament - No Objectives.json
index 92939df5aa..7b15ab7f04 100644
--- a/rust/data/presets/full-settings/Winter Tournament - No Objectives.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - No Objectives.json	
@@ -4586,7 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
-        "disable_spikesuits": false,
+        "remove_spikesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json b/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json
index 4d06d883a4..75ee2e5a67 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json	
@@ -4586,7 +4586,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
-        "disable_spikesuits": false,
+        "remove_spikesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/maprando-game/src/lib.rs b/rust/maprando-game/src/lib.rs
index 4223bbf42f..14b0e7e977 100644
--- a/rust/maprando-game/src/lib.rs
+++ b/rust/maprando-game/src/lib.rs
@@ -70,6 +70,9 @@ pub const TECH_ID_CAN_ELEVATOR_CRYSTAL_FLASH: TechId = 178;
 pub const TECH_ID_CAN_CARRY_FLASH_SUIT: TechId = 207;
 pub const TECH_ID_CAN_TRICKY_CARRY_FLASH_SUIT: TechId = 142;
 pub const TECH_ID_CAN_HYPER_GATE_SHOT: TechId = 10001;
+pub const TECH_ID_CAN_SPIKE_SUIT: TechId = 141;
+pub const TECH_ID_CAN_SLOPE_SPARK: TechId = 210;
+pub const TECH_ID_CAN_RMODE_KNOCKBACK_SPARK: TechId = 213;
 
 #[allow(clippy::type_complexity)]
 #[derive(Deserialize, Serialize, Clone, Debug)]
diff --git a/rust/maprando-web/templates/generate/game_variations.html b/rust/maprando-web/templates/generate/game_variations.html
index ec521f3093..0ca3dda7e6 100644
--- a/rust/maprando-web/templates/generate/game_variations.html
+++ b/rust/maprando-web/templates/generate/game_variations.html
@@ -65,15 +65,15 @@
 </div>
 <div class="form-group row">
     <div class="col-lg-4 col-md-6 my-2">
-        {% include "help/variations/disable_spikesuits.html" %}
-        <label for="disable_spikesuits">Disable spikesuits</label>
+        {% include "help/variations/remove_spikesuits.html" %}
+        <label for="remove_spikesuits">Remove Spikesuits</label>
     </div>
-    <div id="disablespikesuits" class="col-2 btn-group my-2" role="group">
-        <input type="radio" class="btn-check" name="disable_spikesuits" id="disablespikesuitsNo" value="false"
+    <div id="removespikesuits" class="col-2 btn-group my-2" role="group">
+        <input type="radio" class="btn-check" name="remove_spikesuits" id="removespikesuitsNo" value="Disabled"
             checked>
-        <label class="btn btn-outline-primary" for="disablespikesuitsNo">No</label>
-        <input type="radio" class="btn-check" name="disable_spikesuits" id="disablespikesuitsYes" value="true">
-        <label class="btn btn-outline-primary" for="disablespikesuitsYes">Yes</label>
+        <label class="btn btn-outline-primary" for="removespikesuitsNo">No</label>
+        <input type="radio" class="btn-check" name="remove_spikesuits" id="removespikesuitsYes" value="Enabled">
+        <label class="btn btn-outline-primary" for="removespikesuitsYes">Yes</label>
     </div>
 </div>
 <div class="form-group row">
diff --git a/rust/maprando-web/templates/generate/help/variations/disable_spikesuits.html b/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
similarity index 59%
rename from rust/maprando-web/templates/generate/help/variations/disable_spikesuits.html
rename to rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
index 857d954732..eabe1f3889 100644
--- a/rust/maprando-web/templates/generate/help/variations/disable_spikesuits.html
+++ b/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
@@ -7,12 +7,13 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
-        <h1 class="modal-title fs-5">Disable spikesuits</h1>
+        <h1 class="modal-title fs-5">Remove spikesuit ability</h1>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
-        <p>If enabled, Samus will not be able to gain a flashsuit from a glitched shinespark.</p>
-        <p>This setting will disable certain parts of flashsuit logic. A flash suit may still be gained via CF-Interupt but spikesuit, slopespark and R-Mode knockback spark will not generate a flash suit.</p>
+        <p>If enabled, the game will be modified so Samus cannot gain a flashsuit from a glitched shinespark.</p>
+        <p>This setting will also disable certain parts of flashsuit logic if they would be in logic based on selected difficulty (Spikesuit / Slopespark / R-Mode knockback Spark).
+           A flash suit may still be gained via Elevator CF or R-Mode CF Interrupt, even if disabled in logic.</p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
diff --git a/rust/maprando-web/templates/generate/scripts.html b/rust/maprando-web/templates/generate/scripts.html
index fbddb7e9f1..fe7f1ce042 100644
--- a/rust/maprando-web/templates/generate/scripts.html
+++ b/rust/maprando-web/templates/generate/scripts.html
@@ -291,7 +291,7 @@
             "maps_revealed": formData.get("maps_revealed"),
             "map_station_reveal": formData.get("map_station_reveal"),
             "energy_free_shinesparks": formData.get("energy_free_shinesparks") == "true",
-            "disable_spikesuits": formData.get("disable_spikesuits") == "true",
+            "remove_spikesuits": formData.get("remove_spikesuits"),
             "ultra_low_qol": formData.get("ultra_low_qol") == "true",
             "race_mode": formData.get("race_mode") == "true",
             "random_seed": tryParseInt(formData.get("random_seed")),
diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index fecaa4ddce..8961f2bf9f 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -19,7 +19,7 @@ use crate::{
     randomize::{LockedDoor, Randomization},
     settings::{
         AreaAssignment, ETankRefill, Fanfares, ItemCount, MotherBrainFight, Objective,
-        ObjectiveScreen, RandomizerSettings, SaveAnimals, StartLocationMode, WallJump,
+        ObjectiveScreen, RandomizerSettings, SaveAnimals, StartLocationMode, WallJump, SpikeSuits,
     },
 };
 use anyhow::{Context, Result, bail, ensure};
@@ -555,6 +555,13 @@ impl Patcher<'_> {
             }
         }
 
+        match self.settings.other_settings.remove_spikesuits{
+            SpikeSuits::Disabled => {}
+            SpikeSuits::Enabled => {
+                patches.push("remove_spikesuits");
+            }
+        }
+
         if self
             .settings
             .quality_of_life_settings
@@ -578,10 +585,6 @@ impl Patcher<'_> {
         if self.settings.other_settings.energy_free_shinesparks {
             patches.push("energy_free_shinesparks");
         }
-        
-        if self.settings.other_settings.disable_spikesuits {
-            patches.push("remove_spikesuits");
-        }
 
         if self.settings.quality_of_life_settings.respin {
             patches.push("respin");
diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index ec9ff29b2b..7ad7b58bf3 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -7,7 +7,7 @@ use crate::patch::map_tiles::get_objective_tiles;
 use crate::settings::{
     DoorsMode, FillerItemPriority, ItemPlacementStyle, ItemPriorityStrength, KeyItemPriority,
     MotherBrainFight, Objective, ObjectiveSetting, ProgressionRate, RandomizerSettings,
-    SaveAnimals, SkillAssumptionSettings, StartLocationMode, WallJump,
+    SaveAnimals, SkillAssumptionSettings, StartLocationMode, WallJump, SpikeSuits,
 };
 use crate::spoiler_log::{
     SpoilerLocalState, SpoilerLog, SpoilerRoomLoc, SpoilerRouteEntry, SpoilerStartLocation,
@@ -36,8 +36,8 @@ use maprando_game::{
     TECH_ID_CAN_SIDE_PLATFORM_CROSS_ROOM_JUMP, TECH_ID_CAN_SPEEDBALL,
     TECH_ID_CAN_SPRING_BALL_BOUNCE, TECH_ID_CAN_STATIONARY_SPIN_JUMP,
     TECH_ID_CAN_STUTTER_WATER_SHINECHARGE, TECH_ID_CAN_SUPER_SINK, TECH_ID_CAN_TEMPORARY_BLUE,
-    TECH_ID_CAN_TRICKY_CARRY_FLASH_SUIT, TechId, TemporaryBlueDirection, TraversalId, VertexId,
-    VertexKey,
+    TECH_ID_CAN_TRICKY_CARRY_FLASH_SUIT, TECH_ID_CAN_SPIKE_SUIT, TECH_ID_CAN_SLOPE_SPARK, 
+    TECH_ID_CAN_RMODE_KNOCKBACK_SPARK, TechId, TemporaryBlueDirection, TraversalId, VertexId, VertexKey,
 };
 use maprando_logic::{GlobalState, Inventory, LocalState};
 use rand::SeedableRng;
@@ -97,13 +97,18 @@ impl DifficultyConfig {
     ) -> Self {
         let mut tech: Vec<bool> = vec![false; game_data.tech_isv.keys.len()];
         let mut notables: Vec<bool> = vec![false; game_data.notable_isv.keys.len()];
+        
+        //nn_357 - spikesuits removed option set to enabled.
+        if settings.other_settings.remove_spikesuits == SpikeSuits::Enabled {
+           let excluded_techs = [TECH_ID_CAN_SPIKE_SUIT, TECH_ID_CAN_SLOPE_SPARK, TECH_ID_CAN_RMODE_KNOCKBACK_SPARK];
+        }
 
         for &tech_id in implicit_tech {
             let tech_idx = game_data.tech_isv.index_by_key[&tech_id];
             tech[tech_idx] = true;
         }
         for tech_setting in &skill.tech_settings {
-            if tech_setting.enabled {
+            if tech_setting.enabled && !excluded_techs.contains(&tech_setting.id.as_str()) {
                 let tech_idx = game_data.tech_isv.index_by_key[&tech_setting.id];
                 tech[tech_idx] = true;
             }
diff --git a/rust/maprando/src/settings.rs b/rust/maprando/src/settings.rs
index 01dc427fa0..f9faf4ccf2 100644
--- a/rust/maprando/src/settings.rs
+++ b/rust/maprando/src/settings.rs
@@ -347,7 +347,7 @@ pub struct OtherSettings {
     pub door_locks_size: DoorLocksSize,
     pub map_station_reveal: MapStationReveal,
     pub energy_free_shinesparks: bool,
-    pub disable_spikesuits: bool,
+    pub remove_spikesuits: SpikeSuits,
     pub ultra_low_qol: bool,
     pub race_mode: bool,
     pub random_seed: Option<usize>,
@@ -452,6 +452,12 @@ pub enum WallJump {
     Collectible,
 }
 
+#[derive(Clone, Copy, Serialize, Deserialize, Debug, PartialEq)]
+pub enum SpikeSuits {
+    Disabled,
+    Enabled,
+}
+
 #[derive(Clone, Copy, Serialize, Deserialize, Debug, PartialEq)]
 pub enum ETankRefill {
     Disabled,
diff --git a/rust/maprando/tests/logic_scenarios.rs b/rust/maprando/tests/logic_scenarios.rs
index 82f17f3120..e0f1c2d327 100644
--- a/rust/maprando/tests/logic_scenarios.rs
+++ b/rust/maprando/tests/logic_scenarios.rs
@@ -250,7 +250,7 @@ fn get_settings(scenario: &Scenario) -> Result<RandomizerSettings> {
             door_locks_size: maprando::settings::DoorLocksSize::Large,
             map_station_reveal: maprando::settings::MapStationReveal::Full,
             energy_free_shinesparks: false,
-            disable_spikesuits: false,
+            remove_spikesuits: maprando::settings::SpikeSuits::Disabled,
             ultra_low_qol: false,
             race_mode: false,
             random_seed: None,
diff --git a/rust/maprando/tests/presets/v119-Default.json b/rust/maprando/tests/presets/v119-Default.json
index ee64877ca2..66a1111f91 100644
--- a/rust/maprando/tests/presets/v119-Default.json
+++ b/rust/maprando/tests/presets/v119-Default.json
@@ -4346,7 +4346,7 @@
         "maps_revealed": null,
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
-        "disable_spikesuits": false,
+        "remove_spikesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": false,
         "random_seed": null

From 1ada575b498dc7d4cf47a6cd6d6cafc749cbd411 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 18 Dec 2025 19:44:44 +0900
Subject: [PATCH 05/15] Update lib.rs

---
 rust/maprando-game/src/lib.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rust/maprando-game/src/lib.rs b/rust/maprando-game/src/lib.rs
index 14b0e7e977..8eb2f4f6da 100644
--- a/rust/maprando-game/src/lib.rs
+++ b/rust/maprando-game/src/lib.rs
@@ -70,7 +70,6 @@ pub const TECH_ID_CAN_ELEVATOR_CRYSTAL_FLASH: TechId = 178;
 pub const TECH_ID_CAN_CARRY_FLASH_SUIT: TechId = 207;
 pub const TECH_ID_CAN_TRICKY_CARRY_FLASH_SUIT: TechId = 142;
 pub const TECH_ID_CAN_HYPER_GATE_SHOT: TechId = 10001;
-pub const TECH_ID_CAN_SPIKE_SUIT: TechId = 141;
 pub const TECH_ID_CAN_SLOPE_SPARK: TechId = 210;
 pub const TECH_ID_CAN_RMODE_KNOCKBACK_SPARK: TechId = 213;
 

From a278231e1806f1a4cabc11efd96b5c423a246f99 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 18 Dec 2025 20:15:52 +0900
Subject: [PATCH 06/15] Update randomize.rs

---
 rust/maprando/src/randomize.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index 7ad7b58bf3..8fdaf68d32 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -98,17 +98,12 @@ impl DifficultyConfig {
         let mut tech: Vec<bool> = vec![false; game_data.tech_isv.keys.len()];
         let mut notables: Vec<bool> = vec![false; game_data.notable_isv.keys.len()];
         
-        //nn_357 - spikesuits removed option set to enabled.
-        if settings.other_settings.remove_spikesuits == SpikeSuits::Enabled {
-           let excluded_techs = [TECH_ID_CAN_SPIKE_SUIT, TECH_ID_CAN_SLOPE_SPARK, TECH_ID_CAN_RMODE_KNOCKBACK_SPARK];
-        }
-
         for &tech_id in implicit_tech {
             let tech_idx = game_data.tech_isv.index_by_key[&tech_id];
             tech[tech_idx] = true;
         }
         for tech_setting in &skill.tech_settings {
-            if tech_setting.enabled && !excluded_techs.contains(&tech_setting.id.as_str()) {
+            if tech_setting.enabled {
                 let tech_idx = game_data.tech_isv.index_by_key[&tech_setting.id];
                 tech[tech_idx] = true;
             }

From f1e60c24d1cb19e908964fe17f2b5b6f95aabe2a Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 18 Dec 2025 20:49:49 +0900
Subject: [PATCH 07/15] Update randomize.rs

---
 rust/maprando/src/randomize.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index 8fdaf68d32..a8109682bd 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -7,7 +7,7 @@ use crate::patch::map_tiles::get_objective_tiles;
 use crate::settings::{
     DoorsMode, FillerItemPriority, ItemPlacementStyle, ItemPriorityStrength, KeyItemPriority,
     MotherBrainFight, Objective, ObjectiveSetting, ProgressionRate, RandomizerSettings,
-    SaveAnimals, SkillAssumptionSettings, StartLocationMode, WallJump, SpikeSuits,
+    SaveAnimals, SkillAssumptionSettings, StartLocationMode, WallJump,
 };
 use crate::spoiler_log::{
     SpoilerLocalState, SpoilerLog, SpoilerRoomLoc, SpoilerRouteEntry, SpoilerStartLocation,
@@ -97,7 +97,7 @@ impl DifficultyConfig {
     ) -> Self {
         let mut tech: Vec<bool> = vec![false; game_data.tech_isv.keys.len()];
         let mut notables: Vec<bool> = vec![false; game_data.notable_isv.keys.len()];
-        
+
         for &tech_id in implicit_tech {
             let tech_idx = game_data.tech_isv.index_by_key[&tech_id];
             tech[tech_idx] = true;

From 8425009de874b41e5947c08f6fe03e9cee9b5765 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 19 Dec 2025 17:53:11 +0900
Subject: [PATCH 08/15] add bluesuit removal patches

---
 patches/ips/remove_bluesuit.ips | Bin 0 -> 15 bytes
 patches/src/remove_bluesuit.asm |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 patches/ips/remove_bluesuit.ips
 create mode 100644 patches/src/remove_bluesuit.asm

diff --git a/patches/ips/remove_bluesuit.ips b/patches/ips/remove_bluesuit.ips
new file mode 100644
index 0000000000000000000000000000000000000000..5e12b2b556a700177f9c99f4f0fd389349dd059a
GIT binary patch
literal 15
WcmWG=3~~10xEI5~^y-zXzZ(E2#06sj

literal 0
HcmV?d00001

diff --git a/patches/src/remove_bluesuit.asm b/patches/src/remove_bluesuit.asm
new file mode 100644
index 0000000000..b10864e38a
--- /dev/null
+++ b/patches/src/remove_bluesuit.asm
@@ -0,0 +1,9 @@
+; Removes a spikesuit state from samus 
+
+arch snes.cpu
+lorom
+
+
+org $91DE5C ; replace the instruction that allows Samus to gain a bluesuit (speedbooster is only cancelled if running flag is 0)
+		nop
+		nop
\ No newline at end of file

From a50112400fed811fd12ab394e5fdcd39e62f9d1d Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 19 Dec 2025 18:14:23 +0900
Subject: [PATCH 09/15] add bluesuit disable stuff

removebluesuits
---
 ...move_bluesuit.ips => remove_bluesuits.ips} | Bin
 ...move_bluesuit.asm => remove_bluesuits.asm} |   0
 .../Community Race Season 4.json              |   1 +
 rust/data/presets/full-settings/Default.json  |   1 +
 ...nter Tournament - 4 Random Objectives.json |   1 +
 .../Winter Tournament - Double Suit.json      |   1 +
 .../Winter Tournament - Gravity 9 + 1.json    |   1 +
 ...inter Tournament - Metroid Objectives.json |   1 +
 .../Winter Tournament - No Objectives.json    |   1 +
 .../Winter Tournament - Varia + Movement.json |   1 +
 rust/maprando-game/src/lib.rs                 |   6 +++++
 .../templates/generate/game_variations.html   |  13 +++++++++++
 .../help/variations/remove_bluesuits.html     |  22 ++++++++++++++++++
 .../help/variations/remove_spikesuits.html    |   6 ++---
 .../templates/generate/scripts.html           |   1 +
 rust/maprando/src/patch.rs                    |   7 ++++++
 rust/maprando/src/randomize.rs                |  12 +++++++++-
 rust/maprando/src/settings.rs                 |   1 +
 rust/maprando/tests/logic_scenarios.rs        |   1 +
 rust/maprando/tests/presets/v119-Default.json |   1 +
 20 files changed, 74 insertions(+), 4 deletions(-)
 rename patches/ips/{remove_bluesuit.ips => remove_bluesuits.ips} (100%)
 rename patches/src/{remove_bluesuit.asm => remove_bluesuits.asm} (100%)
 create mode 100644 rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html

diff --git a/patches/ips/remove_bluesuit.ips b/patches/ips/remove_bluesuits.ips
similarity index 100%
rename from patches/ips/remove_bluesuit.ips
rename to patches/ips/remove_bluesuits.ips
diff --git a/patches/src/remove_bluesuit.asm b/patches/src/remove_bluesuits.asm
similarity index 100%
rename from patches/src/remove_bluesuit.asm
rename to patches/src/remove_bluesuits.asm
diff --git a/rust/data/presets/full-settings/Community Race Season 4.json b/rust/data/presets/full-settings/Community Race Season 4.json
index 3984c33cbf..f66e02133b 100644
--- a/rust/data/presets/full-settings/Community Race Season 4.json	
+++ b/rust/data/presets/full-settings/Community Race Season 4.json	
@@ -4514,6 +4514,7 @@
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
         "remove_spikesuits": "Disabled",
+        "remove_bluesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Default.json b/rust/data/presets/full-settings/Default.json
index efc1315566..49dbdbfac6 100644
--- a/rust/data/presets/full-settings/Default.json
+++ b/rust/data/presets/full-settings/Default.json
@@ -4515,6 +4515,7 @@
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
         "remove_spikesuits": "Disabled",
+        "remove_bluesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": false,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json b/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json
index 7fe0cf2204..7e53837673 100644
--- a/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - 4 Random Objectives.json	
@@ -4587,6 +4587,7 @@
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
         "remove_spikesuits": "Disabled",
+        "remove_bluesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Double Suit.json b/rust/data/presets/full-settings/Winter Tournament - Double Suit.json
index 7449f51a4b..e6953b3076 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Double Suit.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Double Suit.json	
@@ -4587,6 +4587,7 @@
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
         "remove_spikesuits": "Disabled",
+        "remove_bluesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json b/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json
index c2b472c5ae..5436762a0a 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Gravity 9 + 1.json	
@@ -4587,6 +4587,7 @@
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
         "remove_spikesuits": "Disabled",
+        "remove_bluesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json b/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json
index da09da405b..6650d8a64e 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Metroid Objectives.json	
@@ -4587,6 +4587,7 @@
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
         "remove_spikesuits": "Disabled",
+        "remove_bluesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - No Objectives.json b/rust/data/presets/full-settings/Winter Tournament - No Objectives.json
index 7b15ab7f04..2c460c2e65 100644
--- a/rust/data/presets/full-settings/Winter Tournament - No Objectives.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - No Objectives.json	
@@ -4587,6 +4587,7 @@
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
         "remove_spikesuits": "Disabled",
+        "remove_bluesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json b/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json
index 75ee2e5a67..d015ddcb32 100644
--- a/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json	
+++ b/rust/data/presets/full-settings/Winter Tournament - Varia + Movement.json	
@@ -4587,6 +4587,7 @@
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
         "remove_spikesuits": "Disabled",
+        "remove_bluesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": true,
         "random_seed": null
diff --git a/rust/maprando-game/src/lib.rs b/rust/maprando-game/src/lib.rs
index 8eb2f4f6da..8fc3d0b5d5 100644
--- a/rust/maprando-game/src/lib.rs
+++ b/rust/maprando-game/src/lib.rs
@@ -72,6 +72,12 @@ pub const TECH_ID_CAN_TRICKY_CARRY_FLASH_SUIT: TechId = 142;
 pub const TECH_ID_CAN_HYPER_GATE_SHOT: TechId = 10001;
 pub const TECH_ID_CAN_SLOPE_SPARK: TechId = 210;
 pub const TECH_ID_CAN_RMODE_KNOCKBACK_SPARK: TechId = 213;
+pub const TECH_ID_CAN_CRYSTAL_SPARK: TechId = 217;
+pub const TECH_ID_CAN_RMODE_SPARK_INTERRUPT: TechId = 216;
+pub const TECH_ID_CAN_RMODE_PAUSE_SPARK_INTERRUPT: TechId = 222;
+pub const TECH_ID_CAN_XMODE_BLUE_SUIT: TechId = 223;
+pub const TECH_ID_CAN_SLOPE_XMODE: TechId = 225;
+
 
 #[allow(clippy::type_complexity)]
 #[derive(Deserialize, Serialize, Clone, Debug)]
diff --git a/rust/maprando-web/templates/generate/game_variations.html b/rust/maprando-web/templates/generate/game_variations.html
index 0ca3dda7e6..7b243507c7 100644
--- a/rust/maprando-web/templates/generate/game_variations.html
+++ b/rust/maprando-web/templates/generate/game_variations.html
@@ -76,6 +76,19 @@
         <label class="btn btn-outline-primary" for="removespikesuitsYes">Yes</label>
     </div>
 </div>
+<div class="form-group row">
+    <div class="col-lg-4 col-md-6 my-2">
+        {% include "help/variations/remove_bluesuits.html" %}
+        <label for="remove_bluesuits">Remove Bluesuits</label>
+    </div>
+    <div id="removespikesuits" class="col-2 btn-group my-2" role="group">
+        <input type="radio" class="btn-check" name="remove_bluesuits" id="removebluesuitsNo" value="Disabled"
+            checked>
+        <label class="btn btn-outline-primary" for="removespikesuitsNo">No</label>
+        <input type="radio" class="btn-check" name="remove_bluesuits" id="removebluesuitsYes" value="Enabled">
+        <label class="btn btn-outline-primary" for="removebluesuitsYes">Yes</label>
+    </div>
+</div>
 <div class="form-group row">
     <div class="col-lg-4 col-md-6 my-2">
         {% include "help/variations/ultra_low_qol.html" %}
diff --git a/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html b/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html
new file mode 100644
index 0000000000..029f9c30d9
--- /dev/null
+++ b/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html
@@ -0,0 +1,22 @@
+<!-- Button trigger modal -->
+<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#disableSpikesuitsModal">
+  <i class="bi bi-question-circle"></i>
+</button>
+<!-- Modal -->
+<div class="modal" id="removeBluesuitsModal" tabindex="-1">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h1 class="modal-title fs-5">Remove bluesuit ability</h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <p>If enabled, the game will be modified so Samus cannot gain a bluesuit.</p>
+        <p>This setting will also disable and logic that would require a bluesuit.</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html b/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
index eabe1f3889..6c2bead7cb 100644
--- a/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
+++ b/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
@@ -3,7 +3,7 @@
   <i class="bi bi-question-circle"></i>
 </button>
 <!-- Modal -->
-<div class="modal" id="disableSpikesuitsModal" tabindex="-1">
+<div class="modal" id="removeSpikesuitsModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
@@ -12,8 +12,8 @@ <h1 class="modal-title fs-5">Remove spikesuit ability</h1>
       </div>
       <div class="modal-body">
         <p>If enabled, the game will be modified so Samus cannot gain a flashsuit from a glitched shinespark.</p>
-        <p>This setting will also disable certain parts of flashsuit logic if they would be in logic based on selected difficulty (Spikesuit / Slopespark / R-Mode knockback Spark).
-           A flash suit may still be gained via Elevator CF or R-Mode CF Interrupt, even if disabled in logic.</p>
+        <p>This setting will also disable any logic that this will prevent. (Spikesuit / Slopespark / R-Mode knockback Spark).
+           A flash suit may still be gained via Elevator CF or R-Mode CF Interrupt, even if not required in logic.</p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
diff --git a/rust/maprando-web/templates/generate/scripts.html b/rust/maprando-web/templates/generate/scripts.html
index fe7f1ce042..39541d2a4f 100644
--- a/rust/maprando-web/templates/generate/scripts.html
+++ b/rust/maprando-web/templates/generate/scripts.html
@@ -292,6 +292,7 @@
             "map_station_reveal": formData.get("map_station_reveal"),
             "energy_free_shinesparks": formData.get("energy_free_shinesparks") == "true",
             "remove_spikesuits": formData.get("remove_spikesuits"),
+            "remove_bluesuits": formData.get("remove_bluesuits"),
             "ultra_low_qol": formData.get("ultra_low_qol") == "true",
             "race_mode": formData.get("race_mode") == "true",
             "random_seed": tryParseInt(formData.get("random_seed")),
diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index 8961f2bf9f..1a4a57d449 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -561,6 +561,13 @@ impl Patcher<'_> {
                 patches.push("remove_spikesuits");
             }
         }
+s
+        match self.settings.other_settings.remove_bluesuits{
+            SpikeSuits::Disabled => {}
+            SpikeSuits::Enabled => {
+                patches.push("remove_bluesuits");
+            }
+        }
 
         if self
             .settings
diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index a8109682bd..cee48a53d2 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -37,7 +37,8 @@ use maprando_game::{
     TECH_ID_CAN_SPRING_BALL_BOUNCE, TECH_ID_CAN_STATIONARY_SPIN_JUMP,
     TECH_ID_CAN_STUTTER_WATER_SHINECHARGE, TECH_ID_CAN_SUPER_SINK, TECH_ID_CAN_TEMPORARY_BLUE,
     TECH_ID_CAN_TRICKY_CARRY_FLASH_SUIT, TECH_ID_CAN_SPIKE_SUIT, TECH_ID_CAN_SLOPE_SPARK, 
-    TECH_ID_CAN_RMODE_KNOCKBACK_SPARK, TechId, TemporaryBlueDirection, TraversalId, VertexId, VertexKey,
+    TECH_ID_CAN_RMODE_KNOCKBACK_SPARK, TECH_ID_CAN_CRYSTAL_SPARK, TECH_ID_CAN_RMODE_SPARK_INTERRUPT, TECH_ID_CAN_RMODE_PAUSE_SPARK_INTERRUPT,
+    TECH_ID_CAN_XMODE_BLUE_SUIT, TECH_ID_CAN_SLOPE_XMODE, TechId, TemporaryBlueDirection, TraversalId, VertexId, VertexKey,
 };
 use maprando_logic::{GlobalState, Inventory, LocalState};
 use rand::SeedableRng;
@@ -98,6 +99,15 @@ impl DifficultyConfig {
         let mut tech: Vec<bool> = vec![false; game_data.tech_isv.keys.len()];
         let mut notables: Vec<bool> = vec![false; game_data.notable_isv.keys.len()];
 
+        // todo alter function to exclude bluesuit / spikesuit tech if disable in game
+
+        let spikesuit_tech_list=[TECH_ID_CAN_SPIKE_SUIT, TECH_ID_CAN_SLOPE_SPARK, 
+                                 TECH_ID_CAN_RMODE_KNOCKBACK_SPARK];
+
+        let bluesuit_tech_list=[TECH_ID_CAN_CRYSTAL_SPARK, TECH_ID_CAN_RMODE_SPARK_INTERRUPT,TECH_ID_CAN_RMODE_PAUSE_SPARK_INTERRUPT,
+                                TECH_ID_CAN_XMODE_BLUE_SUIT, TECH_ID_CAN_SLOPE_XMODE];
+
+        //
         for &tech_id in implicit_tech {
             let tech_idx = game_data.tech_isv.index_by_key[&tech_id];
             tech[tech_idx] = true;
diff --git a/rust/maprando/src/settings.rs b/rust/maprando/src/settings.rs
index f9faf4ccf2..5cd0fe4b9b 100644
--- a/rust/maprando/src/settings.rs
+++ b/rust/maprando/src/settings.rs
@@ -348,6 +348,7 @@ pub struct OtherSettings {
     pub map_station_reveal: MapStationReveal,
     pub energy_free_shinesparks: bool,
     pub remove_spikesuits: SpikeSuits,
+    pub remove_bluesuits: BlueSuits,
     pub ultra_low_qol: bool,
     pub race_mode: bool,
     pub random_seed: Option<usize>,
diff --git a/rust/maprando/tests/logic_scenarios.rs b/rust/maprando/tests/logic_scenarios.rs
index e0f1c2d327..31a4be143c 100644
--- a/rust/maprando/tests/logic_scenarios.rs
+++ b/rust/maprando/tests/logic_scenarios.rs
@@ -251,6 +251,7 @@ fn get_settings(scenario: &Scenario) -> Result<RandomizerSettings> {
             map_station_reveal: maprando::settings::MapStationReveal::Full,
             energy_free_shinesparks: false,
             remove_spikesuits: maprando::settings::SpikeSuits::Disabled,
+            remove_bluesuits: maprando::settings::BlueSuits::Disabled,
             ultra_low_qol: false,
             race_mode: false,
             random_seed: None,
diff --git a/rust/maprando/tests/presets/v119-Default.json b/rust/maprando/tests/presets/v119-Default.json
index 66a1111f91..2b35acb654 100644
--- a/rust/maprando/tests/presets/v119-Default.json
+++ b/rust/maprando/tests/presets/v119-Default.json
@@ -4347,6 +4347,7 @@
         "map_station_reveal": "Full",
         "energy_free_shinesparks": false,
         "remove_spikesuits": "Disabled",
+        "remove_bluesuits": "Disabled",
         "ultra_low_qol": false,
         "race_mode": false,
         "random_seed": null

From d1add28f59af40f16582e695d6711405097a7ab8 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 19 Dec 2025 18:32:03 +0900
Subject: [PATCH 10/15] Update settings.rs

---
 rust/maprando/src/settings.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rust/maprando/src/settings.rs b/rust/maprando/src/settings.rs
index 5cd0fe4b9b..8c39dbb5e0 100644
--- a/rust/maprando/src/settings.rs
+++ b/rust/maprando/src/settings.rs
@@ -459,6 +459,11 @@ pub enum SpikeSuits {
     Enabled,
 }
 
+#[derive(Clone, Copy, Serialize, Deserialize, Debug, PartialEq)]
+pub enum BlueSuits {
+    Disabled,
+    Enabled,
+}
 #[derive(Clone, Copy, Serialize, Deserialize, Debug, PartialEq)]
 pub enum ETankRefill {
     Disabled,

From d886d104d00ffde97fc333645e51e7fa448685e4 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 19 Dec 2025 18:34:57 +0900
Subject: [PATCH 11/15] Update patch.rs

---
 rust/maprando/src/patch.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index 1a4a57d449..c17a9e12d1 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -561,10 +561,10 @@ impl Patcher<'_> {
                 patches.push("remove_spikesuits");
             }
         }
-s
+
         match self.settings.other_settings.remove_bluesuits{
-            SpikeSuits::Disabled => {}
-            SpikeSuits::Enabled => {
+            BlueSuits::Disabled => {}
+            BlueSuits::Enabled => {
                 patches.push("remove_bluesuits");
             }
         }

From cc8e5d9cea6a36fc0abb354ab69a28d0a1955779 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 19 Dec 2025 18:37:43 +0900
Subject: [PATCH 12/15] Update patch.rs

---
 rust/maprando/src/patch.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index c17a9e12d1..417d0866dd 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -19,7 +19,7 @@ use crate::{
     randomize::{LockedDoor, Randomization},
     settings::{
         AreaAssignment, ETankRefill, Fanfares, ItemCount, MotherBrainFight, Objective,
-        ObjectiveScreen, RandomizerSettings, SaveAnimals, StartLocationMode, WallJump, SpikeSuits,
+        ObjectiveScreen, RandomizerSettings, SaveAnimals, StartLocationMode, WallJump, SpikeSuits, BlueSuits,
     },
 };
 use anyhow::{Context, Result, bail, ensure};

From cc62da7149bb63408ebb026053982843c134c453 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 19 Dec 2025 18:44:55 +0900
Subject: [PATCH 13/15] spelling

web site
---
 .../templates/generate/help/variations/remove_bluesuits.html    | 2 +-
 .../templates/generate/help/variations/remove_spikesuits.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html b/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html
index 029f9c30d9..08636f5748 100644
--- a/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html
+++ b/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html
@@ -1,5 +1,5 @@
 <!-- Button trigger modal -->
-<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#disableSpikesuitsModal">
+<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#removeBluesuitsModal">
   <i class="bi bi-question-circle"></i>
 </button>
 <!-- Modal -->
diff --git a/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html b/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
index 6c2bead7cb..5d09dcf447 100644
--- a/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
+++ b/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
@@ -1,5 +1,5 @@
 <!-- Button trigger modal -->
-<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#disableSpikesuitsModal">
+<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#removeSpikesuitsModal">
   <i class="bi bi-question-circle"></i>
 </button>
 <!-- Modal -->

From 9cf46dfec22bcf5dbb26da0051a4e1b1c5ef3b72 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 19 Dec 2025 18:47:18 +0900
Subject: [PATCH 14/15] grammar

---
 .../templates/generate/help/variations/remove_bluesuits.html    | 2 +-
 .../templates/generate/help/variations/remove_spikesuits.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html b/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html
index 08636f5748..e9e6c6974d 100644
--- a/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html
+++ b/rust/maprando-web/templates/generate/help/variations/remove_bluesuits.html
@@ -12,7 +12,7 @@ <h1 class="modal-title fs-5">Remove bluesuit ability</h1>
       </div>
       <div class="modal-body">
         <p>If enabled, the game will be modified so Samus cannot gain a bluesuit.</p>
-        <p>This setting will also disable and logic that would require a bluesuit.</p>
+        <p>This setting will also disable any logic that would require a bluesuit.</p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
diff --git a/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html b/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
index 5d09dcf447..cd0a7d0538 100644
--- a/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
+++ b/rust/maprando-web/templates/generate/help/variations/remove_spikesuits.html
@@ -12,7 +12,7 @@ <h1 class="modal-title fs-5">Remove spikesuit ability</h1>
       </div>
       <div class="modal-body">
         <p>If enabled, the game will be modified so Samus cannot gain a flashsuit from a glitched shinespark.</p>
-        <p>This setting will also disable any logic that this will prevent. (Spikesuit / Slopespark / R-Mode knockback Spark).
+        <p>This setting will also disable any logic that would require a spikesuit. (Spikesuit / Slopespark / R-Mode knockback Spark).
            A flash suit may still be gained via Elevator CF or R-Mode CF Interrupt, even if not required in logic.</p>
       </div>
       <div class="modal-footer">

From 5961c2e6a680fa6accf5053dc30cd46f48af017b Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Sat, 20 Dec 2025 00:48:01 +0900
Subject: [PATCH 15/15] update bluesuit patch

update bluesuit patch to fix shinespark pallet
---
 patches/ips/remove_bluesuits.ips        | Bin 15 -> 24 bytes
 patches/src/tables/remove_bluesuits.asm |  12 ++++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 patches/src/tables/remove_bluesuits.asm

diff --git a/patches/ips/remove_bluesuits.ips b/patches/ips/remove_bluesuits.ips
index 5e12b2b556a700177f9c99f4f0fd389349dd059a..60b84151031b1bfd698961e99f2482200559fd63 100644
GIT binary patch
literal 24
fcmWG=3~~10xEIO5J;#oFtqu1F{W&(=uKsQSTwn)q

literal 15
WcmWG=3~~10xEI5~^y-zXzZ(E2#06sj

diff --git a/patches/src/tables/remove_bluesuits.asm b/patches/src/tables/remove_bluesuits.asm
new file mode 100644
index 0000000000..f5426b13bd
--- /dev/null
+++ b/patches/src/tables/remove_bluesuits.asm
@@ -0,0 +1,12 @@
+; Removes a spikesuit state from samus 
+
+arch snes.cpu
+lorom
+
+
+org $91DE59 ; replace the instruction that allows Samus to gain a bluesuit (speedbooster is only cancelled if running flag is 0)
+		STZ $0B3E
+		LDA $0B3C
+		BEQ $2F
+		STZ $0B3C
+		
\ No newline at end of file