From 1e2464e6f42c3ce8a2e272192a0dc8644d54543a Mon Sep 17 00:00:00 2001 From: shoofle Date: Thu, 16 Oct 2025 14:13:37 -0400 Subject: [PATCH] fancying up the shuffle screen so its clearer to users --- Async.inc | 9 ++- ScreenShuffle.inc | 118 +++++++++++++++++++++++++++++++- card_art/coins14king.aseprite | Bin 0 -> 1679 bytes card_art/cups14king.aseprite | Bin 0 -> 1693 bytes card_art/screendesigns.aseprite | Bin 4411 -> 5029 bytes card_art/swords14king.aseprite | Bin 0 -> 1687 bytes card_art/tileset.asm | 46 +++++++++++++ card_art/wands14king.aseprite | Bin 0 -> 1548 bytes source.zip | Bin 648589 -> 651345 bytes swords01ace.inc | 2 +- 10 files changed, 170 insertions(+), 5 deletions(-) create mode 100644 card_art/coins14king.aseprite create mode 100644 card_art/cups14king.aseprite create mode 100644 card_art/swords14king.aseprite create mode 100644 card_art/tileset.asm create mode 100644 card_art/wands14king.aseprite diff --git a/Async.inc b/Async.inc index 24eb7ca..2196c9b 100644 --- a/Async.inc +++ b/Async.inc @@ -7,6 +7,7 @@ vAsyncBC: dw vAsyncPC: dw vAsyncMainSP: dw vAsyncThreadSP: dw +vAsyncIsBusy: db POPS ; canonical ordering to push should be: AF, BC, DE, HL, @@ -26,6 +27,9 @@ Async_Kill: ld [vAsyncThreadSP], a ld a, h ld [vAsyncThreadSP+1], a + + ld a, 0 + ld [vAsyncIsBusy], a ; unset next call ld hl, rIE @@ -140,7 +144,8 @@ Async_Spawn: ld hl, rIF res 1, [hl] ; clear the interrupt so we don't immediately fire it - + ld a, 1 + ld [vAsyncIsBusy], a ; restore main sp ld a, [vAsyncMainSP] @@ -264,6 +269,8 @@ Async_EarlyReturn: ; store side thread SP, so everyone knows that the side thread stack is empty ld [vAsyncThreadSP], sp ; 5 cycles instead of 13 + ld a, 0 + ld [vAsyncIsBusy], a ; unset next call ld hl, rIE diff --git a/ScreenShuffle.inc b/ScreenShuffle.inc index 85a91ef..009d861 100644 --- a/ScreenShuffle.inc +++ b/ScreenShuffle.inc @@ -4,6 +4,8 @@ vState: db ;def vState EQU vAnimationFrame+1 vCurrentAnimation: dw ;def vCurrentAnimation EQU vState+1 ; 2 bytes vShuffleIndex: db ;def vShuffleIndex equ vCurrentAnimation+2 vShuffleTime: dw ;def vShuffleTime equ vShuffleIndex+1 ; 2 bytes +vShuffleCount: db +def cShuffleMax equ 8 ; the number of times you have to shuffle before you've "fully shuffled" POPS def S_Center = 0 @@ -33,6 +35,7 @@ ShuffleSetup: ld a, 0 ld [vAnimationFrame], a + ld [vShuffleCount], a ld a, S_Center ld [vState], a @@ -45,6 +48,8 @@ ShuffleSetup: ld bc, $100 call CopyRange ret + + .asyncTask ld hl, ONES ; origin ld de, _SCRN0 ; destination @@ -58,6 +63,31 @@ ShuffleSetup: ld c, 4 call CopyTilesToMap + ld a, VARIABLE_TILES_START + 9 + + ; draw left arrow + ld [_SCRN0 + 32*8 + 3], a + inc a + ld [_SCRN0 + 32*9 + 3], a + + ; right arrow + inc a + ld [_SCRN0 + 32*8 + 16], a + inc a + ld [_SCRN0 + 32*9 + 16], a + + ; up arrow + inc a + ld [_SCRN0 + 32*2 + 9], a + inc a + ld [_SCRN0 + 32*2 + 10], a + + ; down arrow + inc a + ld [_SCRN0 + 32*15 + 9], a + inc a + ld [_SCRN0 + 32*15 + 10], a + ld hl, Shuffle.UITileData ld de, _VRAM + $1000 + VARIABLE_TILES_START*16 ld bc, Shuffle.UITileDataEnd - Shuffle.UITileData @@ -158,7 +188,6 @@ ShuffleButtonHandler: ret CenterButtonHandler: - call DoSomeShuffling ld hl, rMYBTNP : bit 0, [hl] @@ -184,6 +213,7 @@ RightButtonHandler: : bit 1, [hl] jp z, :+ + call DoSomeShuffling ; shuffle whenever we move into an inward state ld a, S_RightIn ld [vState], a : ret @@ -193,6 +223,7 @@ LeftButtonHandler: : bit 0, [hl] jp z, :+ + call DoSomeShuffling ld a, S_LeftIn ld [vState], a : ret @@ -202,6 +233,7 @@ UpButtonHandler: : bit 3, [hl] jp z, :+ + call DoSomeShuffling ld a, S_UpIn ld [vState], a : ret @@ -211,6 +243,7 @@ DownButtonHandler: : bit 2, [hl] jp z, :+ + call DoSomeShuffling ld a, S_DownIn ld [vState], a : ret @@ -351,7 +384,67 @@ DoSomeShuffling: call OneSwap call OneSwap call OneSwap - call OneSwap + call OneSwap; 10 shuffles + + ld hl, vAsyncIsBusy + xor a, a + cp a, [hl] + ld hl, .asyncTask + call z, Async_Spawn_HL + + ret + + +.asyncTask + ld hl, vShuffleCount + ld a, cShuffleMax + cp a, [hl] + jr z, .lastCharge + jr nc, .addCharge + jr c, .done + .addCharge + inc [hl] + ld b, [hl] + + ld hl, _SCRN0 + 32*13 + ld de, _SCRN0 + 32*13 + 19 + + : ; loop + ld a, l + sub a, 32 + ld l, a + ld a, h + sbc a, 0 + ld h, a + ld [hl], VARIABLE_TILES_START + 17 + + ld a, e + sub a, 32 + ld e, a + ld a, d + sbc a, 0 + ld d, a + ld a, VARIABLE_TILES_START + 17 + ld [de], a + + + dec b + jr nz, :- + jr .done + .lastCharge + ; copy tiles from where they are linearly packed at an origin (hl) + ; to a rectangle in the tilemap in vram (de) + ; assuming it has height in b and width in c. + ld hl, Shuffle.ShuffledPopup + ld de, _SCRN0 + 32*14 + 5 + ld b, 3 + ld c, 11 + call CopyTilesToMap + + ld hl, Shuffle.ShuffledText + ld de, _SCRN0 + 32*15 + 6 + call PrintString + .done ret OneSwap: ; shuffles once and decrements vshuffleindex @@ -459,6 +552,17 @@ Shuffle.UITileData: db $6a,$fd,$6d,$fa,$6a,$fd,$6f,$ff,$60,$ff,$7f,$ff,$7f,$ff,$00,$ff ; bottom-left db $aa,$55,$55,$aa,$aa,$55,$ff,$ff,$00,$ff,$ff,$ff,$ff,$ff,$00,$ff ; bottom-middle db $b6,$5f,$56,$bf,$b6,$5f,$f6,$ff,$06,$ff,$fe,$ff,$fe,$ff,$00,$ff ; bottom-right + + db $60,$1f,$ce,$3f,$d2,$33,$92,$73,$a2,$63,$22,$e3,$4a,$cb,$5a,$db ; arrows, starting at VTS+9 + db $5a,$db,$4a,$cb,$22,$e3,$a2,$63,$92,$73,$d2,$33,$ce,$3f,$60,$1f + db $06,$f8,$73,$fc,$4b,$cc,$49,$ce,$45,$c6,$44,$c7,$52,$d3,$5a,$db ; right arrow + db $5a,$db,$52,$d3,$44,$c7,$45,$c6,$49,$ce,$4b,$cc,$73,$fc,$06,$f8 + db $78,$07,$e3,$1f,$8c,$7c,$31,$f1,$43,$c3,$40,$c0,$7f,$ff,$00,$ff ; up arrow + db $1e,$e0,$c7,$f8,$31,$3e,$8c,$8f,$c2,$c3,$02,$03,$fe,$ff,$00,$ff + db $00,$ff,$7f,$ff,$40,$c0,$43,$c3,$31,$f1,$8c,$7c,$e3,$1f,$78,$07 ; down arrow + db $00,$ff,$fe,$ff,$02,$03,$c2,$c3,$8c,$8f,$31,$3e,$c7,$f8,$1e,$e0 + + db $00,$00,$7e,$7e,$00,$7e,$7e,$00,$7e,$00,$00,$7e,$7e,$7e,$00,$00 ; fill marker Shuffle.UITileDataEnd: Shuffle.BigCard: @@ -470,4 +574,12 @@ def VTS = VARIABLE_TILES_START db VTS+3, VTS+4, VTS+4, VTS+5 db VTS+3, VTS+4, VTS+4, VTS+5 db VTS+3, VTS+4, VTS+4, VTS+5 - db VTS+6, VTS+7, VTS+7, VTS+8 \ No newline at end of file + db VTS+6, VTS+7, VTS+7, VTS+8 + +Shuffle.ShuffledText: + db 9, "Shuffled!" + +Shuffle.ShuffledPopup: + db 9, 2, 2, 2, 2, 2, 2, 2, 2, 2, 8 + db 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4 + db 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 7 \ No newline at end of file diff --git a/card_art/coins14king.aseprite b/card_art/coins14king.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..9c40e8b6e27f841f332b9a1519c4cb57c4863007 GIT binary patch literal 1679 zcmeBYV_R$#ekSy z0c<6bEg(^#OMt}eJ^UGsTn0%7{1*K8fda}3AZ0*97@UC^5zF6V6^ApfeUR;_x*FG>ux#zibdylyMW=pcq+f1+K3Rcn z^^32Mx0WYzZ7+ChwKT-)|7AV@!!*V*FT+cZ0n<`^})>Ti&*l$_)pzfxNlb% z|2h5sqsfh7&&%rGynn2s7uV6jD4HQOJz#5tH2)+X$G1V|mCi0RrMAajJ@zJ&pVR37 zE{jKrjxWmRI?OK>SpR%~;MSMP&wfthOi(#0)%lMtA|$$~NtgAe>*j3<-;K_8^Gb{F zy7Wrnr%jQd`4X?knv3gva?a(?|N3T;PpwvEkN7&rd8(F=E~rQEQrdp{^Xj_=-f!aW zuURj0XXV^E*Cft)%eQQ+GL~B~=f}6)U5Bd=@ZA2bT)uD5+;vPjwfCni^z>`j{V8<+ z+xORdH_W~FS&PGL-qPEv3s~(O<~b&$H)eUpMP0o6?^I3YgeQJVfsyh#+c>$_ESiSQQ!wT5DNYSX)Xq*#N_PsqWsdl6o?981}2yS29OFiXu$*$v;<;S1rUpY;Xhm% zs8Ft$^Y$PkFHrci)5JN%5oYpg}T+D_74i`hVy?Ym3UcUXe{HprI1q)MN9%xpX-xK6j`M{O8 z)bjV0@;@6cxOksqbk09e_ENUwqVxR=)nNDwH;fe@r3OBQJVuaACUTm69MiUBdZ z0@z9`d-yXNxeSsF_$~NP0R@y5K+1rIFt`CR$d%}Nxf#4uD;^U9t3cm8}3u+!hdZl>O!!aQ$H z#f^{m#k|h`c(Ss$bM2<%tOqt;wO4$T?6<8zu%yj9*>3gXNg1oG-5hV5p6u8;&0@QT z)bAyJ+FLFsi>>)rdE(8PnOC0d*8cMFgi42-mtSey)bV~t-|rRezZQ3-xc5aJiaBNH_p_LB2UARw|LNA8{d*7CGM$sXd-jFLL6`saXOq0HT`%Fzyr-fCR%RYcvdoYC2E?I-Es;ALM)}_z$GH7@QK5v(t<6 zOY>47DufxBUD43Yo=4h8`R1&06s|H}h84M6Mw#0o$R1r>8@&$V(LHV|>R zc;+q$Z2$j%>D`0PsY_!Yd~nJaUNj}Bj>W*q|C{62*f%lkJWiSakp6A!h&X z&#qJc-HCT&)temWD#vQVv$w79&d0(dPEoREC0p;gaOYZVaOY8)vc(=R;JF5SJ6nEE4~mtUzPshM-riHA)ae#HjQG=6(q`Yb<}GXO4) BTg(6e literal 0 HcmV?d00001 diff --git a/card_art/screendesigns.aseprite b/card_art/screendesigns.aseprite index 66ab659e9275fab974048bc4878b3444a38ac8b8..d5448e2fee1bfc4a0671b687284a08d49eb298dd 100644 GIT binary patch delta 456 zcmdn3v{apGsqjRmI$l*_28LfB&oQJhFfg3k*n5Pho`aErL0N$n$Y%p$pfm#q5CR3! zz#SmJV$RYKMxnzB9NeG&+xv4EbZ^_8`{o>nx@XthhW|+^8p#LO^q&cBv+!H-=T_Xs z*Umq66a) zE^yv`d02Ses+hOCgN$x)@v>}VtXh3Qdt2w+P2D<^+wT7U^ZmVf=?0@I>%Yw0SN%Jh zJ@tOXsp;1a?|RSm?YTVH^GTl#xz1G0>#ksAX5pATc_Z_Q$$`A5b=81gWl>;eV1ft1 ze;|vCAvmKnEiETiA=DETTv}jNOq-SYOqe7~fE-p}C<-t*F#Kl*a=?I{fpcnNDwH;fe@r3OB`tbuaACUTm69MiUBdZ z0@z9`d-yXNxeSsF_$~O40|k^7K+1rIFt`CR$d%}Nxf#4uD;+WM#)U@`sXAKz zb3V_D7w%7utA70L>pRkBEAdvD!!LRQ!x`R;4RtXSCHddV1~GaXI$CBq-haaVBmU0& zpSeua6CI|%@tQa1;Fs5hC%-z*6hAGo0@`8P}cmc@-I&Fi(xf8{?Dn`FV5Uw40R*COk!n{HLl`~3HZw%BgTJ&GA2 z`wip{=5JF`_E9-;bjgM`jmlGhWA$eA9(4YGHhX4X$=j7~tEQFg->uZ5pDmw$e75)* zRiWO-J0=e6TF$K2>*{l2PbybR$aZEtH~Y}t@aK{-)eGZAgJ&N0&hXD#V;p|?-<~T* zmuild%zSjA;gfo~>#FYfnl+~ro@nd#6~|0`KIz%kx+PKfj!w%k&GpW9V=m|Yy7x>@ z%E}98s*W&RTsW(&^u<~uoqZQ~E)A-@{n|k!Ptz&*(yCottHT#g*}MDv#}56Dj}N?O zHRdFjJ!OuGl=#gBj5q}aAi*%o8V!S?nhunJ4rfu|2RR=K{sU<)2B*a2?DV4i(!3Oi z3SkB&m;wfn3N~o*1QN6aVpatZi-F-kTp6fnu9)-oAR{kO_|Ssy{<(bS3qVSMprM>u zfq{YXB9O@nEj9l$gCszJgF%2nf#LuE|MEai0}wj^u>uf7LB*WXbF5s{SW)t=e5~63(D=` zsqGRvHAA|JHS|h=`4_fn5ers+6}$D~M1A>1XL;5NLkGEJAA=(tmOq}(^?&9blg8k9 tGd$}437*W_+>3`d$p=-6pqb0S+ue`T>{HgpqTia!B2>^UkRF?n% literal 0 HcmV?d00001 diff --git a/card_art/tileset.asm b/card_art/tileset.asm new file mode 100644 index 0000000..a1768bd --- /dev/null +++ b/card_art/tileset.asm @@ -0,0 +1,46 @@ + ; original export script by gabriel reis, modified by shoofle + + +tileset: + + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$ff,$7f,$ff,$7f,$ff,$60,$ff,$6f,$ff,$6d,$fa,$6a,$fd,$6d,$fa + db $00,$ff,$ff,$ff,$ff,$ff,$00,$ff,$ff,$ff,$55,$aa,$aa,$55,$55,$aa + db $00,$ff,$fe,$ff,$fe,$ff,$06,$ff,$f6,$ff,$56,$bf,$b6,$5f,$56,$bf + db $6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa + db $aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa + db $b6,$5f,$56,$bf,$b6,$5f,$56,$bf,$b6,$5f,$56,$bf,$b6,$5f,$56,$bf + db $6a,$fd,$6d,$fa,$6a,$fd,$6f,$ff,$60,$ff,$7f,$ff,$7f,$ff,$00,$ff + db $aa,$55,$55,$aa,$aa,$55,$ff,$ff,$00,$ff,$ff,$ff,$ff,$ff,$00,$ff + db $b6,$5f,$56,$bf,$b6,$5f,$f6,$ff,$06,$ff,$fe,$ff,$fe,$ff,$00,$ff + db $60,$1f,$ce,$3f,$d2,$33,$92,$73,$a2,$63,$22,$e3,$4a,$cb,$5a,$db + db $5a,$db,$4a,$cb,$22,$e3,$a2,$63,$92,$73,$d2,$33,$ce,$3f,$60,$1f + db $06,$f8,$73,$fc,$4b,$cc,$49,$ce,$45,$c6,$44,$c7,$52,$d3,$5a,$db + db $5a,$db,$52,$d3,$44,$c7,$45,$c6,$49,$ce,$4b,$cc,$73,$fc,$06,$f8 + db $78,$07,$e3,$1f,$8c,$7c,$31,$f1,$43,$c3,$40,$c0,$7f,$ff,$00,$ff + db $1e,$e0,$c7,$f8,$31,$3e,$8c,$8f,$c2,$c3,$02,$03,$fe,$ff,$00,$ff + db $00,$ff,$7f,$ff,$40,$c0,$43,$c3,$31,$f1,$8c,$7c,$e3,$1f,$78,$07 + db $00,$ff,$fe,$ff,$02,$03,$c2,$c3,$8c,$8f,$31,$3e,$c7,$f8,$1e,$e0 + db $00,$00,$7e,$7e,$00,$7e,$7e,$00,$7e,$00,$00,$7e,$7e,$7e,$00,$00 + + + +ShuffleUI: + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $01, $02, $03, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $04, $05, $06, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $04, $05, $06, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $04, $05, $06, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $07, $08, $09, $00, $0a, $0c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $0b, $0d, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $0e, $0f, $10, $11, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $12, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 diff --git a/card_art/wands14king.aseprite b/card_art/wands14king.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..7e0751c405b3cd1f1e4a7ba69205e7147f609050 GIT binary patch literal 1548 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 delta 2447 zcmZ`)2~1R16n+2C_8*F%Y*j%97p52k3_=l<#X2@1LZ}igqS2AP;IP*sq9(S{fEJCm zS165b15Ise(2_c_HPu=oW9lB4k~SjyCR?o~HKz2v`-j$Vrjy+HCnxuwci#K=zJL3X z;qcD}=i~&H+KKRA-1(%l&cS6W_H2$VdoK||>*Wd$1gn49ErXWfWuBa|PO5}i!HC>L zg=#v3acN0gPI}n<39c6FsaC6NI$_6eS9I@FY>lf#M_~$2y)QjOeWTG(qJ8w@reFbv$1P z5tP=gy%r%_wqrOc1XZE2)Bw>%k0>u*Y&IbBD-z4ih(5U^>O9eQlfR|1-iwfWFZiZk zv{|bM#0?^3PKx`j2Oo=WlJ&bk#Dh*&MwAP@^xF|S`YBe^E>|>W zYqqUGPHND&%RBRJ(HvcZT=SSFN?zm10_~9OrDL6Tnp`{juC__e`>auW--H#r2DPR* zL_db;)Cq`emAdd)MB)#+g%nXht1f#1qGN-)3|B-plXOFFj@mS- zdJb}icciD@hV@2iZfVggh%P;s=E~@yJDo1;4KJpFa_zi0 zdO%kGay#viRSxZ?<1*S;Pu<;61)AuJnTYORq8)A$Z_m0b4_3p)yR-@xo}r%Bt@mj4 zbe;mk9W)$)p_4`<$myi`Mxb#DbaqmFTcGcvp_sF=i-x___E6VFu^-?@7o95}%7CFR zx=_y-AARG5RjeX}$1I$S%VLIvjM+0_?egjOovj?IF>=w6hV*YH{HAU1iBFZ&RON`+u zIhpHA&Bcxu^Qx%&`~X{shqGd_c@`LF61WeSK_-5y4wej397u>~#NJcwS`rexrYs{n zb4RA7)RFwN_k${aT|)?u84CF^gN}q4nX`=r#rYYIYV&G5o1J5sEf&g`H&Lu3tIW_f zNN1zHNp8>B4BkU_zmW`Vdg}tqDkv;Z$<5C!akRi-+}US4^n~!3PG0<7Zr73I;#^B9 z`&v1ugeImhrV_X|WN*hYzVeX(35r6c**P!GOWH_%n{T5hAv~0)FcBe<^s>Sdqp{GO z?XZQPSJdv?I)@M*Ghg&bY{^jb*gi#PA2UN6^5Di4F~*6cgWx=DZNtK!8{gqU2oGhKIy+Ia z(`=D*7xCP%?%gpOA3}I2_wTKzeE$$TO1*HdES1A8Ti8~4C|`PF6kHs!Pi*@L^ZsBX zJRh;|&S#Vn-*N3c diff --git a/swords01ace.inc b/swords01ace.inc index f893dd9..580ba42 100644 --- a/swords01ace.inc +++ b/swords01ace.inc @@ -3,7 +3,7 @@ Swords01Ace: db 10, "SWORDS " db 10, " " db 10, "triumph " - db 10, "new ideas " + db 10, "excess " db 10, "clarity " db 10, "ACE of "