From de44b1134fdef9a30aa9368157ddb8aafece0e56 Mon Sep 17 00:00:00 2001 From: nn <53490794+nn357@users.noreply.github.com> Date: Tue, 14 Jul 2026 03:19:05 +0900 Subject: [PATCH 1/8] Add High Contrast door setting and tweak existing Alternate door colors to include pause map (and rename to Vibrant) --- patches/ips/alternate_door_colors.ips | Bin 145 -> 183 bytes patches/ips/map_area.ips | Bin 4576 -> 4672 bytes patches/rom_map/Bank DF.txt | 5 +- patches/src/alternate_door_colors.asm | 59 +++++++++++------ patches/src/constants.asm | 2 + patches/src/map_area.asm | 60 +++++++++++++++--- rust/maprando-web/src/seed.rs | 3 +- .../templates/seed/customize_seed.html | 8 ++- .../templates/seed/help/door_colors.html | 8 ++- rust/maprando/src/customize.rs | 28 ++++++-- rust/maprando/src/patch/map_tiles.rs | 17 +++-- 11 files changed, 145 insertions(+), 45 deletions(-) diff --git a/patches/ips/alternate_door_colors.ips b/patches/ips/alternate_door_colors.ips index 5b53351abc4396d42c1d0019cb1ff5a4a1d41e0a..e79b320cd6ad2e24a1078486ceacc30846e85913 100644 GIT binary patch delta 158 zcmbQpxSer=VtuKC@UPVx*+6n-%CiI@<-<9l`%7Kj>ecHR9^LO{I?&5>Xgw2<#d4sR z<p6fdl>@yhht_ieS!xG*)ef!a0kWJ9^g10{&j)0= z9O!j9v|a$nay!uLc4&2i{v!qkiFu47jN)AkADp|iS_I{5#3Fc2<}rS7malR3cLM;? CFG-L9 delta 119 zcmdnaIFWIJVnL3A@UPVx*+6n-%CiI@<-<9l`%7Kj>eVafG4?VY=w&*zQiQRWy=(`1*$%Dz;M}WppjQbfqSdQ%pjYM4$`-+1wFA9shgQnh^g12rbvm?CETY%t XK(EW8mAodsZU=hZ4y{gb^>+gRQKvP8 diff --git a/patches/ips/map_area.ips b/patches/ips/map_area.ips index bbffbc2a3383e5db75430381a231830011872be7..749dfd87dcf2982d914b163b77e25bd85bb9bc67 100644 GIT binary patch delta 399 zcmaE$d_ZMG8zYnIip?F2R~Q*hCdV?X+OREeef5elWf23j!uRitX?6^(O13LnUoobq z07d?MXG}lIz^-uQ`zs(|EazwVrL<>BYl4#TVj%Hj@;+u4#!Zu%SyCBQCug!4G1gC> z!?K)v+45|rMH5&bDJU$T?8llXx^3x74uG0$xpsUU%$$v0X_&&La{S@Q2$+jFT8O(nj3&#QCPNl r0cQv!lfv@N-?)}BGUjfc%VW>12Xna!F)mM-e23qXasFm8fm4hC2 delta 302 zcmX@0@<4e*8za-_<(oSguP`z)O^#(&wYjpa_0=oJltm283g5porr9yDDsiu9eZ`ob z0u=f4oiY6+1G~bJ@2`M>v7Ddbmr~b~)&wPk#X#cN2E;#7m)r1r2hcvKa=OO&0`FiY{TxTF1OTY#u5cakSR(% ztquD*Zq{l3XXx!@S2{eo324XJB>4|U3P&d|VL!##GC7}PB_qpZNzND`S;iU2t+GtX sqPYR+FolxMmpDThncgkitiipEk DoorTheme::Vanilla, - "alternate" => DoorTheme::Alternate, + "vibrant" => DoorTheme::Vibrant, + "contrast" => DoorTheme::Contrast, _ => panic!( "Unexpected door_theme option: {}", req.door_theme.0.as_str() diff --git a/rust/maprando-web/templates/seed/customize_seed.html b/rust/maprando-web/templates/seed/customize_seed.html index 9a913a76b7..115b008523 100644 --- a/rust/maprando-web/templates/seed/customize_seed.html +++ b/rust/maprando-web/templates/seed/customize_seed.html @@ -88,11 +88,13 @@
-
+
- - + + + +
diff --git a/rust/maprando-web/templates/seed/help/door_colors.html b/rust/maprando-web/templates/seed/help/door_colors.html index 29bd691fbc..089ad4826c 100644 --- a/rust/maprando-web/templates/seed/help/door_colors.html +++ b/rust/maprando-web/templates/seed/help/door_colors.html @@ -17,11 +17,15 @@

Door colors

Vanilla: Doors have the colors that they do in the vanilla game.

  • -

    Alternate: Different door colors are used, which may be easier to distinguish for +

    Vibrant: Different door colors are used, which may be easier to distinguish for color-blind players. This is based on a color scheme by Vibrant Colors.

    • +
  • +

    Constrast: Different door colors are used, which may be easier to distinguish for + color-blind players. Simlar to the Vibrant door colors but the constrast between door colors is more pronounced.

    +
    • -

    Note that the Alternate setting has side effects on colors in other places, such as in the HUD, some types of +

    Note that the Vibrant and Constrat settings have side effects on colors in other places, such as in the HUD, some types of beam doors, and acid.

    diff --git a/rust/maprando/src/customize.rs b/rust/maprando/src/customize.rs index 6ead8365b1..6f3584a788 100644 --- a/rust/maprando/src/customize.rs +++ b/rust/maprando/src/customize.rs @@ -89,11 +89,12 @@ pub enum TileTheme { Constant(String), } -#[derive(Default, Debug, Copy, Clone)] +#[derive(Default, Debug, Copy, Clone, PartialEq)] pub enum DoorTheme { #[default] Vanilla, - Alternate, + Vibrant, + Contrast, } #[derive(Default, Debug, Copy, Clone)] @@ -527,9 +528,28 @@ pub fn customize_rom( )?; match settings.door_theme { - DoorTheme::Vanilla => {} - DoorTheme::Alternate => { + DoorTheme::Vanilla => { + rom.write_u8(snes2pc(0xdfff04), 0)?; // Alternative door colors option false + } + DoorTheme::Vibrant => { + apply_ips_patch(rom, Path::new("../patches/ips/alternate_door_colors.ips"))?; + rom.write_u8(snes2pc(0xdfff04), 1)?; // Alternative door colors option set flag + } + DoorTheme::Contrast => { apply_ips_patch(rom, Path::new("../patches/ips/alternate_door_colors.ips"))?; + rom.write_u8(snes2pc(0xdfff04), 1)?; // Alternative door colors option set flag + rom.write_u16(snes2pc(0xdfe200), 0x03BF)?; // Alternative power bomb door color + rom.write_u16(snes2pc(0xdfe202), 0x0278)?; // Alternative power bomb door color + rom.write_u16(snes2pc(0xdfe204), 0x00EC)?; // Alternative power bomb door color + rom.write_u16(snes2pc(0xdfe206), 0x5BE1)?; // Alternative super door color + rom.write_u16(snes2pc(0xdfe208), 0x3AA0)?; // Alternative super door color + rom.write_u16(snes2pc(0xdfe20a), 0x1DA0)?; // Alternative super door color + rom.write_u16(snes2pc(0xdfe20c), 0x1C1D)?; // Alternative missile door color + rom.write_u16(snes2pc(0xdfe20e), 0x1033)?; // Alternative missile bomb door color + rom.write_u16(snes2pc(0xdfe210), 0x0829)?; // Alternative missile bomb door color + rom.write_u16(snes2pc(0xdfe212), 0x03BF)?; // Pause map power bomb door color + rom.write_u16(snes2pc(0xdfe214), 0x5BE1)?; // Pause map super door color + rom.write_u16(snes2pc(0xdfe216), 0x1C1D)?; // Pause map missile door color } } diff --git a/rust/maprando/src/patch/map_tiles.rs b/rust/maprando/src/patch/map_tiles.rs index 6a28ce137e..3197204f6f 100644 --- a/rust/maprando/src/patch/map_tiles.rs +++ b/rust/maprando/src/patch/map_tiles.rs @@ -1,7 +1,7 @@ use hashbrown::{HashMap, HashSet}; use crate::{ - customize::{CustomizeSettings, ItemDotChange, MapTheme}, + customize::{CustomizeSettings, DoorTheme, ItemDotChange, MapTheme}, randomize::{LockedDoor, Randomization}, settings::{ DisableETankSetting, DoorLocksSize, EnhancedMapLevel, EnhancedMapOther, EnhancedMapWalls, @@ -1300,7 +1300,7 @@ pub fn render_tile( } } // Set up arrows of different colors (one per area): - let area_arrow_colors: Vec = vec![ + let mut area_arrow_colors: Vec = vec![ 11, // Crateria: purple (defined above) 14, // Brinstar: green (defined above) 10, // Norfair: red (defined above) @@ -1308,6 +1308,10 @@ pub fn render_tile( 8, // Maridia: blue (defined above) 6, // Tourian: orange ]; + // Swap the T and W around if using the Contrast theme + if customize_settings.door_theme == DoorTheme::Contrast { + area_arrow_colors.swap(3, 5); + } let color_number = area_arrow_colors[area_idx] as u8; data = data.map(|row| row.map(|c| if c == 3 { color_number } else { c })); @@ -2298,14 +2302,19 @@ impl<'a> MapPatcher<'a> { fn rgb(r: u16, g: u16, b: u16) -> u16 { (b << 10) | (g << 5) | r } + let (color6, color9) = if self.customize_settings.door_theme == DoorTheme::Contrast { + (rgb(23, 24, 9), rgb(29, 15, 0)) // swap colors + } else { + (rgb(29, 15, 0), rgb(23, 24, 9)) + }; let extended_map_palette: Vec<(u8, u16)> = vec![ (14, rgb(7, 31, 7)), // Brinstar green (and green doors) (10, rgb(29, 0, 0)), // Norfair red (8, rgb(4, 13, 31)), // Maridia blue - (9, rgb(23, 24, 9)), // Wrecked Ship yellow + (9, color9), // Wrecked Ship yellow (11, rgb(20, 3, 31)), // Crateria purple - (6, rgb(29, 15, 0)), // Tourian, (and orange doors) + (6, color6), // Tourian, (and orange doors) (15, rgb(18, 12, 14)), // Gray door (7, rgb(27, 2, 27)), // Red (pink) door (12, rgb(0, 0, 0)), // Black (door lock shadows covering wall) From 30b0438dbb7c923b837d2bed8c459b7019db0ffc Mon Sep 17 00:00:00 2001 From: nn <53490794+nn357@users.noreply.github.com> Date: Wed, 15 Jul 2026 00:58:00 +0900 Subject: [PATCH 2/8] formatting --- rust/maprando/src/patch/map_tiles.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/maprando/src/patch/map_tiles.rs b/rust/maprando/src/patch/map_tiles.rs index 3197204f6f..6526d3b24e 100644 --- a/rust/maprando/src/patch/map_tiles.rs +++ b/rust/maprando/src/patch/map_tiles.rs @@ -2312,9 +2312,9 @@ impl<'a> MapPatcher<'a> { (14, rgb(7, 31, 7)), // Brinstar green (and green doors) (10, rgb(29, 0, 0)), // Norfair red (8, rgb(4, 13, 31)), // Maridia blue - (9, color9), // Wrecked Ship yellow + (9, color9), // Wrecked Ship yellow (11, rgb(20, 3, 31)), // Crateria purple - (6, color6), // Tourian, (and orange doors) + (6, color6), // Tourian, (and orange doors) (15, rgb(18, 12, 14)), // Gray door (7, rgb(27, 2, 27)), // Red (pink) door (12, rgb(0, 0, 0)), // Black (door lock shadows covering wall) From cdf56446182f70e7e61b624332e07e4fe5120ccd Mon Sep 17 00:00:00 2001 From: nn <53490794+nn357@users.noreply.github.com> Date: Wed, 15 Jul 2026 12:13:57 +0900 Subject: [PATCH 3/8] typo --- rust/maprando-web/templates/seed/help/door_colors.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/maprando-web/templates/seed/help/door_colors.html b/rust/maprando-web/templates/seed/help/door_colors.html index 089ad4826c..e7f24d7c9b 100644 --- a/rust/maprando-web/templates/seed/help/door_colors.html +++ b/rust/maprando-web/templates/seed/help/door_colors.html @@ -18,14 +18,14 @@

    Door colors

  • Vibrant: Different door colors are used, which may be easier to distinguish for - color-blind players. This is based on a color scheme by Vibrant Colors.

    + color-blind players.

  • Constrast: Different door colors are used, which may be easier to distinguish for color-blind players. Simlar to the Vibrant door colors but the constrast between door colors is more pronounced.

    • -

    Note that the Vibrant and Constrat settings have side effects on colors in other places, such as in the HUD, some types of +

    Note that the Vibrant and Contrast settings have side effects on colors in other places, such as in the HUD, some types of beam doors, and acid.

    From a9c447dfd38d773746acdca49713e6bee906fa7c Mon Sep 17 00:00:00 2001 From: nn <53490794+nn357@users.noreply.github.com> Date: Wed, 15 Jul 2026 22:39:19 +0900 Subject: [PATCH 4/8] move door patching to rust --- patches/rom_map/Bank DF.txt | 6 +-- patches/src/alternate_door_colors.asm | 5 +-- patches/src/map_area.asm | 55 ++++----------------------- rust/maprando/src/customize.rs | 24 +++++------- rust/maprando/src/patch/map_tiles.rs | 38 +++++++++++++----- 5 files changed, 48 insertions(+), 80 deletions(-) diff --git a/patches/rom_map/Bank DF.txt b/patches/rom_map/Bank DF.txt index 5fdea9679e..41a08efed1 100644 --- a/patches/rom_map/Bank DF.txt +++ b/patches/rom_map/Bank DF.txt @@ -1,10 +1,10 @@ D4DF - D761: ; credits.asm D91B - DF0A: ; credits.asm E000 - E127: ; credits.asm -E200 - E218: ; alternate_door_colors.asm -E218 - FEEF: [free] +E200 - E212: ; alternate_door_colors.asm +E212 - FEEF: [free] FEF0 - FEFF: seed name (null-terminated ASCII string) -FF04 - FF04: alternative door color option. 0=vanilla, 1=alternative, 2=high constrast. +FF04 - FF04: [free] FF05 - FF06: randomizer settings: - bitmask $0001: walljump-boots item enabled - bitmask $0002: split speedbooster item enabled diff --git a/patches/src/alternate_door_colors.asm b/patches/src/alternate_door_colors.asm index 6f89af3cab..5d3ac750f2 100644 --- a/patches/src/alternate_door_colors.asm +++ b/patches/src/alternate_door_colors.asm @@ -5,7 +5,7 @@ lorom !bank_82_free_space_end = $82FA80 !bank_df_free_space_start = $dfe200 ; must match addresses in customize.rs [these colors may be modifided there] -!bank_df_free_space_end = $dfe218 +!bank_df_free_space_end = $dfe212 org $82E7D0 jmp hook_load_tileset @@ -93,8 +93,5 @@ missile_2: dw $5816 missile_3: dw $340D -dw $019E ; pb door used for pause menu map screen [referenced in map_area.asm, can be overwritten in customize.rs] -dw $43F0 ; super door used for pause menu map screen [referenced in map_area.asm, can be overwritten in customize.rs] -dw $7c1f ; missile door used for pause menu map screen [referenced in map_area.asm, can be overwritten in customize.rs] assert pc() <= !bank_df_free_space_end \ No newline at end of file diff --git a/patches/src/map_area.asm b/patches/src/map_area.asm index da98e7206e..9088a056a4 100644 --- a/patches/src/map_area.asm +++ b/patches/src/map_area.asm @@ -26,11 +26,6 @@ incsrc "constants.asm" !tiles_2bpp_address = $B200 !tiles_2bpp_bank = $009A -!missiledoorcolor = $dfe216 ; -!superdoorcolor = $dfe214 ; defined in alternate_door_colors.asm, can be overwritten in customize.rs [used for pause map alternate door colors] -!pbdoorcolor = $dfe212 ; - - !backup_area = $1F62 !map_switch_direction = $1F66 !unexplored_gray = #$294a @@ -502,7 +497,6 @@ pause_start_hook: sta !backup_area ; back up map area jsr set_hud_map_colors jsr update_pause_map_palette - jsr pause_hook_alternate_door_colors jsl load_bg3_map_tiles_wrapper ;jsr remove_samus_hud_indicator jsl $8085C6 ; save current map explored bits @@ -522,33 +516,12 @@ load_tileset_palette_hook: rtl load_map_screen: - ; run hi-jacked instruction: + ; run hi-jacked instruction: sta $0763 - ; modify palettes used for door colors if alternative door colors are enabled. - lda !alternative_door_colors - and #$00ff - beq .nodoorcolors - lda.l !superdoorcolor - sta $7ec0fc ; super doors palette 7 (unexplored) - sta $7ec05c ; super doors palette 2 (explored) - lda.l !missiledoorcolor - sta $7ec0ee ; missile doors palette 7 (unexplored) - sta $7ec04e ; missile doors palette 2 (explored) - lda.l !pbdoorcolor - sta $7ec0ec ; pb doors pallette 2 (unexplored) - sta $7ec04c ; pb dpprs palette 2 (explored) - bra .done -.nodoorcolors ; there is no palette modification done for the missile door color if not using alternative door colors. - lda $b6f0ec ; pb doors - sta $7ec0ec - lda $b6f0fc ; super doors - sta $7ec0fc - lda $b6f05c - sta $7ec05c -.done - ; palette 2: + lda $B6F05C + sta $7EC05C lda $B6F05E sta $7EC05E ;fix color used for dark map theme @@ -578,12 +551,14 @@ load_map_screen: sta $7EC0E4 lda $B6F0E6 sta $7EC0E6 - + lda $B6F0EC + sta $7EC0EC lda $B6F0F6 sta $7EC0F6 lda $B6F0FA sta $7EC0FA - + lda $B6F0FC + sta $7EC0FC ; Partially revealed tiles: black color for item dots, door locks lda !bank_85_freespace2_start ; this is tied to an address referenced in customize.rs @@ -2211,22 +2186,6 @@ draw_sprite: PLA BRA .sprite_is_disabled -pause_hook_alternate_door_colors: ; modifies the palette colors for the mapscreen doors if using alternative door colors. - lda !alternative_door_colors - and #$00ff - beq .skip - lda.l !superdoorcolor - sta $7ec0fc ; super doors - sta $7ec05c - lda.l !missiledoorcolor - sta $7ec0ee ; missile doors - sta $7ec04e - lda.l !pbdoorcolor - sta $7ec0ec ; pb doors - sta $7ec04c -.skip - rts - assert pc() <= !bank_85_freespace3_end ; Fixes FX for rare bug when entering right-sided door through East Pants Room diff --git a/rust/maprando/src/customize.rs b/rust/maprando/src/customize.rs index 6f3584a788..6511b109cf 100644 --- a/rust/maprando/src/customize.rs +++ b/rust/maprando/src/customize.rs @@ -529,27 +529,21 @@ pub fn customize_rom( match settings.door_theme { DoorTheme::Vanilla => { - rom.write_u8(snes2pc(0xdfff04), 0)?; // Alternative door colors option false } DoorTheme::Vibrant => { apply_ips_patch(rom, Path::new("../patches/ips/alternate_door_colors.ips"))?; - rom.write_u8(snes2pc(0xdfff04), 1)?; // Alternative door colors option set flag } DoorTheme::Contrast => { apply_ips_patch(rom, Path::new("../patches/ips/alternate_door_colors.ips"))?; - rom.write_u8(snes2pc(0xdfff04), 1)?; // Alternative door colors option set flag - rom.write_u16(snes2pc(0xdfe200), 0x03BF)?; // Alternative power bomb door color - rom.write_u16(snes2pc(0xdfe202), 0x0278)?; // Alternative power bomb door color - rom.write_u16(snes2pc(0xdfe204), 0x00EC)?; // Alternative power bomb door color - rom.write_u16(snes2pc(0xdfe206), 0x5BE1)?; // Alternative super door color - rom.write_u16(snes2pc(0xdfe208), 0x3AA0)?; // Alternative super door color - rom.write_u16(snes2pc(0xdfe20a), 0x1DA0)?; // Alternative super door color - rom.write_u16(snes2pc(0xdfe20c), 0x1C1D)?; // Alternative missile door color - rom.write_u16(snes2pc(0xdfe20e), 0x1033)?; // Alternative missile bomb door color - rom.write_u16(snes2pc(0xdfe210), 0x0829)?; // Alternative missile bomb door color - rom.write_u16(snes2pc(0xdfe212), 0x03BF)?; // Pause map power bomb door color - rom.write_u16(snes2pc(0xdfe214), 0x5BE1)?; // Pause map super door color - rom.write_u16(snes2pc(0xdfe216), 0x1C1D)?; // Pause map missile door color + rom.write_u16(snes2pc(0xdfe200), 0x03BF)?; // high contrast power bomb door color + rom.write_u16(snes2pc(0xdfe202), 0x0278)?; // high contrast power bomb door color + rom.write_u16(snes2pc(0xdfe204), 0x00EC)?; // high contrast power bomb door color + rom.write_u16(snes2pc(0xdfe206), 0x5BE1)?; // high contrast super door color + rom.write_u16(snes2pc(0xdfe208), 0x3AA0)?; // high contrast super door color + rom.write_u16(snes2pc(0xdfe20a), 0x1DA0)?; // high contrast super door color + rom.write_u16(snes2pc(0xdfe20c), 0x1C1D)?; // high contrast missile door color + rom.write_u16(snes2pc(0xdfe20e), 0x1033)?; // high contrast missile bomb door color + rom.write_u16(snes2pc(0xdfe210), 0x0829)?; // high contrast missile bomb door color } } diff --git a/rust/maprando/src/patch/map_tiles.rs b/rust/maprando/src/patch/map_tiles.rs index 6526d3b24e..6c13870d72 100644 --- a/rust/maprando/src/patch/map_tiles.rs +++ b/rust/maprando/src/patch/map_tiles.rs @@ -2302,23 +2302,41 @@ impl<'a> MapPatcher<'a> { fn rgb(r: u16, g: u16, b: u16) -> u16 { (b << 10) | (g << 5) | r } - let (color6, color9) = if self.customize_settings.door_theme == DoorTheme::Contrast { - (rgb(23, 24, 9), rgb(29, 15, 0)) // swap colors - } else { - (rgb(29, 15, 0), rgb(23, 24, 9)) + + let (color6, color7, color9, color14) = match self.customize_settings.door_theme { + DoorTheme::Vanilla => ( + rgb(29, 15, 0), // palette 6 + rgb(27, 2, 27), // palette 7 + rgb(23, 24, 9), // palette 9 + rgb(7, 31, 7), // palette 14 + ), + + DoorTheme::Vibrant => ( + rgb(29, 15, 0), // palette 6 + rgb(31, 1, 31), // palette 7 (0x7C1F) + rgb(23, 24, 9), // palette 9 + rgb(16, 31, 16), // palette 14 (0x43F0) + ), + + DoorTheme::Contrast => ( + rgb(23, 24, 9), // palette 6 (swapped with 9) + rgb(29, 0, 7), // palette 7 (0x1C1D) + rgb(29, 15, 0), // palette 9 (swapped with 6) + rgb(1, 31, 22), // palette 14 (0x5BE1) + ), }; let extended_map_palette: Vec<(u8, u16)> = vec![ - (14, rgb(7, 31, 7)), // Brinstar green (and green doors) + (14, color14), // Brinstar green (and green doors) (10, rgb(29, 0, 0)), // Norfair red (8, rgb(4, 13, 31)), // Maridia blue - (9, color9), // Wrecked Ship yellow + (9, color9), // Wrecked Ship yellow, swapped palette 6 in high contrast doors. (11, rgb(20, 3, 31)), // Crateria purple - (6, color6), // Tourian, (and orange doors) + (6, color6), // Tourian, (and orange doors) - swapped with pallete 9 in high contrast doors. (15, rgb(18, 12, 14)), // Gray door - (7, rgb(27, 2, 27)), // Red (pink) door - (12, rgb(0, 0, 0)), // Black (door lock shadows covering wall) - (5, rgb(0, 0, 0)), // Black (door lock shadows covering air) + (7, color7), // Red (pink) door (defined above depending on door theme) + (12, rgb(0, 0, 0)), // Black (door lock shadows covering wall) + (5, rgb(0, 0, 0)), // Black (door lock shadows covering air) (13, rgb(31, 31, 31)), // White (item dots) ]; // Dotted grid lines From 02df52f7260080b22b7c38fc423d4e14f33195cd Mon Sep 17 00:00:00 2001 From: nn <53490794+nn357@users.noreply.github.com> Date: Thu, 16 Jul 2026 01:32:08 +0900 Subject: [PATCH 5/8] correct pallets --- patches/ips/map_area.ips | Bin 4672 -> 4584 bytes patches/src/map_area.asm | 2 + rust/maprando/src/customize.rs | 9 ++--- rust/maprando/src/patch/map_tiles.rs | 54 ++++++++++++++------------- 4 files changed, 35 insertions(+), 30 deletions(-) diff --git a/patches/ips/map_area.ips b/patches/ips/map_area.ips index 749dfd87dcf2982d914b163b77e25bd85bb9bc67..83eba2d664a726a28d8d523a06cbc1bb66dd229c 100644 GIT binary patch delta 310 zcmX@0@eZ`ob z0u=f4oiY6+1G~bJ@2`M>v7Ddbm(rvqtqDp7i-E+s$@`dH7&|62v!pUAP0nO7Vho); zhh;f;&GKxfMH5(eD12Ks*^f0(sAuU)4uN zpKQREp!(*+w*EH<>ehb)(%*peFChI3NdE!Se}J?PNPhBMwt0*(lWo`?)zy~zELftz z2{KKor?p`}$IUv;{|vpI>`I3xHv#QBnDzXF*4e3KF?#%JlRITlCgAinZPMV05mFs@Bjb+ delta 376 zcmaE%d_ZMG8zYnIip?F2R~Q*hCdV?X+OREeef5elWf23j!uRitX?6^(O13LnUoobq z07d?MXG}lIz^-uQ`zs(|EazwVrL<>BYl4#TVj%Hj@;+u4#!Zu%SyCBQCug!4G1gC> z!?K)v+45|rMH5&bDJU$T?8llXx^3x74u { - } + DoorTheme::Vanilla => {} DoorTheme::Vibrant => { apply_ips_patch(rom, Path::new("../patches/ips/alternate_door_colors.ips"))?; } @@ -538,7 +537,7 @@ pub fn customize_rom( rom.write_u16(snes2pc(0xdfe200), 0x03BF)?; // high contrast power bomb door color rom.write_u16(snes2pc(0xdfe202), 0x0278)?; // high contrast power bomb door color rom.write_u16(snes2pc(0xdfe204), 0x00EC)?; // high contrast power bomb door color - rom.write_u16(snes2pc(0xdfe206), 0x5BE1)?; // high contrast super door color + rom.write_u16(snes2pc(0xdfe206), 0x5BE1)?; // high contrast super door color rom.write_u16(snes2pc(0xdfe208), 0x3AA0)?; // high contrast super door color rom.write_u16(snes2pc(0xdfe20a), 0x1DA0)?; // high contrast super door color rom.write_u16(snes2pc(0xdfe20c), 0x1C1D)?; // high contrast missile door color diff --git a/rust/maprando/src/patch/map_tiles.rs b/rust/maprando/src/patch/map_tiles.rs index 6c13870d72..737625351a 100644 --- a/rust/maprando/src/patch/map_tiles.rs +++ b/rust/maprando/src/patch/map_tiles.rs @@ -2304,39 +2304,43 @@ impl<'a> MapPatcher<'a> { } let (color6, color7, color9, color14) = match self.customize_settings.door_theme { - DoorTheme::Vanilla => ( - rgb(29, 15, 0), // palette 6 - rgb(27, 2, 27), // palette 7 - rgb(23, 24, 9), // palette 9 - rgb(7, 31, 7), // palette 14 - ), - - DoorTheme::Vibrant => ( - rgb(29, 15, 0), // palette 6 - rgb(31, 1, 31), // palette 7 (0x7C1F) - rgb(23, 24, 9), // palette 9 - rgb(16, 31, 16), // palette 14 (0x43F0) - ), - - DoorTheme::Contrast => ( - rgb(23, 24, 9), // palette 6 (swapped with 9) - rgb(29, 0, 7), // palette 7 (0x1C1D) - rgb(29, 15, 0), // palette 9 (swapped with 6) - rgb(1, 31, 22), // palette 14 (0x5BE1) - ), + DoorTheme::Contrast => { + ( + rgb(31, 29, 0), + rgb(29, 0, 7), + rgb(29, 15, 0), + rgb(1, 30, 22), + ) + } + DoorTheme::Vibrant => { + ( + rgb(30, 12, 0), + rgb(31, 0, 31), + rgb(23, 24, 9), + rgb(16, 31, 16), + ) + } + DoorTheme::Vanilla => { + ( + rgb(29, 15, 0), + rgb(27, 2, 27), + rgb(23, 24, 9), + rgb(7, 31, 7), + ) + } }; let extended_map_palette: Vec<(u8, u16)> = vec![ (14, color14), // Brinstar green (and green doors) (10, rgb(29, 0, 0)), // Norfair red (8, rgb(4, 13, 31)), // Maridia blue - (9, color9), // Wrecked Ship yellow, swapped palette 6 in high contrast doors. + (9, color9), // Wrecked Ship yellow (11, rgb(20, 3, 31)), // Crateria purple - (6, color6), // Tourian, (and orange doors) - swapped with pallete 9 in high contrast doors. + (6, color6), // Tourian (and orange doors) (15, rgb(18, 12, 14)), // Gray door - (7, color7), // Red (pink) door (defined above depending on door theme) - (12, rgb(0, 0, 0)), // Black (door lock shadows covering wall) - (5, rgb(0, 0, 0)), // Black (door lock shadows covering air) + (7, color7), // Red (pink) door + (12, rgb(0, 0, 0)), // Black (door lock shadows covering wall) + (5, rgb(0, 0, 0)), // Black (door lock shadows covering air) (13, rgb(31, 31, 31)), // White (item dots) ]; // Dotted grid lines From 4a3b2d3004718d61720461e97fad3249bf1b9cdd Mon Sep 17 00:00:00 2001 From: nn <53490794+nn357@users.noreply.github.com> Date: Thu, 16 Jul 2026 01:37:05 +0900 Subject: [PATCH 6/8] formatting --- rust/maprando/src/customize.rs | 4 +-- rust/maprando/src/patch/map_tiles.rs | 42 ++++++++++++---------------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/rust/maprando/src/customize.rs b/rust/maprando/src/customize.rs index 9220d9ab0b..06d7338d7e 100644 --- a/rust/maprando/src/customize.rs +++ b/rust/maprando/src/customize.rs @@ -4,14 +4,14 @@ pub mod room_palettes; pub mod samus_sprite; pub mod vanilla_music; -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use hashbrown::HashMap; use log::info; use std::cmp::min; use std::path::Path; use crate::patch::glowpatch_writer::write_glowpatch; -use crate::patch::{apply_ips_patch, snes2pc, write_credits_big_char, ExtraRoomData, Rom}; +use crate::patch::{ExtraRoomData, Rom, apply_ips_patch, snes2pc, write_credits_big_char}; use maprando_game::{GameData, Map, RoomPtr}; use mosaic::MosaicTheme; use retiling::apply_retiling_and_palettes; diff --git a/rust/maprando/src/patch/map_tiles.rs b/rust/maprando/src/patch/map_tiles.rs index 737625351a..009cc08c6d 100644 --- a/rust/maprando/src/patch/map_tiles.rs +++ b/rust/maprando/src/patch/map_tiles.rs @@ -2304,30 +2304,24 @@ impl<'a> MapPatcher<'a> { } let (color6, color7, color9, color14) = match self.customize_settings.door_theme { - DoorTheme::Contrast => { - ( - rgb(31, 29, 0), - rgb(29, 0, 7), - rgb(29, 15, 0), - rgb(1, 30, 22), - ) - } - DoorTheme::Vibrant => { - ( - rgb(30, 12, 0), - rgb(31, 0, 31), - rgb(23, 24, 9), - rgb(16, 31, 16), - ) - } - DoorTheme::Vanilla => { - ( - rgb(29, 15, 0), - rgb(27, 2, 27), - rgb(23, 24, 9), - rgb(7, 31, 7), - ) - } + DoorTheme::Contrast => ( + rgb(31, 29, 0), + rgb(29, 0, 7), + rgb(29, 15, 0), + rgb(1, 30, 22), + ), + DoorTheme::Vibrant => ( + rgb(30, 12, 0), + rgb(31, 0, 31), + rgb(23, 24, 9), + rgb(16, 31, 16), + ), + DoorTheme::Vanilla => ( + rgb(29, 15, 0), + rgb(27, 2, 27), + rgb(23, 24, 9), + rgb(7, 31, 7), + ), }; let extended_map_palette: Vec<(u8, u16)> = vec![ From 7e281d691107c0e00381eedcd896314391e53a0b Mon Sep 17 00:00:00 2001 From: nn <53490794+nn357@users.noreply.github.com> Date: Thu, 16 Jul 2026 01:44:40 +0900 Subject: [PATCH 7/8] cleanup --- patches/ips/alternate_door_colors.ips | Bin 183 -> 177 bytes patches/src/constants.asm | 2 -- 2 files changed, 2 deletions(-) diff --git a/patches/ips/alternate_door_colors.ips b/patches/ips/alternate_door_colors.ips index e79b320cd6ad2e24a1078486ceacc30846e85913..f1ceede7a9ceec417ba76803cbae439b8340e7c8 100644 GIT binary patch delta 29 kcmdnaxRG(fY%!sEj3SI(3?H1kv|0q^Ys4aWO+gR%OMLD diff --git a/patches/src/constants.asm b/patches/src/constants.asm index 9640dc4b6d..44fe4eb26d 100644 --- a/patches/src/constants.asm +++ b/patches/src/constants.asm @@ -57,8 +57,6 @@ ; (to compensate for VRAM decompression being faster): !unpause_black_screen_lag_frames = $dfff07 -!alternative_door_colors = $dfff04 ; overwritten by customize.rs 00 = vanilla doors, 01 = alternative - ; crash handler / sub patches variables !crash_toggles = $80D330 ; overwritten by patch.rs , defined in crash_handle_base.asm From 4ec25fe5c4e807611ab07091cf01d8fd363446e9 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Wed, 15 Jul 2026 19:07:57 -0600 Subject: [PATCH 8/8] a few minor adjustments --- patches/ips/map_area.ips | Bin 4584 -> 4576 bytes patches/src/map_area.asm | 2 -- .../templates/seed/help/door_colors.html | 4 ++-- rust/maprando/src/patch/map_tiles.rs | 10 +++++----- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/patches/ips/map_area.ips b/patches/ips/map_area.ips index 83eba2d664a726a28d8d523a06cbc1bb66dd229c..bbffbc2a3383e5db75430381a231830011872be7 100644 GIT binary patch delta 223 zcmaE%{6Kj_8zbZA&Fzd=85x--$1J?+kA_iuK@822I>=;;;xL35kVoXl~ ziv0P`n0}IhUE#?0S3tm6&d=~mscT7Vf|9{vAaQK+K4urjhRMtwk%!A!H~T+TD~_)UZG{Fg7xIHtP(6hM#$ustgVyF*k&_^Ocr8y zMYBS=LoyA0#e$yMy97+WU0a;#)znf#t321xpF26C$`Q?h7oPJ?+kA_iuK@822I>=;;;gjck_VoXl~ ziv0P`n0}IhUE#?0S3tm6&d=~mY0{F`1SNyTK;qoweatS59g~?^W-x|Mp2M=7t7dsN z)1nEiI~2Z6_GQf%>{+^!gCTouw0v)pyh6`X1?S0UStVG2jF`zUSzB3sK5XlMGdY`W z9%Ia8E_O$CwWU4_mMCxn)h$)(X>HigakEbIKSOUPyVBvwO+Zu5Cdq#=QaC%gi2W2} z&tzMUm5e--pL4_jNf*vQZk=UH7R?O`-soJVgjca0i)ew AD*ylh diff --git a/patches/src/map_area.asm b/patches/src/map_area.asm index 450add7a65..9088a056a4 100644 --- a/patches/src/map_area.asm +++ b/patches/src/map_area.asm @@ -559,8 +559,6 @@ load_map_screen: sta $7EC0FA lda $B6F0FC sta $7EC0FC - lda $b6f04c - sta $7ec0ec ; pb doors ; Partially revealed tiles: black color for item dots, door locks lda !bank_85_freespace2_start ; this is tied to an address referenced in customize.rs diff --git a/rust/maprando-web/templates/seed/help/door_colors.html b/rust/maprando-web/templates/seed/help/door_colors.html index e7f24d7c9b..76ed0a4955 100644 --- a/rust/maprando-web/templates/seed/help/door_colors.html +++ b/rust/maprando-web/templates/seed/help/door_colors.html @@ -21,8 +21,8 @@

    Door colors

    color-blind players.

  • -

    Constrast: Different door colors are used, which may be easier to distinguish for - color-blind players. Simlar to the Vibrant door colors but the constrast between door colors is more pronounced.

    +

    Contrast: Different door colors are used, which may be easier to distinguish for + color-blind players. Simlar to the Vibrant door colors but the contrast between door colors is more pronounced.

    • Note that the Vibrant and Contrast settings have side effects on colors in other places, such as in the HUD, some types of diff --git a/rust/maprando/src/patch/map_tiles.rs b/rust/maprando/src/patch/map_tiles.rs index 009cc08c6d..fdf92d6804 100644 --- a/rust/maprando/src/patch/map_tiles.rs +++ b/rust/maprando/src/patch/map_tiles.rs @@ -2307,8 +2307,8 @@ impl<'a> MapPatcher<'a> { DoorTheme::Contrast => ( rgb(31, 29, 0), rgb(29, 0, 7), - rgb(29, 15, 0), - rgb(1, 30, 22), + rgb(31, 17, 0), + rgb(1, 31, 22), ), DoorTheme::Vibrant => ( rgb(30, 12, 0), @@ -2317,10 +2317,10 @@ impl<'a> MapPatcher<'a> { rgb(16, 31, 16), ), DoorTheme::Vanilla => ( - rgb(29, 15, 0), - rgb(27, 2, 27), + rgb(31, 17, 0), + rgb(27, 2, 18), rgb(23, 24, 9), - rgb(7, 31, 7), + rgb(9, 31, 5), ), };