Merge branch 'main' into ap-tracking

README.md

@@ -24,7 +24,8 @@ In addition to making IBJ completely optional, there is also:
  - Multiworld support with individual player logic and game settings;
  - Sprites made by members of [Diabetus’](https://twitch.tv/the_betus) community and others;
 
- **Note**: Voice recognition and text-to-speech functionality is currently only available on Windows.
+> [!NOTE]
+> Voice recognition and text-to-speech functionality is currently only available on Windows.
 
 ## Installation
 
@@ -52,4 +53,4 @@ The original repository can be found at <https://github.com/tewtal/SMZ3Randomize
 [GitHub releases]: https://github.com/TheTrackerCouncil/SMZ3Randomizer/releases
 
 ## Hosting a SMZ3 Cas' Multiplayer Server
-Interested in hosting your own server for multiplayer games? Take a look at the [Server Setup Documentation](docs/ServerSetup.md).
+Interested in hosting your own server for multiplayer games? Take a look at the [Server Setup Documentation](docs/ServerSetup.md).

alttp_sm_combo_randomizer_rom/src/main.asm

@@ -38,6 +38,7 @@ incsrc "sm/messagebox.asm"                  ; Super Metroid Messagebox improveme
 incsrc "sm/spc.asm"                         ; Super Metroid MSU-1 SPC patches
 incsrc "sm/msu.asm"                         ; Super Metroid MSU-1 patches (also inits MSU-1 tracklist)
 incsrc "sm/counthyperbeam.asm"              ; Super Metroid Helper for counting Hyper Beam shots
+incsrc "sm/etecoons_smb1.asm"               ; Super Metroid change Etecoons' song to Super Mario Bros 1.
 
 ; --- ALTTP code ---
 incsrc "z3/hirom.asm"	                    ; ALTTP ExHiROM patch

alttp_sm_combo_randomizer_rom/src/sm/etecoons_smb1.asm

@@ -0,0 +1,33 @@
+; Patches the song the Etecoons sing to be the intro for World 1-1 in Super Mario Bros. 1
+; This sound effect is Library 2, Sound 0x35
+
+; From spc.asm: engine starts at $CF8108 vanilla ROM, but $CF0108 in SMZ3
+
+org $CFA510-$8000   ; Overwrite the setup call
+    dw $39A8        ; Two voices, high-priority
+
+org $CFABA7-$8000   ; Overwrite the instruction list
+    dw $3FA3        ; Melody instruction list
+    dw $3FC7        ; Bassline instruction list
+
+; Melody ($24 bytes)
+
+    db $1D,$80,$0A,$AD,$0B
+    db $1D,$80,$0A,$AD,$18
+    db $1D,$80,$0A,$AD,$18
+    db $1D,$80,$0A,$A9,$0B
+    db $1D,$80,$0A,$AD,$1B
+    db $1D,$80,$0A,$B0,$30
+    db $1D,$80,$0A,$A4,$30
+    db $FF
+
+; Bassline ($24 bytes)
+
+    db $1D,$70,$0A,$9F,$0B
+    db $1D,$70,$0A,$9F,$18
+    db $1D,$70,$0A,$9F,$18
+    db $1D,$70,$0A,$9F,$0B
+    db $1D,$70,$0A,$9F,$18
+    db $1D,$70,$0A,$A4,$30
+    db $1D,$70,$0A,$98,$30
+    db $FF