Merge pull request #251 from Vivelin/feature/extended-msu

Extended MSU and Multiplayer Documentation
TheTrackerCouncil · Jan 4, 2023 · 736df10 · 736df10
2 parents bfddca6 + a34ac58
commit 736df10
Show file tree

Hide file tree

Showing 78 changed files with 2,470 additions and 1,550 deletions.
diff --git a/README.md b/README.md
@@ -14,12 +14,12 @@ found on the [GitHub releases] page.
 ## Features
 In addition to making IBJ completely optional, there is also:
 
- - Integrated voice-enabled item & location tracker;
+ - Integrated voice-enabled/automated item & location tracker;
  - Built-in MSU-1 support for custom music packs;
- - Item Quickswap in <cite>A Link to the Past</cite> based on a [contribution] 
-   that never made it in;
  - More logic customization options;
+ - Various accessibility patches;
  - Customizable ship sprites;
+ - In game hint tiles and voice-enabled hints via tracker;
  - Sprites made by members of [Diabetus’](https://twitch.tv/the_betus) community and others;
 
 ## Credits
@@ -62,5 +62,7 @@ In addition to making IBJ completely optional, there is also:
 
 The original repository can be found at <https://github.com/tewtal/SMZ3Randomizer>.
 
-[contribution]: https://github.com/tewtal/alttp_sm_combo_randomizer_rom/pull/55
 [GitHub releases]: https://github.com/Vivelin/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).
diff --git a/alttp_sm_combo_randomizer_rom/build.bat b/alttp_sm_combo_randomizer_rom/build.bat
@@ -16,3 +16,5 @@ copy zsm.ips ..\build\zsm.ips > NUL
 
 cd ..
 echo Done
+
+PAUSE
diff --git a/alttp_sm_combo_randomizer_rom/src/credits.asm b/alttp_sm_combo_randomizer_rom/src/credits.asm
@@ -77,8 +77,20 @@ init:
     lda #$0000
     tcd
 
-    ; Start SPC song
-    jsl playmusic
+    ; If previously playing an MSU track, play combo credits MSU track
+    ; Otherwise, play the built in music
+    pha
+    sep #$30
+    lda $2002 : cmp.b #'S' : BNE +
+        LDA $2000 : AND #$08 : CMP #$08 : BEQ +
+            LDA #99 : STA $2004 : STZ $2005 ; Play track 99
+            LDA #1 : STA $2007 ; Sets the track to not repeat
+            LDA #$FF : STA $2006 ; Set to max volume
+            BRA ++
+    + 
+        jsl playmusic
+    ++
+    pla
 
     ; Load credits fonts and palettes into VRAM/CGRAM
     %ai16()

diff --git a/alttp_sm_combo_randomizer_rom/src/main.asm b/alttp_sm_combo_randomizer_rom/src/main.asm
@@ -37,6 +37,7 @@ incsrc "sm/plminject.asm"                   ; Super Metroid PLM Injection
 incsrc "sm/messagebox.asm"                  ; Super Metroid Messagebox improvements
 incsrc "sm/EasierWJ.asm"                    ; Super Metroid Easier Wall Jump by Benox50
 incsrc "sm/Celeste.asm"                     ; Super Metroid Collision Clearance by Benox50
+incsrc "sm/sm_msu.asm"                      ; Super Metroid MSU support
 
 ; --- ALTTP code ---
 incsrc "z3/hirom.asm"	                    ; ALTTP ExHiROM patch
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,5 @@ copy zsm.ips ..\build\zsm.ips > NUL

		cd ..
		echo Done

		PAUSE