Revert "Merge remote-tracking branch 'upstream/main'"

This reverts commit bd32203, reversing
changes made to dc3bfe1.

Author: nn357

patches/ips/split_speed.ips

@@ -100,24 +100,8 @@ org $84B7F2
     ; Lavaquake starts if any Speed/Blue/Spark Booster is collected
     dw #!any_booster
 
-org $91DB0B
-    jsr hook_reset_special_palette ; Palette reset from shinecharge special palette
-org $91DB6D
-    jsr hook_reset_special_palette ; Palette reset from shinespark
-org $91DBF2
-    jsr hook_reset_special_palette ; Palette reset from Crystal Flash shutdown
-org $91DD23
-    jsr hook_reset_special_palette ; Palette reset from X-Ray setup
-
 org !bank_91_free_space_start
 
-hook_reset_special_palette:
-    ;Hijacked instruction: Special Samus palette type = 0 (screw attack / speedbooster)
-    stz $0ACC
-    ; Clear the fake shinecharge state
-    lda #$0000
-    sta !fake_shinecharge
-    rts
 
 hook_speed_boosting:
     ; If case of any item combination other than exactly Spark Booster, behave like vanilla:
@@ -179,7 +163,6 @@ fake_shinecharge_palette_table:
     dw $9FA0, $9F20, $9F40, $9F60, $9F40, $9F20
 
 hook_normal_jump_spark:
-
     lda !fake_shinecharge
     beq .skip
 

patches/src/split_speed.asm

@@ -53,7 +53,7 @@ <h3 class="my-3">About Map Rando</h3>
     It is also possible to play Map Rando without the map randomization, by selecting "Vanilla map" 
     on the <a href="/generate">Generate</a> page.</p>
 
-    <p>To help players learn the tricks which are possible in this game, a library of over 7500 strat demonstration videos is available. These are integrated into the <a href="/logic">Logic</a> pages on each release, or they can be viewed immediately as they are being developed on <a href="https://videos.maprando.com">videos.maprando.com</a>. Others are welcome to join in the effort of creating videos, as this project is still far from complete: anyone interested can reach out in the #development channel of the <a href="https://discord.gg/Gc99YV2ZcB">Discord</a>.
+    <p>To help players learn the tricks which are possible in this game, a library of over 1000 strat demonstration videos is available. These are integrated into the <a href="/logic">Logic</a> pages on each release, or they can be viewed immediately as they are being developed on <a href="https://videos.maprando.com">videos.maprando.com</a>. Others are welcome to join in the effort of creating videos, as this project is still far from complete: anyone interested can reach out in the #development channel of the <a href="https://discord.gg/Gc99YV2ZcB">Discord</a>.
     </p>
 
     <hr>
@@ -379,7 +379,7 @@ <h5 id="item_placement">Item placement</h5>
 
     <p>The logic used to determine reachability of item locations is based on the
     <a href="https://github.com/miketrethewey/sm-json-data">sm-json-data</a> project.
-    This is a massive repository of Super Metroid strats, currently consisting of over 330,000 lines of manually
+    This is a massive repository of Super Metroid strats, currently consisting of over 200,000 lines of manually
     crafted JSON. For each room, it defines a set of logically meaningful nodes (points or regions within the room)
     and defines tech, item, and resource requirements for strats traversing between nodes. In heated rooms,
     this includes heat damage requirements. It also includes information about runways in front of doors and other