Skip to content

Commit eea6a23

Browse files
committed
Revert "Merge remote-tracking branch 'upstream/main'"
This reverts commit bd32203, reversing changes made to dc3bfe1.
1 parent bd32203 commit eea6a23

3 files changed

Lines changed: 2 additions & 19 deletions

File tree

patches/ips/split_speed.ips

-43 Bytes
Binary file not shown.

patches/src/split_speed.asm

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -100,24 +100,8 @@ org $84B7F2
100100
; Lavaquake starts if any Speed/Blue/Spark Booster is collected
101101
dw #!any_booster
102102

103-
org $91DB0B
104-
jsr hook_reset_special_palette ; Palette reset from shinecharge special palette
105-
org $91DB6D
106-
jsr hook_reset_special_palette ; Palette reset from shinespark
107-
org $91DBF2
108-
jsr hook_reset_special_palette ; Palette reset from Crystal Flash shutdown
109-
org $91DD23
110-
jsr hook_reset_special_palette ; Palette reset from X-Ray setup
111-
112103
org !bank_91_free_space_start
113104

114-
hook_reset_special_palette:
115-
;Hijacked instruction: Special Samus palette type = 0 (screw attack / speedbooster)
116-
stz $0ACC
117-
; Clear the fake shinecharge state
118-
lda #$0000
119-
sta !fake_shinecharge
120-
rts
121105

122106
hook_speed_boosting:
123107
; If case of any item combination other than exactly Spark Booster, behave like vanilla:
@@ -179,7 +163,6 @@ fake_shinecharge_palette_table:
179163
dw $9FA0, $9F20, $9F40, $9F60, $9F40, $9F20
180164

181165
hook_normal_jump_spark:
182-
183166
lda !fake_shinecharge
184167
beq .skip
185168

rust/maprando-web/templates/about.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ <h3 class="my-3">About Map Rando</h3>
5353
It is also possible to play Map Rando without the map randomization, by selecting "Vanilla map"
5454
on the <a href="/generate">Generate</a> page.</p>
5555

56-
<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>.
56+
<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>.
5757
</p>
5858

5959
<hr>
@@ -379,7 +379,7 @@ <h5 id="item_placement">Item placement</h5>
379379

380380
<p>The logic used to determine reachability of item locations is based on the
381381
<a href="https://github.com/miketrethewey/sm-json-data">sm-json-data</a> project.
382-
This is a massive repository of Super Metroid strats, currently consisting of over 330,000 lines of manually
382+
This is a massive repository of Super Metroid strats, currently consisting of over 200,000 lines of manually
383383
crafted JSON. For each room, it defines a set of logically meaningful nodes (points or regions within the room)
384384
and defines tech, item, and resource requirements for strats traversing between nodes. In heated rooms,
385385
this includes heat damage requirements. It also includes information about runways in front of doors and other

0 commit comments

Comments
 (0)