diff --git a/Makefile b/Makefile index 2a13332..45a8b71 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ asm: cp res/work.po "$(BUILDDISK)".po >>build/log cp res/_FileInformation.txt build/ >>build/log $(CADIUS) ADDFILE "${BUILDDISK}".po "/MILLION/" "res/PROGRESS" >>build/log + $(CADIUS) ADDFILE "${BUILDDISK}".po "/MILLION/" "res/PREFS" >>build/log $(CADIUS) ADDFILE "${BUILDDISK}".po "/MILLION/" "build/MILLION.SYSTEM" >>build/log for f in res/levels/*; do $(CADIUS) ADDFILE "${BUILDDISK}".po "/MILLION/" "$$f" >>build/log; done diff --git a/res/M.ERROR b/res/M.ERROR index 212ed1a..0c0d73a 100644 Binary files a/res/M.ERROR and b/res/M.ERROR differ diff --git a/res/PREFS b/res/PREFS new file mode 100644 index 0000000..7bc65f1 --- /dev/null +++ b/res/PREFS @@ -0,0 +1 @@ +110 ||| ||+---CHEAT (0/1) |+---SOUND (0/1) +---PREFS VERSION (DO NOT CHANGE) \ No newline at end of file diff --git a/res/levels/A b/res/levels/A index 4e0aea1..34ede3a 100644 --- a/res/levels/A +++ b/res/levels/A @@ -8,14 +8,14 @@ IIAA,CDEL,DASE|CASE,DIAL,IDEA MEUN,THDS,NAOE|MADE,NEON,THUS GTAD,IAEH,MLTM|GLAD,ITEM,MATH CAOF,LELN,DINY|CALF,DENY,LION -VURS,DAYZ,FEZB|DAYS,FUZZ,VERB BIOM,CRTK,FACY|BACK,CITY,FROM MEMU,UGNB,TOLY|MENU,TOMB,UGLY ROSW,DIEM,CHAH|CHEW,DISH,ROAM ECVS,GNIE,AADD|ACID,ENDS,GAVE UAIY,CNTO,TLAL|CLAY,TAIL,UNTO ERKE,HIIT,DDAG|DRAG,EDIT,HIKE -UIIK,KSEP,WHCR|KICK,USER,WHIP,WICK|LETTERS CAN BE REUSED +VURS,DAYZ,FEZB|DAYS,FUZZ,VERB,FURS|LETTERS CAN BE REUSED +UIIK,KSEP,WHCR|KICK,USER,WHIP,WICK IECF,RHET,WTAH|ITCH,REEF,WHAT,WHET AADM,CWMS,SDIE|ADDS,CAME,SWIM,SAME MOUG,SRAH,BUCL|BRAG,MUCH,SOUL,SUCH diff --git a/res/levels/E b/res/levels/E index 3310413..19f23a0 100644 --- a/res/levels/E +++ b/res/levels/E @@ -48,7 +48,7 @@ HOSY,YEKS,RAAP, R |HARP,REAP,ROSY,YAKS,HEAP,HERS AISA,GVOW,RALB,SWAE|AVOW,GALA,RISE,SWAB,GALE,SALE,RILE PLPE,WWOS,SIET,E |EWES,PLOT,SLOT,WIPE,PIES,PIPE JOPN,NTEY,BRAE,SAIP|BRAY,JOIN,NAPE,STEP,SOAP,STAY,NOPE,JAPE,BRAN -TAYS,OUS ,DOI ,F R |DAIS,FUSS,OARS,TOYS,DAYS,OURS,TARS +TAYS,OUS ,DOI ,F R |DAIS,FUSS,OARS,TOYS,DAYS,OURS,TARS,FURS GNAE,MIIB,OKCS,SREM|GRAB,MICE,ONES,SKIM,GRAM,ONCE,ORCS,ORES,GRIM,SKIS GOTE,OLAM, AWN, VUL|GATE,GLUM,GOWN,OVAL,GLUE,GOAL RAAM,JPCD,SYWE,DOEL|DYED,JOWL,RACE,SPAM,ROAD,ROAM,DYAD diff --git a/res/levels/I b/res/levels/I index 5d1cc86..5765332 100644 --- a/res/levels/I +++ b/res/levels/I @@ -71,7 +71,7 @@ ZTME,IONY,C EM, AX, Z |COAX,COME,COZY,ITEM,ZONE,CONE CAIK,ELEE,TWAY, UNS, L|CLAY,EWES,TAIL,TANK,TUNE,CANE,CUES NGOS,FITE,MRAY,C S ,E |CITE,EGOS,FRAY,MISS,NITS,CITY,FITS WOEY,KHSW,TNDT,B UD,H |BODY,HOST,KNEW,THUD,WHEY,THEY -BPAA,AUSP,H RT,S S,F |AURA,BURP,FUSS,HURT,SPAT,SPAS +BPAA,AUSP,H RT,S S,F |AURA,BURP,FUSS,HURT,SPAT,SPAS,FURS BISR,EAWA,TREY,A W,D L|AREA,BAWL,DREW,EASY,TIER,BREW VLAD,SIFS,ATUO,R TL, E|ALTO,RIFE,SITS,STUD,VIAL,SITE AOFS,LACW,GRWT, IE , N |ANEW,ARCS,GIFT,LAWS,LOFT,GOES,GREW,LIES,LIFT,LOWS diff --git a/src/glue.sound.a b/src/glue.sound.a index e0e992e..95055c6 100644 --- a/src/glue.sound.a +++ b/src/glue.sound.a @@ -6,6 +6,7 @@ ; - ReinitSoundAfterPrefChange ; - LoopSound ; - PlaySound +; - PlaySoundToCompletion ; - ErrorSound ; @@ -89,6 +90,29 @@ SoundLibraryDispatch=*+1 + lda KBD Silence rts +PlaySoundToCompletion + pha + lda ED0974+1 + sta @restoreED + lda MBKEYBRANCH+1 + sta @restoreMB + lda #0 + sta ED0974+1 + sta MBKEYBRANCH+1 + pla + jsr PlaySound + php + pha +@restoreED=*+1 + lda #$FD ; SMC + sta ED0974+1 +@restoreMB=*+1 + lda #$FD ; SMC + sta MBKEYBRANCH+1 + pla + plp + rts + InitPuzzleSound lda #$FF sta progressionIndex @@ -122,7 +146,7 @@ PlayNextChord lda ($FE), y tay pla - jsr PlaySound + jsr PlaySoundToCompletion pla tax rts @@ -132,7 +156,7 @@ PlayFinalChord txa pha +LD16 kFinalChord - jsr PlaySound + jsr PlaySoundToCompletion pla tax rts diff --git a/src/mockingduet.a b/src/mockingduet.a index 3d3b399..06eeaef 100644 --- a/src/mockingduet.a +++ b/src/mockingduet.a @@ -93,6 +93,7 @@ W2 DEC TEMP DEX BNE W1 BIT $C000 +MBKEYBRANCH BMI END JMP NEXT diff --git a/src/ui.main.menu.a b/src/ui.main.menu.a index eb42d22..a32a8a7 100644 --- a/src/ui.main.menu.a +++ b/src/ui.main.menu.a @@ -344,18 +344,18 @@ disclaimer !raw "* NOT GUARANTEED, ACTUAL COUNT MAY VARY." worlddescriptions - !raw " 4X3, EASY 0% " - !raw " 5X3, BASIC 0% " - !raw " 6X3, SIMPLE 0% " - !raw " 7X3, RELAXED 0% " - !raw " 4X4, FAIR 0% " - !raw " 5X4, QUICK 0% " - !raw " 6X4, MEDIUM 0% " - !raw " 7X4, AVERAGE 0% " - !raw " 4X5, HARD 0% " - !raw " 5X5, TOUGH 0% " - !raw " 6X5, TRICKY 0% " - !raw " 7X5, COMPLEX 0% " + !raw " 4X3 EASY 0% " + !raw " 5X3 BASIC 0% " + !raw " 6X3 SIMPLE 0% " + !raw " 7X3 RELAXED 0% " + !raw " 4X4 FAIR 0% " + !raw " 5X4 QUICK 0% " + !raw " 6X4 MEDIUM 0% " + !raw " 7X4 AVERAGE 0% " + !raw " 4X5 HARD 0% " + !raw " 5X5 TOUGH 0% " + !raw " 6X5 TRICKY 0% " + !raw " 7X5 COMPLEX 0% " kWorldShortNames !byte 3