Merge remote-tracking branch 'upstream/main'

Author: nn357

patches/ips/pause_menu_objectives.ips

@@ -282,7 +282,7 @@ org !bank_85_free_space_start
 ;;; load objective screen title from ROM to RAM
 load_obj_tilemap:
     %loadRamDMA(obj_bg1_tilemap, !BG1_tilemap+20, 24)
-    RTL
+    RTS
 
 ;;; update RAM tilemap with objectives text, line by line
 !tmp_tile_offset = $12
@@ -364,12 +364,10 @@ check_objs:
     PLX                            ; X <- objective number
     INX
     CPX !tmp_tile_offset
-    BEQ .exit
-    BRA .obj_check_lp
-
+    BNE .obj_check_lp
 .exit
     PLB
-    RTL
+    RTS
 
 check_objective: ; X = index
     PHX
@@ -399,7 +397,7 @@ find_next_check:
 ;;; direct DMA of BG1 tilemap to VRAM
 blit_objs:
     %gfxDMA(!BG1_tilemap, $30a0, !BG1_tilemap_size)
-    RTL
+    RTS
 
 ;;; DMA tilemap each frame
 queue_obj_tilemap:
@@ -732,12 +730,13 @@ func_map2obj_load_obj:
     STZ $B3                        ; BG1 Y scroll = 0
 
     STZ !obj_index
-    JSL load_obj_tilemap
-    JSL update_objs
-    JSL blit_objs
+    JSR load_obj_tilemap
+    JSR update_objs
+    JSR blit_objs
     LDA !pause_screen_mode_obj
     STA !pause_screen_mode         ; Pause screen mode = objective screen
     %callBank82Func($A615)         ; Set pause screen button label palettes
+    JSR fix_palette                ; Fix color used for dark map theme
     STZ $073F
     LDA $C10C
     STA $072B                      ; $072B = Fh
@@ -921,6 +920,11 @@ sram_to_gfx_dma: ; size in A, src in X (bank hardcoded to $70), dest in Y
     STX $0330
     RTS
 
+fix_palette:
+    LDA #$7FFF
+    STA $7EC04A
+    RTS
+    
 warnpc !bank_85_free_space2_end
 
 org !bank_B6_free_space_start

patches/src/pause_menu_objectives.asm

@@ -113,6 +113,7 @@ CharTable:
         db $79, $7a, $7b, $7c, $7d, $7e, $7f, $80, $81, $82, $83, $0f, $0f, $0f, $0f, $0f
 endif
 
+;; This must match the enemy name list in get_seed_hash in maprando_web.
 ;; ASCII values, A: 41 -> Z: 5A, ' ': 20
 WordTable:
     db "GEEMER", $00

patches/src/seed_hash_display.asm

@@ -489,6 +489,7 @@ struct RandomizeRequest {
 #[derive(Serialize)]
 struct RandomizeResponse {
     seed_url: String,
+    seed_hash: String,
 }
 
 struct AttemptOutput {
@@ -798,9 +799,26 @@ async fn randomize(
 
     HttpResponse::Ok().json(RandomizeResponse {
         seed_url: format!("/seed/{seed_name}/"),
+        seed_hash: get_seed_hash(output.randomization.display_seed),
     })
 }
 
+fn get_seed_hash(display_seed: usize) -> String {
+    // This must match the enemy name list in seed_hash_display.asm.
+    let enemies = vec![
+        "GEEMER", "RIPPER", "ATOMIC", "POWAMP", "SCISER", "NAMIHE", "PUROMI", "ALCOON", "BEETOM",
+        "OWTCH", "ZEBBO", "ZEELA", "HOLTZ", "VIOLA", "WAVER", "RINKA", "BOYON", "CHOOT", "KAGO",
+        "SKREE", "COVERN", "EVIR", "TATORI", "OUM", "PUYO", "YARD", "ZOA", "FUNE", "GAMET",
+        "GERUTA", "SOVA", "BULL",
+    ];
+    (display_seed as u32)
+        .to_le_bytes()
+        .into_iter()
+        .map(|i| enemies[i as usize % 32].to_string())
+        .collect::<Vec<String>>()
+        .join(" ")
+}
+
 #[derive(Template)]
 #[template(path = "about.html")]
 struct AboutTemplate {