add Mix Matcher

res/ATTRACT/MIX.MATCHER

@@ -0,0 +1,8 @@
+#
+# Attract mode for MIX.MATCHER
+# This file is automatically generated
+#
+
+MIX.MATCHER=A
+
+[eof]

res/GAMEHELP/MIX.MATCHER

@@ -0,0 +1,21 @@
+
+
+
+       Fill the grid with shapes
+
+        that match on all sides
+
+
+
+      joystick, keyboard, or mouse
+
+
+
+      Select shape by letter, then
+
+      select destination by letter
+
+
+
+Esc* * * * * * * * * * * * * * * * *quit
+[eof]

res/GAMES.CONF

@@ -53,6 +53,7 @@
 00001,MICROGOLF=Micro Golf
 00001,MICROCHESS=MicroChess
 00000,MPL=Million Perfect Letters
+00001,MIX.MATCHER=Mix Matcher
 00001,MU.TORERE=Mu Torere
 00001,NIMWIT=Nimwit
 00001,NINE.MENS=Nine Men's Morris

res/SS/ACTBOARD.CONF

@@ -14,6 +14,7 @@ NINE.MENS
 PENSATE
 MAGNET.MADNESS
 GO
+MIX.MATCHER
 WARI
 FOX.AND.GEESE
 

res/SS/ACTGM.CONF

@@ -10,6 +10,8 @@ MICROGOLF2=MICROGOLF
 HIRES.SOCCER
 MPL
 INTL.GRAN.PRIX
+MAGNET.MADNESS
+MIX.MATCHER
 GO
 HARDBALL
 MICROGOLF3=MICROGOLF

res/SS/ACTNZ.CONF

@@ -10,7 +10,6 @@ NIMWIT
 THE.DAM.BUSTERS
 WARI
 ONE.ON.ONE
-MAGNET.MADNESS
 AMER.CHALLENGE
 MU.TORERE
 TAG.TEAM

res/SS/CATBOARD.CONF

@@ -11,6 +11,7 @@ MU.TORERE
 REVERSI
 GO
 MAGNET.MADNESS
+MIX.MATCHER
 CHECKERS
 SEEGA
 NINE.MENS

res/SS/TITLEDM.CONF

@@ -7,6 +7,7 @@ FIGHT.NIGHT
 FORMULA.1.RACER
 MU.TORERE
 INTL.GRAN.PRIX
+MIX.MATCHER
 MICROGOLF
 HIRES.FOOTBALL
 FOX.AND.GEESE
@@ -14,6 +15,7 @@ MPL
 HARDBALL
 GO
 FS2
+MAGNET.MADNESS
 DIVE.BOMBER
 KONO
 HIRES.SOCCER

res/SS/TITLENZ.CONF

@@ -4,7 +4,6 @@
 
 TOMAHAWK
 WINTER.GAMES
-MAGNET.MADNESS
 WORLD.KARATE
 TAG.TEAM
 PENSATE

res/history.md

@@ -16,6 +16,7 @@
 - Micro Golf
 - MicroChess
 - Million Perfect Letters
+- Mix Matcher
 - Mu Torere
 - Nimwit
 - Nine Men's Morris

res/notes/wishlist.txt

@@ -90,7 +90,6 @@ Place Ball
 Slide Glide
 Zig Zag Flag Shag
 Fuelish Future
-Mix Matcher
 Lumber Jack Crash
 Jump Pit
 Weights and Treasure [has construction kit]

res/ports/mix-matcher/Makefile

@@ -0,0 +1,55 @@
+# https://sourceforge.net/projects/acme-crossass/
+ACME=acme
+
+# https://github.com/mach-kernel/cadius
+CADIUS=cadius
+
+EXOMIZER=exomizer mem -lnone -P23 -f -q
+
+BUILDDIR=build
+DISKVOLUME=MIX.MATCHER
+LOADER=$(BUILDDIR)/LOADER.SYSTEM\#FF2000
+EXE=$(BUILDDIR)/MIX.MATCHER\#068000
+COMPRESSED1=src/OBJ1.X
+COMPRESSED2=src/OBJ2.X
+SOURCES=$(wildcard src/*.a) $(COMPRESSED1) $(COMPRESSED2)
+RES=$(wildcard res/*) $(wildcard ../common/res/*)
+BUILDDISK=$(BUILDDIR)/$(DISKVOLUME).po
+
+.PHONY: clean mount all
+
+$(BUILDDISK): $(EXE) $(LOADER) $(RES)
+
+$(LOADER): $(SOURCES) | $(BUILDDIR)
+	$(ACME) src/loader.a
+	$(CADIUS) REPLACEFILE "$(BUILDDISK)" "/$(DISKVOLUME)/" "$(LOADER)" -C
+	@touch "$@"
+
+$(EXE): $(SOURCES) $(COMPRESSED1) $(COMPRESSED2) | $(BUILDDIR)
+	$(ACME) src/mix.matcher.a
+	$(CADIUS) REPLACEFILE "$(BUILDDISK)" "/$(DISKVOLUME)/" "$(EXE)" -C
+	@touch "$@"
+
+$(RES): $(BUILDDIR)
+	$(CADIUS) REPLACEFILE "$(BUILDDISK)" "/$(DISKVOLUME)/" "$@" -C
+	@touch "$@"
+
+$(COMPRESSED1):
+	$(EXOMIZER) src/OBJ1@0x0900 -o "$@"
+
+$(COMPRESSED2):
+	$(EXOMIZER) src/OBJ2@0x5000 -o "$@"
+
+mount: $(BUILDDISK)
+	@open "$(BUILDDISK)"
+
+clean:
+	rm -rf "$(BUILDDIR)"
+
+$(BUILDDIR):
+	mkdir -p "$@"
+	$(CADIUS) CREATEVOLUME "$(BUILDDISK)" "$(DISKVOLUME)" 140KB -C
+
+all: clean mount
+
+.NOTPARALLEL:

res/ports/mix-matcher/src/loader.a

@@ -0,0 +1,25 @@
+!cpu 6502
+*=$2000
+!to "build/LOADER.SYSTEM#FF2000",plain
+
+         !src  "../common/src/constants.a"
+         !src  "../common/src/macros.a"
+
+         +READ_ENTIRE_FILE parm_boot_open, parm_boot_read
+         jmp   (entry)
+
+parm_boot_open
+         !byte 3
+         !word filename
+         !word $2100
+         !byte 0
+
+parm_boot_read
+         !byte 4
+         !byte 1
+entry    !word $8000
+         !word $FFFF
+         !word 0
+
+filename
+         !text 11,"MIX.MATCHER"

res/ports/mix-matcher/src/mix.matcher.a

@@ -0,0 +1,41 @@
+!cpu 6502
+*=$8000
+!to "build/MIX.MATCHER#068000",plain
+
+         !src  "../common/src/constants.a"
+         !src  "../common/src/macros.a"
+
+         jmp   start
+
+compressed_data
+         !bin "src/OBJ1.X"
+         !bin "src/OBJ2.X"
+FORWARD_DECRUNCHING = 1
+SHOW_PROGRESS_DURING_DECRUNCH = 1
+kExoProgressWidth = 7               ; depends on total size, max 38
+         !src  "../common/src/exodecrunch.a"
+
+start
+         +INIT_MACHINE
+         jsr   decrunch              ; compressed data contains target address
+         bit   GFXMODE
+         bit   PAGE1
+         bit   HIRES
+         bit   FULLGFX
+         jsr   decrunch_no_reset_progress
+!if * != $B1A0 {
+  !serious "Adjust prelaunch to patch JSR at ", *
+}
+         jsr   $900
+         bit   CLEARKBD
+         jsr   PRODOS_MLI
+         !byte CMD_QUIT
+         !word +
++        !byte 4
+
+get_crunched_byte
+         lda   compressed_data
+         inc   get_crunched_byte+1
+         bne   +
+         inc   get_crunched_byte+2
++        rts

src/index/artwork.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2268284
+         !be24  2290255
          !le16      571

src/index/attract.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2255187
+         !be24  2277086
          !le16      978

src/index/cache00.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2245461
+         !be24  2267156
-         !le16      399
+         !le16      420

src/index/cache01.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2247529
+         !be24  2269279
-         !le16      706
+         !le16      727

src/index/cache10.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2249931
+         !be24  2271736
-         !le16      633
+         !le16      654

src/index/cache11.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2253017
+         !be24  2274877
-         !le16      988
+         !le16     1009

src/index/count00.a

@@ -3,4 +3,4 @@
 ;
 ; This file is automatically generated
 ;
-!word       32
+!word       33

src/index/count01.a

@@ -3,4 +3,4 @@
 ;
 ; This file is automatically generated
 ;
-!word       47
+!word       48

src/index/count10.a

@@ -3,4 +3,4 @@
 ;
 ; This file is automatically generated
 ;
-!word       49
+!word       50

src/index/count11.a

@@ -3,4 +3,4 @@
 ;
 ; This file is automatically generated
 ;
-!word       68
+!word       69

src/index/coverfade.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2268855
+         !be24  2290826
          !le16      306

src/index/credits.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2269505
+         !be24  2291476
          !le16      336

src/index/decrunch.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2269841
+         !be24  2291812
          !le16      303

src/index/demo.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  1816154
+         !be24  1825066
          !le16       69

src/index/dfx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2258805
+         !be24  2280704
          !le16     1640

src/index/dgr.fizzle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2269237
+         !be24  2291208
          !le16       67

src/index/dgr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2268272
+         !be24  2290243
          !le16       12

src/index/dhgr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2267382
+         !be24  2289353
          !le16      838

src/index/dtitle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2265260
+         !be24  2287213
          !le16      271

src/index/fx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2256165
+         !be24  2278064
          !le16     2640

src/index/gamehelp.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2260803
+         !be24  2282702
-         !le16     1182
+         !le16     1200

src/index/gr.fizzle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2269161
+         !be24  2291132
          !le16       76

src/index/gr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2268220
+         !be24  2290191
          !le16       52

src/index/helptext.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2269304
+         !be24  2291275
          !le16      201

src/index/hgr0.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2265531
+         !be24  2287484
          !le16      383

src/index/hgr1.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2265914
+         !be24  2287867
          !le16      138

src/index/hgr2.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2266052
+         !be24  2288005
          !le16       92

src/index/hgr3.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2266144
+         !be24  2288097
-         !le16      236
+         !le16      254

src/index/hgr4.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2266380
+         !be24  2288351
          !le16      713

src/index/hgr5.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2267093
+         !be24  2289064
          !le16      285

src/index/hgr6.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2267378
+         !be24  2289349
          !le16        4

src/index/joystick.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2270144
+         !be24  2292115
          !le16     2370

src/index/miniattract0.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2263105
+         !be24  2285022
-         !le16      660
+         !le16      678

src/index/miniattract1.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2263765
+         !be24  2285700
          !le16      526

src/index/prelaunch.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2254005
+         !be24  2275886
-         !le16     1182
+         !le16     1200

src/index/res.cover.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24   652331
+         !be24   660011
          !le16     8184

src/index/res.help.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24   668707
+         !be24   676387
          !le16     8184

src/index/res.title.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24   660515
+         !be24   668195
          !le16     8192

src/index/search00.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2244397
+         !be24  2266058
-         !le16     1064
+         !le16     1098

src/index/search01.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2245860
+         !be24  2267576
-         !le16     1669
+         !le16     1703

src/index/search10.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2248235
+         !be24  2270006
-         !le16     1696
+         !le16     1730

src/index/search11.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2250564
+         !be24  2272390
-         !le16     2453
+         !le16     2487

src/index/sfx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2260445
+         !be24  2282344
          !le16      358

src/index/slideshow.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2261985
+         !be24  2283902
          !le16     1120

src/index/title.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2264291
+         !be24  2286226
-         !le16      969
+         !le16      987

src/index/xsingle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  2243842
+         !be24  2265483
-         !le16      555
+         !le16      575