diff --git a/res/GAMES.CONF b/res/GAMES.CONF index f810869f3..fd4a0480d 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -338,6 +338,7 @@ 00011,POOYAN=Pooyan 01140,PP=Prince of Persia 00010,PULSAR.II=Pulsar II +01101,PUYO.PUYO=Puyo Puyo 00011,QUASAR=Quasar 11110,QIX=Qix 10010,QUADRANT.6112=Quadrant 6112 diff --git a/res/TITLE.DHGR/PUYO.PUYO b/res/TITLE.DHGR/PUYO.PUYO new file mode 100644 index 000000000..aa5778e32 Binary files /dev/null and b/res/TITLE.DHGR/PUYO.PUYO differ diff --git a/res/dsk/puyo puyo no sound 6502 8k file (san inc pack).po b/res/dsk/puyo puyo no sound 6502 8k file (san inc pack).po new file mode 100644 index 000000000..a49467ede Binary files /dev/null and b/res/dsk/puyo puyo no sound 6502 8k file (san inc pack).po differ diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 77239db8a..feed6e089 100644 --- a/src/index/artwork.idx.a +++ b/src/index/artwork.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15236931 + !be24 15262213 !le16 5129 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index 48a5f068d..13949e89e 100644 --- a/src/index/attract.idx.a +++ b/src/index/attract.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15183358 + !be24 15208608 !le16 5642 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index e9ae804b0..d6e6de647 100644 --- a/src/index/cache00.idx.a +++ b/src/index/cache00.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15117610 + !be24 15142784 !le16 4047 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index f2f558ffb..acb6e6b29 100644 --- a/src/index/cache01.idx.a +++ b/src/index/cache01.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15131808 + !be24 15157012 !le16 4466 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 21175cf5b..953e28d95 100644 --- a/src/index/cache10.idx.a +++ b/src/index/cache10.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15149582 + !be24 15174786 !le16 5688 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index 67a279d2f..6d0fdc46c 100644 --- a/src/index/cache11.idx.a +++ b/src/index/cache11.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15169901 + !be24 15195135 !le16 6304 diff --git a/src/index/count01.a b/src/index/count01.a index de38bac8f..a69a8fc7a 100644 --- a/src/index/count01.a +++ b/src/index/count01.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 330 +!word 331 diff --git a/src/index/count11.a b/src/index/count11.a index 2f77dc315..871f806db 100644 --- a/src/index/count11.a +++ b/src/index/count11.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 471 +!word 472 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 70429df80..626b6d685 100644 --- a/src/index/coverfade.idx.a +++ b/src/index/coverfade.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15242060 + !be24 15267342 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index b908efae3..fc4bf35fe 100644 --- a/src/index/credits.idx.a +++ b/src/index/credits.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15242814 + !be24 15268096 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 398182483..952574fb4 100644 --- a/src/index/decrunch.idx.a +++ b/src/index/decrunch.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15243262 + !be24 15268544 !le16 303 diff --git a/src/index/demo.idx.a b/src/index/demo.idx.a index 82c7a739e..4d1f0ee4e 100644 --- a/src/index/demo.idx.a +++ b/src/index/demo.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 12180632 + !be24 12197720 !le16 1652 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index c8226a26f..92bfcd19c 100644 --- a/src/index/dfx.idx.a +++ b/src/index/dfx.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15191640 + !be24 15216890 !le16 1640 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index 22afb04f8..5f511deca 100644 --- a/src/index/dgr.fizzle.idx.a +++ b/src/index/dgr.fizzle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15242546 + !be24 15267828 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index 5a6cdea39..d255a7a15 100644 --- a/src/index/dgr.idx.a +++ b/src/index/dgr.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15236872 + !be24 15262154 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 41222369d..95cf6d439 100644 --- a/src/index/dhgr.idx.a +++ b/src/index/dhgr.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15235338 + !be24 15260620 !le16 1437 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index 39f8ced68..f85df55d7 100644 --- a/src/index/dtitle.idx.a +++ b/src/index/dtitle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15219942 - !le16 537 + !be24 15245208 + !le16 553 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 273e8fbc8..028c61ac1 100644 --- a/src/index/fx.idx.a +++ b/src/index/fx.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15189000 + !be24 15214250 !le16 2640 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index 62d3be4c5..ed2c2fd7b 100644 --- a/src/index/gamehelp.idx.a +++ b/src/index/gamehelp.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15193638 - !le16 7153 + !be24 15218888 + !le16 7169 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index 7f921c8c9..3f4266c74 100644 --- a/src/index/gr.fizzle.idx.a +++ b/src/index/gr.fizzle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15242470 + !be24 15267752 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 2f7604229..38679d852 100644 --- a/src/index/gr.idx.a +++ b/src/index/gr.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15236775 + !be24 15262057 !le16 97 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index a1756d684..b26f43cad 100644 --- a/src/index/helptext.idx.a +++ b/src/index/helptext.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15242613 + !be24 15267895 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index 7f25e48b9..ebd8622df 100644 --- a/src/index/hgr0.idx.a +++ b/src/index/hgr0.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15220479 + !be24 15245761 !le16 4702 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 0c87e9378..4183c7388 100644 --- a/src/index/hgr1.idx.a +++ b/src/index/hgr1.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15225181 + !be24 15250463 !le16 1715 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 564c6fb88..539071135 100644 --- a/src/index/hgr2.idx.a +++ b/src/index/hgr2.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15226896 + !be24 15252178 !le16 1129 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 569de7f3a..a0d65f4b1 100644 --- a/src/index/hgr3.idx.a +++ b/src/index/hgr3.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15228025 + !be24 15253307 !le16 3388 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 615936dc7..33d7c9ebf 100644 --- a/src/index/hgr4.idx.a +++ b/src/index/hgr4.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15231413 + !be24 15256695 !le16 3332 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index 36019c54d..49864cf25 100644 --- a/src/index/hgr5.idx.a +++ b/src/index/hgr5.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15234745 + !be24 15260027 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index d39c50951..8e1ab9cd9 100644 --- a/src/index/hgr6.idx.a +++ b/src/index/hgr6.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15235224 + !be24 15260506 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index 36bba6b83..7a1c6a092 100644 --- a/src/index/joystick.idx.a +++ b/src/index/joystick.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15243565 + !be24 15268847 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index f09086c87..e4959d5c3 100644 --- a/src/index/miniattract0.idx.a +++ b/src/index/miniattract0.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15206103 + !be24 15231369 !le16 4741 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index ac3079383..046406b55 100644 --- a/src/index/miniattract1.idx.a +++ b/src/index/miniattract1.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15210844 + !be24 15236110 !le16 2400 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 26725c9af..03ca1ff43 100644 --- a/src/index/prelaunch.idx.a +++ b/src/index/prelaunch.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15176205 - !le16 7153 + !be24 15201439 + !le16 7169 diff --git a/src/index/res.cover.idx.a b/src/index/res.cover.idx.a index 3c5d0ee7d..907d6d4d2 100644 --- a/src/index/res.cover.idx.a +++ b/src/index/res.cover.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 4040192 + !be24 4056576 !le16 8192 diff --git a/src/index/res.help.idx.a b/src/index/res.help.idx.a index 5b0c58151..33ba231b4 100644 --- a/src/index/res.help.idx.a +++ b/src/index/res.help.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 4056576 + !be24 4072960 !le16 8192 diff --git a/src/index/res.title.idx.a b/src/index/res.title.idx.a index 8c70ab45e..b804220a6 100644 --- a/src/index/res.title.idx.a +++ b/src/index/res.title.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 4048384 + !be24 4064768 !le16 8192 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 5b5e1b3b6..6d14441e8 100644 --- a/src/index/search00.idx.a +++ b/src/index/search00.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15108333 + !be24 15133507 !le16 9277 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index 1a6cf9762..bbc6cecfd 100644 --- a/src/index/search01.idx.a +++ b/src/index/search01.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15121657 - !le16 10151 + !be24 15146831 + !le16 10181 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index ff09c496b..d8fa58659 100644 --- a/src/index/search10.idx.a +++ b/src/index/search10.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15136274 + !be24 15161478 !le16 13308 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 2baa55af4..566cae78d 100644 --- a/src/index/search11.idx.a +++ b/src/index/search11.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15155270 - !le16 14631 + !be24 15180474 + !le16 14661 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index a73e71b96..45425078e 100644 --- a/src/index/sfx.idx.a +++ b/src/index/sfx.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15193280 + !be24 15218530 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index fea7fd03f..613069741 100644 --- a/src/index/slideshow.idx.a +++ b/src/index/slideshow.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15200791 + !be24 15226057 !le16 5312 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index 3b257aa82..88c696759 100644 --- a/src/index/title.idx.a +++ b/src/index/title.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15213244 + !be24 15238510 !le16 6698 diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a index 04ea8764c..630a2442f 100644 --- a/src/index/xsingle.idx.a +++ b/src/index/xsingle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15104346 - !le16 3987 + !be24 15129502 + !le16 4005 diff --git a/src/prelaunch/puyo.puyo.a b/src/prelaunch/puyo.puyo.a new file mode 100644 index 000000000..9ae17e8ee --- /dev/null +++ b/src/prelaunch/puyo.puyo.a @@ -0,0 +1,22 @@ +;license:MIT +;(c) 2023 by qkumba + +!cpu 6502 +!to "build/PRELAUNCH.INDEXED/PUYO.PUYO",plain +*=$106 + + !source "src/prelaunch/common.a" + + +ENABLE_ACCEL + +LC_REBOOT + + lda #$4C + sta $7E7B + jsr $6000 ; decompress + + jsr DisableAccelerator + jmp $7E7E + +!if * > $1C0 { + !error "code is too large, ends at ", * +}