From d80a3f39e66c48019934006ee0e8d83ca801eb7c Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Thu, 21 Apr 2016 16:49:33 +1000 Subject: [PATCH] refactor towards single sprite map --- 028.game2/Makefile | 21 +- 028.game2/assets/assets.png | Bin 0 -> 10092 bytes 028.game2/assets/foreground.png | Bin 4548 -> 5008 bytes 028.game2/assets/foregroundTilemap.png | Bin 5008 -> 0 bytes 028.game2/assets/sprite_coin1.png | Bin 1292 -> 0 bytes 028.game2/assets/sprite_coin2.png | Bin 1277 -> 0 bytes 028.game2/assets/sprite_coin3.png | Bin 1249 -> 0 bytes 028.game2/assets/sprite_coin4.png | Bin 1233 -> 0 bytes 028.game2/assets/sprite_coin6.png | Bin 1278 -> 0 bytes 028.game2/assets/sprite_coin7.png | Bin 1289 -> 0 bytes 028.game2/constants.i | 10 +- 028.game2/copperlist.s | 516 ------------------------- 028.game2/game1.s | 2 +- 028.game2/items.s | 40 +- 028.game2/macros.i | 34 +- tools/croppa/croppa.c | 10 +- 16 files changed, 68 insertions(+), 565 deletions(-) create mode 100644 028.game2/assets/assets.png delete mode 100644 028.game2/assets/foregroundTilemap.png delete mode 100644 028.game2/assets/sprite_coin1.png delete mode 100644 028.game2/assets/sprite_coin2.png delete mode 100644 028.game2/assets/sprite_coin3.png delete mode 100644 028.game2/assets/sprite_coin4.png delete mode 100644 028.game2/assets/sprite_coin6.png delete mode 100644 028.game2/assets/sprite_coin7.png delete mode 100644 028.game2/copperlist.s diff --git a/028.game2/Makefile b/028.game2/Makefile index db79c5b..745e852 100644 --- a/028.game2/Makefile +++ b/028.game2/Makefile @@ -25,12 +25,10 @@ IMAGES=foreground.png \ sprite_pig_up_jump.png \ sprite_pig_down_jump.png \ sprite_pig_right_jump.png \ - sprite_coin1.png \ - sprite_coin2.png \ - sprite_coin3.png \ - sprite_coin4.png \ - sprite_coin6.png \ - sprite_coin7.png \ + sprite_coin-0.png \ + sprite_coin-1.png \ + sprite_coin-2.png \ + sprite_coin-3.png\ font8x8.png IMAGEDATA=$(addprefix out/, $(IMAGES:.png=.bin)) @@ -42,10 +40,10 @@ LINKER_OPTIONS=-T link.script.x include ../shared/base.mk -out/%.bin: out/%.sized.png - $(IMAGECON) --input $< $(IMAGECON_ARGS) --quantize --colors $(NUM_COLORS) --output-bitplanes --output-palette-asm --output-grey-palette --output-palette $(DITHER) --output out/$* +#out/%.bin: out/%.sized.png +# $(IMAGECON) --input $< $(IMAGECON_ARGS) --quantize --colors $(NUM_COLORS) --output-bitplanes --output-palette-asm --output-grey-palette --output-palette $(DITHER) --output out/$* -out/foreground.bin: assets/foregroundTilemap.png +out/foreground.bin: assets/foreground.png $(IMAGECON) --use-palette=assets/foreground.pal --input $< $(IMAGECON_ARGS) --colors $(NUM_COLORS) --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-grey-palette --output-palette --output-png --output-copperlist --output out/foreground sed -i '' "1s/.*/ dc.w COLOR00,\$$$(BACKGROUND_COLOR)/" out/foreground-copper-list.s sed -i '' "1s/.*/ dc.w \$$$(BACKGROUND_COLOR)/" out/foreground-palette-table.s @@ -63,9 +61,12 @@ out/mpanel.bin: assets/mpanel.png out/sprite_pig_%.bin: assets/sprite_pig_%.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 4 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output out/sprite_pig_$* --palette-offset 16 --use-palette=assets/pig.pal -out/sprite_coin%.bin: assets/sprite_coin%.png +out/sprite_coin%.bin: out/sprite_coin%.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 4 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output out/sprite_coin$* --palette-offset 20 --use-palette=assets/coin.pal +out/sprite_coin%.png: assets/assets.png + ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_coin --width=16 --height=16 --rows=1 --cols=4 --dx=16 --dy=16 --x=128 --y=192 + out/font%.bin: assets/font%.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --output-bitplanes --output-grey-palette-asm --output-palette-asm --output-palette --output out/font$* --colors=16 --use-palette assets/mpanel.pal --full-color-palette-file --output-mask --transparent-color=0,0,0 --output-png diff --git a/028.game2/assets/assets.png b/028.game2/assets/assets.png new file mode 100644 index 0000000000000000000000000000000000000000..89d6b3865baae19042fa724a159b866284e94a3e GIT binary patch literal 10092 zcmcIqWmuD6*x$yKl14&mqg6_f5*eeU1wAKzUU*LCmNdCs}(ch@08>!}hM$sH092t=l$tnds30waMx5YbKGNlRC8 z2M7cudo3@or6Mm6({g_M>b1Q!2qY05t!rw_tV@fibFtyz?9;J-7~=X}hK!3WQSV`P zMXlfTw3tJRir6Iks@2g}--lm)5+ZdM*_w)4J`dJE(Y7^K`NMb*DR77i!DJGy$zd2T zqT(b-Yc(=wBTY&q?R9PGjP;h!e#Um@yR90V?Hj8#KMYdhX~A?Ki}>k<=Uu{L!=>-X z1&3wP-^|w6X1Q;grw$R*B=x8?o|SKTXErf1eTgZodctxW=EP=EzWkjuJQlo@tJ~ua z_QuDv$*dc(9$BnbJwUbzdRPCo9BXw!_(s2ewa7O=6n;Zj=S_GjWo&Qz$&*`W4@ySO zvNYao{8(N3Z1Kr$I;+%i`{gAD)odHGk7~{BPs1RBw_lo^-52Fr`K#Tg_9FrFkF8ZAn5!x9e`ESi?g8EEAyA7Q>v5%jBoBNsrU&bd?7a$TrfrDtoEzjq8A@#Q={9! z2RzHVQYepf_AfTPnXerctvShGv%Ybv-QGvM{#Dt?sM1XBCDBq$|5~ z9#cR!WWAdoVq!@nO^9QBMT*zYtbAigywQvwOXNtZ|gcTt;KHjUQLFSA6kU zeDvaHl*qH3Pm0r$6?IwWS0eY+O?1Wz_{g!L96fi>ZkX1ecbJu$tnrC!W9Jz&YW4e0 z%}zJYg^%u^zxg`nx2V5c<=ko1TUVyux@m9V;-Py7b#sAk=TBODL_5pA)9#`^#S`C@ zUui4F2d0k=-wKdFDM-D6e{-tG_%vFf;2`KAtb(te2hDrYQU4p=jsA`9LpPg3;-z{r z78?EvII_8zbsW9fzhgA}j?Rmr%4RLau0R#eVSk&I&bdYGul7sfJ)T=cmU7zT0V#zW zXLK0BOlcN!OSa|QGm{1ZJ#fTXDda%oQdjr+nq$&k7QMF`5)HC6QJnHtQAuLYkE`|f zv)Pk1m!7?*)REGm$txX}r3fp}anC|Q&dymz@*K*Ztq)qxpdp4sj~q70e&6;`8%(sg zQ!I8b<>UHl_;-fTF7+5&ov=xi5z~$BnS1Vf^8f11i&jjXUDnKdB z{sEmF4h;R>gfllJ_Jb$OaLp|7%08rX!^fLPjd)>C-;3e3sWz8_6@LFpajA^P*=^TR z1oA2$WE1TN&cgWUYMEcY1%Wv3s3^!j_XPhlHSOZI@yc{d9r$2$yQ(9H_n)?$oX$sB zWk-oO=UvW$Xx4)+);8K$qji$xiih8B%j)MT1#Zc1sAPY8s)p-&q-0}$mB7BMz23Z4elEkkug^t#+R?lPGl}+WN`b3zs%4JFFr-DQF&%m zpW~Cuqiyu_&R83qFAk^%IjCR|1#?blU-<6Dd5u>DC zm|gg7KM~pA2nYp*%ss8&Cv)RInSWuZD<~%6Q{|mkTfSa3GEI_|&O`Nq8eCV1ZK(N; z4d1L{g3t!m9ZQY<*w!0kOJcv=sWBT~tiA<_vQFq_K5hir*HD$T4TdO(mi�sh5Wj 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 B0kZ%A literal 0 HcmV?d00001 diff --git a/028.game2/assets/foreground.png b/028.game2/assets/foreground.png index e45df48cb07c389b6f60ce1442848c5501b740d5..798d77b5349a463687313bda0d7f1c5414e2c64f 100644 GIT binary patch literal 5008 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 delta 3499 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 diff --git a/028.game2/assets/sprite_coin1.png b/028.game2/assets/sprite_coin1.png deleted file mode 100644 index a8e9833b7d79e19da0aafb396991b1ea2c0d0778..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1292 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 diff --git a/028.game2/assets/sprite_coin3.png b/028.game2/assets/sprite_coin3.png deleted file mode 100644 index ac294d92250ae9f8a6e5aecb99fa84937047b8e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1249 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 diff --git a/028.game2/assets/sprite_coin7.png b/028.game2/assets/sprite_coin7.png deleted file mode 100644 index 1be5a52e1dc64dd6cc609adcd8c1612c0efeb506..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1289 zcmV+k1@`)hP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q zw@E}nR5%f(Qd<&(FbIU&pEllBkKu9Ke$^t7hiOPs$7Tkz!tNR{2mr)!dRN;UAC^~uV=iu>f00000NkvXXu0mjfePDJq diff --git a/028.game2/constants.i b/028.game2/constants.i index 0ca16d4..56ffc1c 100644 --- a/028.game2/constants.i +++ b/028.game2/constants.i @@ -18,16 +18,20 @@ FOREGROUND_PLAYAREA_RIGHT_MARGIN_BYTES equ 12 FOREGROUND_PLAYAREA_HEIGHT_WORDS equ 8 ITEM_SPRITE_HEIGHT equ 15 -ITEM_SPRITE_NUM_VERTICAL_SPRITES equ 8 +ITEM_SPRITE_NUM_VERTICAL_SPRITES equ 6 ITEM_SPRITE_BYTES equ (ITEM_SPRITE_NUM_VERTICAL_SPRITES*(64+4))+4 - +ITEM_SPRITE_VSTART equ 149 + ITEM_X equ 0 ITEM_LAGX equ 2 ITEM_Y equ 4 ITEM_LAGY equ 6 ITEM_YEND equ 8 ITEM_LAGYEND equ 10 -ITEM_INDEX equ 12 +ITEM_INDEX equ 12 +ITEM_STRUCT_SIZE equ 16 +ITEM_STRUCT_MULU_SHIFT equ 4 +ITEM_NUM_COIN_ANIMS equ 7 SCREEN_WIDTH equ 320 SCREEN_HEIGHT equ 256 diff --git a/028.game2/copperlist.s b/028.game2/copperlist.s deleted file mode 100644 index 861bad4..0000000 --- a/028.game2/copperlist.s +++ /dev/null @@ -1,516 +0,0 @@ - dc.w $2c07,$fffe - dc.w COLOR01,$7dd - dc.w $2d07,$fffe - dc.w COLOR01,$9ec - dc.w $2e07,$fffe - dc.w COLOR01,$beb - dc.w $2f07,$fffe - dc.w COLOR01,$ce9 - dc.w $3007,$fffe - dc.w COLOR01,$ed7 - dc.w $3107,$fffe - dc.w COLOR01,$eb5 - dc.w $3207,$fffe - dc.w COLOR01,$e93 - dc.w $3307,$fffe - dc.w COLOR01,$d71 - dc.w $3407,$fffe - dc.w COLOR01,$c50 - dc.w $3507,$fffe - dc.w COLOR01,$a30 - dc.w $3607,$fffe - dc.w COLOR01,$820 - dc.w $3707,$fffe - dc.w COLOR01,$611 - dc.w $3807,$fffe - dc.w COLOR01,$403 - dc.w $3907,$fffe - dc.w COLOR01,$204 - dc.w $3a07,$fffe - dc.w COLOR01,$116 - dc.w $3b07,$fffe - dc.w COLOR01,$029 - dc.w $3c07,$fffe - dc.w COLOR01,$04a - dc.w $3d07,$fffe - dc.w COLOR01,$16c - dc.w $3e07,$fffe - dc.w COLOR01,$28d - dc.w $3f07,$fffe - dc.w COLOR01,$3ae - dc.w $4007,$fffe - dc.w COLOR01,$5ce - dc.w $4107,$fffe - dc.w COLOR01,$7dd - dc.w $4207,$fffe - dc.w COLOR01,$9ec - dc.w $4307,$fffe - dc.w COLOR01,$beb - dc.w $4407,$fffe - dc.w COLOR01,$de9 - dc.w $4507,$fffe - dc.w COLOR01,$ed6 - dc.w $4607,$fffe - dc.w COLOR01,$eb4 - dc.w $4707,$fffe - dc.w COLOR01,$e93 - dc.w $4807,$fffe - dc.w COLOR01,$d71 - dc.w $4907,$fffe - dc.w COLOR01,$c50 - dc.w $4a07,$fffe - dc.w COLOR01,$a30 - dc.w $4b07,$fffe - dc.w COLOR01,$820 - dc.w $4c07,$fffe - dc.w COLOR01,$611 - dc.w $4d07,$fffe - dc.w COLOR01,$403 - dc.w $4e07,$fffe - dc.w COLOR01,$204 - dc.w $4f07,$fffe - dc.w COLOR01,$117 - dc.w $5007,$fffe - dc.w COLOR01,$029 - dc.w $5107,$fffe - dc.w COLOR01,$04b - dc.w $5207,$fffe - dc.w COLOR01,$16c - dc.w $5307,$fffe - dc.w COLOR01,$28d - dc.w $5407,$fffe - dc.w COLOR01,$3ae - dc.w $5507,$fffe - dc.w COLOR01,$5ce - dc.w $5607,$fffe - dc.w COLOR01,$7dd - dc.w $5707,$fffe - dc.w COLOR01,$9ec - dc.w $5807,$fffe - dc.w COLOR01,$bea - dc.w $5907,$fffe - dc.w COLOR01,$de8 - dc.w $5a07,$fffe - dc.w COLOR01,$ed6 - dc.w $5b07,$fffe - dc.w COLOR01,$eb4 - dc.w $5c07,$fffe - dc.w COLOR01,$e93 - dc.w $5d07,$fffe - dc.w COLOR01,$d71 - dc.w $5e07,$fffe - dc.w COLOR01,$c50 - dc.w $5f07,$fffe - dc.w COLOR01,$a30 - dc.w $6007,$fffe - dc.w COLOR01,$820 - dc.w $6107,$fffe - dc.w COLOR01,$601 - dc.w $6207,$fffe - dc.w COLOR01,$403 - dc.w $6307,$fffe - dc.w COLOR01,$205 - dc.w $6407,$fffe - dc.w COLOR01,$117 - dc.w $6507,$fffe - dc.w COLOR01,$029 - dc.w $6607,$fffe - dc.w COLOR01,$04b - dc.w $6707,$fffe - dc.w COLOR01,$16c - dc.w $6807,$fffe - dc.w COLOR01,$28d - dc.w $6907,$fffe - dc.w COLOR01,$3ae - dc.w $6a07,$fffe - dc.w COLOR01,$5ce - dc.w $6b07,$fffe - dc.w COLOR01,$7dd - dc.w $6c07,$fffe - dc.w COLOR01,$9ec - dc.w $6d07,$fffe - dc.w COLOR01,$bea - dc.w $6e07,$fffe - dc.w COLOR01,$de8 - dc.w $6f07,$fffe - dc.w COLOR01,$ec6 - dc.w $7007,$fffe - dc.w COLOR01,$eb4 - dc.w $7107,$fffe - dc.w COLOR01,$e92 - dc.w $7207,$fffe - dc.w COLOR01,$d71 - dc.w $7307,$fffe - dc.w COLOR01,$b50 - dc.w $7407,$fffe - dc.w COLOR01,$a30 - dc.w $7507,$fffe - dc.w COLOR01,$810 - dc.w $7607,$fffe - dc.w COLOR01,$601 - dc.w $7707,$fffe - dc.w COLOR01,$403 - dc.w $7807,$fffe - dc.w COLOR01,$205 - dc.w $7907,$fffe - dc.w COLOR01,$117 - dc.w $7a07,$fffe - dc.w COLOR01,$029 - dc.w $7b07,$fffe - dc.w COLOR01,$04b - dc.w $7c07,$fffe - dc.w COLOR01,$16c - dc.w $7d07,$fffe - dc.w COLOR01,$28d - dc.w $7e07,$fffe - dc.w COLOR01,$3ae - dc.w $7f07,$fffe - dc.w COLOR01,$5ce - dc.w $8007,$fffe - dc.w COLOR01,$7dd - dc.w $8107,$fffe - dc.w COLOR01,$aec - dc.w $8207,$fffe - dc.w COLOR01,$bea - dc.w $8307,$fffe - dc.w COLOR01,$dd8 - dc.w $8407,$fffe - dc.w COLOR01,$ec6 - dc.w $8507,$fffe - dc.w COLOR01,$eb4 - dc.w $8607,$fffe - dc.w COLOR01,$e92 - dc.w $8707,$fffe - dc.w COLOR01,$d71 - dc.w $8807,$fffe - dc.w COLOR01,$b50 - dc.w $8907,$fffe - dc.w COLOR01,$a30 - dc.w $8a07,$fffe - dc.w COLOR01,$810 - dc.w $8b07,$fffe - dc.w COLOR01,$501 - dc.w $8c07,$fffe - dc.w COLOR01,$303 - dc.w $8d07,$fffe - dc.w COLOR01,$205 - dc.w $8e07,$fffe - dc.w COLOR01,$117 - dc.w $8f07,$fffe - dc.w COLOR01,$029 - dc.w $9007,$fffe - dc.w COLOR01,$04b - dc.w $9107,$fffe - dc.w COLOR01,$16c - dc.w $9207,$fffe - dc.w COLOR01,$28d - dc.w $9307,$fffe - dc.w COLOR01,$4ae - dc.w $9407,$fffe - dc.w COLOR01,$6ce - dc.w $9507,$fffe - dc.w COLOR01,$8dd - dc.w $9607,$fffe - dc.w COLOR01,$aec - dc.w $9707,$fffe - dc.w COLOR01,$bea - dc.w $9807,$fffe - dc.w COLOR01,$dd8 - dc.w $9907,$fffe - dc.w COLOR01,$ec6 - dc.w $9a07,$fffe - dc.w COLOR01,$eb4 - dc.w $9b07,$fffe - dc.w COLOR01,$e92 - dc.w $9c07,$fffe - dc.w COLOR01,$d71 - dc.w $9d07,$fffe - dc.w COLOR01,$b50 - dc.w $9e07,$fffe - dc.w COLOR01,$930 - dc.w $9f07,$fffe - dc.w COLOR01,$710 - dc.w $a007,$fffe - dc.w COLOR01,$502 - dc.w $a107,$fffe - dc.w COLOR01,$303 - dc.w $a207,$fffe - dc.w COLOR01,$205 - dc.w $a307,$fffe - dc.w COLOR01,$117 - dc.w $a407,$fffe - dc.w COLOR01,$029 - dc.w $a507,$fffe - dc.w COLOR01,$04b - dc.w $a607,$fffe - dc.w COLOR01,$16c - dc.w $a707,$fffe - dc.w COLOR01,$28e - dc.w $a807,$fffe - dc.w COLOR01,$4ae - dc.w $a907,$fffe - dc.w COLOR01,$6ce - dc.w $aa07,$fffe - dc.w COLOR01,$8dd - dc.w $ab07,$fffe - dc.w COLOR01,$aec - dc.w $ac07,$fffe - dc.w COLOR01,$cea - dc.w $ad07,$fffe - dc.w COLOR01,$dd8 - dc.w $ae07,$fffe - dc.w COLOR01,$ec6 - dc.w $af07,$fffe - dc.w COLOR01,$eb4 - dc.w $b007,$fffe - dc.w COLOR01,$e92 - dc.w $b107,$fffe - dc.w COLOR01,$d71 - dc.w $b207,$fffe - dc.w COLOR01,$b50 - dc.w $b307,$fffe - dc.w COLOR01,$930 - dc.w $b407,$fffe - dc.w COLOR01,$711 - dc.w $b507,$fffe - dc.w COLOR01,$502 - dc.w $b607,$fffe - dc.w COLOR01,$303 - dc.w $b707,$fffe - dc.w COLOR01,$205 - dc.w $b807,$fffe - dc.w COLOR01,$117 - dc.w $b907,$fffe - dc.w COLOR01,$039 - dc.w $ba07,$fffe - dc.w COLOR01,$04b - dc.w $bb07,$fffe - dc.w COLOR01,$16d - dc.w $bc07,$fffe - dc.w COLOR01,$29e - dc.w $bd07,$fffe - dc.w COLOR01,$4ae - dc.w $be07,$fffe - dc.w COLOR01,$6ce - dc.w $bf07,$fffe - dc.w COLOR01,$8dd - dc.w $c007,$fffe - dc.w COLOR01,$aec - dc.w $c107,$fffe - dc.w COLOR01,$cea - dc.w $c207,$fffe - dc.w COLOR01,$dd8 - dc.w $c307,$fffe - dc.w COLOR01,$ec6 - dc.w $c407,$fffe - dc.w COLOR01,$eb4 - dc.w $c507,$fffe - dc.w COLOR01,$e92 - dc.w $c607,$fffe - dc.w COLOR01,$d61 - dc.w $c707,$fffe - dc.w COLOR01,$b40 - dc.w $c807,$fffe - dc.w COLOR01,$930 - dc.w $c907,$fffe - dc.w COLOR01,$711 - dc.w $ca07,$fffe - dc.w COLOR01,$502 - dc.w $cb07,$fffe - dc.w COLOR01,$303 - dc.w $cc07,$fffe - dc.w COLOR01,$205 - dc.w $cd07,$fffe - dc.w COLOR01,$117 - dc.w $ce07,$fffe - dc.w COLOR01,$039 - dc.w $cf07,$fffe - dc.w COLOR01,$04b - dc.w $d007,$fffe - dc.w COLOR01,$17d - dc.w $d107,$fffe - dc.w COLOR01,$29e - dc.w $d207,$fffe - dc.w COLOR01,$4be - dc.w $d307,$fffe - dc.w COLOR01,$6ce - dc.w $d407,$fffe - dc.w COLOR01,$8dd - dc.w $d507,$fffe - dc.w COLOR01,$aec - dc.w $d607,$fffe - dc.w COLOR01,$cea - dc.w $d707,$fffe - dc.w COLOR01,$dd8 - dc.w $d807,$fffe - dc.w COLOR01,$ec6 - dc.w $d907,$fffe - dc.w COLOR01,$ea4 - dc.w $da07,$fffe - dc.w COLOR01,$e82 - dc.w $db07,$fffe - dc.w COLOR01,$d61 - dc.w $dc07,$fffe - dc.w COLOR01,$b40 - dc.w $dd07,$fffe - dc.w COLOR01,$930 - dc.w $de07,$fffe - dc.w COLOR01,$711 - dc.w $df07,$fffe - dc.w COLOR01,$502 - dc.w $e007,$fffe - dc.w COLOR01,$303 - dc.w $e107,$fffe - dc.w COLOR01,$205 - dc.w $e207,$fffe - dc.w COLOR01,$017 - dc.w $e307,$fffe - dc.w COLOR01,$039 - dc.w $e407,$fffe - dc.w COLOR01,$05b - dc.w $e507,$fffe - dc.w COLOR01,$17d - dc.w $e607,$fffe - dc.w COLOR01,$29e - dc.w $e707,$fffe - dc.w COLOR01,$4be - dc.w $e807,$fffe - dc.w COLOR01,$6ce - dc.w $e907,$fffe - dc.w COLOR01,$8dd - dc.w $ea07,$fffe - dc.w COLOR01,$aeb - dc.w $eb07,$fffe - dc.w COLOR01,$cea - dc.w $ec07,$fffe - dc.w COLOR01,$dd8 - dc.w $ed07,$fffe - dc.w COLOR01,$ec6 - dc.w $ee07,$fffe - dc.w COLOR01,$ea4 - dc.w $ef07,$fffe - dc.w COLOR01,$d82 - dc.w $f007,$fffe - dc.w COLOR01,$c61 - dc.w $f107,$fffe - dc.w COLOR01,$b40 - dc.w $f207,$fffe - dc.w COLOR01,$920 - dc.w $f307,$fffe - dc.w COLOR01,$711 - dc.w $f407,$fffe - dc.w COLOR01,$502 - dc.w $f507,$fffe - dc.w COLOR01,$303 - dc.w $f607,$fffe - dc.w COLOR01,$105 - dc.w $f707,$fffe - dc.w COLOR01,$017 - dc.w $f807,$fffe - dc.w COLOR01,$03a - dc.w $f907,$fffe - dc.w COLOR01,$05b - dc.w $fa07,$fffe - dc.w COLOR01,$17d - dc.w $fb07,$fffe - dc.w COLOR01,$29e - dc.w $fc07,$fffe - dc.w COLOR01,$4be - dc.w $fd07,$fffe - dc.w COLOR01,$6ce - dc.w $fe07,$fffe - dc.w COLOR01,$8dd - dc.w $ff07,$fffe - dc.w COLOR01,$aeb -.verticalPositionWrapped: - dc.w $ffdf,$fffe - dc.w $7,$fffe - dc.w COLOR01,$cea - dc.w $107,$fffe - dc.w COLOR01,$dd8 - dc.w $207,$fffe - dc.w COLOR01,$ec5 - dc.w $307,$fffe - dc.w COLOR01,$ea3 - dc.w $407,$fffe - dc.w COLOR01,$d82 - dc.w $507,$fffe - dc.w COLOR01,$c61 - dc.w $607,$fffe - dc.w COLOR01,$b40 - dc.w $707,$fffe - dc.w COLOR01,$920 - dc.w $807,$fffe - dc.w COLOR01,$711 - dc.w $907,$fffe - dc.w COLOR01,$502 - dc.w $a07,$fffe - dc.w COLOR01,$304 - dc.w $b07,$fffe - dc.w COLOR01,$106 - dc.w $c07,$fffe - dc.w COLOR01,$018 - dc.w $d07,$fffe - dc.w COLOR01,$03a - dc.w $e07,$fffe - dc.w COLOR01,$05b - dc.w $f07,$fffe - dc.w COLOR01,$17d - dc.w $1007,$fffe - dc.w COLOR01,$29e - dc.w $1107,$fffe - dc.w COLOR01,$4be - dc.w $1207,$fffe - dc.w COLOR01,$6ce - dc.w $1307,$fffe - dc.w COLOR01,$8dd - dc.w $1407,$fffe - dc.w COLOR01,$aeb - dc.w $1507,$fffe - dc.w COLOR01,$ce9 - dc.w $1607,$fffe - dc.w COLOR01,$dd7 - dc.w $1707,$fffe - dc.w COLOR01,$ec5 - dc.w $1807,$fffe - dc.w COLOR01,$ea3 - dc.w $1907,$fffe - dc.w COLOR01,$d82 - dc.w $1a07,$fffe - dc.w COLOR01,$c61 - dc.w $1b07,$fffe - dc.w COLOR01,$b40 - dc.w $1c07,$fffe - dc.w COLOR01,$920 - dc.w $1d07,$fffe - dc.w COLOR01,$711 - dc.w $1e07,$fffe - dc.w COLOR01,$502 - dc.w $1f07,$fffe - dc.w COLOR01,$304 - dc.w $2007,$fffe - dc.w COLOR01,$106 - dc.w $2107,$fffe - dc.w COLOR01,$028 - dc.w $2207,$fffe - dc.w COLOR01,$03a - dc.w $2307,$fffe - dc.w COLOR01,$05c - dc.w $2407,$fffe - dc.w COLOR01,$17d - dc.w $2507,$fffe - dc.w COLOR01,$39e - dc.w $2607,$fffe - dc.w COLOR01,$4be - dc.w $2707,$fffe - dc.w COLOR01,$6ce - dc.w $2807,$fffe - dc.w COLOR01,$8ed - dc.w $2907,$fffe - dc.w COLOR01,$aeb - dc.w $2a07,$fffe - dc.w COLOR01,$ce9 - dc.w $2b07,$fffe - dc.w COLOR01,$dd7 - dc.w $2c07,$fffe - dc.w COLOR01,$000 diff --git a/028.game2/game1.s b/028.game2/game1.s index 8842b26..d36bb1b 100644 --- a/028.game2/game1.s +++ b/028.game2/game1.s @@ -493,7 +493,7 @@ playAreaCopperPalettePtr2: InstallSpriteColorPalette: include "out/sprite_pig_up-palette.s" - include "out/sprite_coin1-palette.s" + include "out/sprite_coin-1-palette.s" rts InstallColorPalette: diff --git a/028.game2/items.s b/028.game2/items.s index e601ea9..2e3869e 100644 --- a/028.game2/items.s +++ b/028.game2/items.s @@ -6,7 +6,7 @@ ScrollItemSprites: move.l #1,d0 - lsl.w #4,d0 ; multiply by 16 (item control structure size) + lsl.w #ITEM_STRUCT_MULU_SHIFT,d0 ; multiply by 16 (item control structure size) lea item1,a1 add.l d0,a1 @@ -18,14 +18,13 @@ SetupItemSpriteData: ;; d0 - item slot ;; d1 - sprite slot move.l #1,d0 - lsl.w #4,d0 ; multiply by 16 (item control structure size) + lsl.w #ITEM_STRUCT_MULU_SHIFT,d0 ; multiply by 16 (item control structure size) lea item1,a1 add.l d0,a1 move.l currentItemSprite,a0 - ;; add.l #64+4,a0 - cmp.w #13<<3,ITEM_INDEX(a1) + cmp.w #(ITEM_NUM_COIN_ANIMS-1)<<3,ITEM_INDEX(a1) ble .dontResetIndex move.l #0,ITEM_INDEX(a1) .dontResetIndex: @@ -39,6 +38,9 @@ SetupItemSpriteData: lsr.l #3,d0 mulu.w #ITEM_SPRITE_BYTES,d0 add.l d0,a0 + + add.l #1*(64+4),a0 + move.w ITEM_LAGX(a1),d0 lsr.w #FOREGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels move.w ITEM_X(a1),ITEM_LAGX(a1) @@ -48,18 +50,22 @@ SetupItemSpriteData: move.b d1,3(a0) ;spriteControl lsr.l #1,d0 move.b d0,1(a0) ;spriteHStart + + if 0 move.w ITEM_LAGY(a1),d0 move.w ITEM_Y(a1),ITEM_LAGY(a1) move.b d0,(a0) ;spriteVStart move.w ITEM_LAGYEND(a1),d0 move.w ITEM_YEND(a1),ITEM_LAGYEND(a1) move.b d0,2(a0) ;spriteVStop + endif .c1: + sub.l #1*(64+4),a0 move.l a0,SPR2PTH(a6) - add.w #1,ITEM_INDEX(a1) + add.w #1,ITEM_INDEX(a1) rts RenderItemSprite: @@ -67,7 +73,7 @@ RenderItemSprite: movem.l d2-d3,-(sp) move.l #1,d0 - lsl.w #4,d0 ; multiply by 16 (item control structure size) + lsl.w #ITEM_STRUCT_MULU_SHIFT,d0 ; multiply by 16 (item control structure size) lea item1,a1 add.l d0,a1 @@ -106,18 +112,12 @@ currentItemSprite: ItemControl item7 ItemControl item8 - ItemSprite spriteCoin1,sprite_coin1.bin - ItemSprite spriteCoin1_1,sprite_coin1.bin - ItemSprite spriteCoin2,sprite_coin2.bin - ItemSprite spriteCoin3,sprite_coin3.bin - ItemSprite spriteCoin4,sprite_coin4.bin - ItemSprite spriteCoin5,sprite_coin3.bin - ItemSprite spriteCoin6,sprite_coin6.bin - ItemSprite spriteCoin7,sprite_coin7.bin - ItemSprite spriteCoin7_1,sprite_coin7.bin - ItemSprite spriteCoin8,sprite_coin6.bin - ItemSprite spriteCoin9,sprite_coin3.bin - ItemSprite spriteCoin10,sprite_coin4.bin - ItemSprite spriteCoin11,sprite_coin3.bin - ItemSprite spriteCoin12,sprite_coin2.bin + ItemSprite spriteCoin1,sprite_coin-0.bin + ItemSprite spriteCoin2,sprite_coin-0.bin + ItemSprite spriteCoin3,sprite_coin-1.bin + ItemSprite spriteCoin4,sprite_coin-2.bin + ItemSprite spriteCoin5,sprite_coin-3.bin + ItemSprite spriteCoin6,sprite_coin-2.bin + ItemSprite spriteCoin7,sprite_coin-1.bin + diff --git a/028.game2/macros.i b/028.game2/macros.i index 9c4d039..afa00f2 100644 --- a/028.game2/macros.i +++ b/028.game2/macros.i @@ -8,22 +8,36 @@ WaitBlitter: macro ItemSprite: macro \1: - dc.w 0,0 + dc.b ITEM_SPRITE_VSTART ; vstart + dc.b 64 ; hstart + dc.b ITEM_SPRITE_VSTART+ITEM_SPRITE_HEIGHT+1; vstop + dc.b 0 incbin "out/\2" - dc.w 0,0 + dc.b ITEM_SPRITE_VSTART+(16*2); vstart + dc.b 0 ; hstart + dc.b ITEM_SPRITE_VSTART+(16*2)+ITEM_SPRITE_HEIGHT; vstop + dc.b 0 incbin "out/\2" - dc.w 0,0 + dc.b ITEM_SPRITE_VSTART+(16*2); vstart + dc.b 0 ; hstart + dc.b ITEM_SPRITE_VSTART+(16*2)+ITEM_SPRITE_HEIGHT; vstop + dc.b 0 incbin "out/\2" - dc.w 0,0 + dc.b ITEM_SPRITE_VSTART+(16*3); vstart + dc.b 0 ; hstart + dc.b ITEM_SPRITE_VSTART+(16*3)+ITEM_SPRITE_HEIGHT; vstop + dc.b 0 incbin "out/\2" - dc.w 0,0 + dc.b ITEM_SPRITE_VSTART+(16*4); vstart + dc.b 0 ; hstart + dc.b ITEM_SPRITE_VSTART+(16*4)+ITEM_SPRITE_HEIGHT; vstop + dc.b 0 incbin "out/\2" - dc.w 0,0 + dc.b ITEM_SPRITE_VSTART+(16*5); vstart + dc.b 0 ; hstart + dc.b ITEM_SPRITE_VSTART+(16*5)+ITEM_SPRITE_HEIGHT; vstop + dc.b 0 incbin "out/\2" - dc.w 0,0 - incbin "out/\2" - dc.w 0,0 - incbin "out/\2" dc.l 0 endm diff --git a/tools/croppa/croppa.c b/tools/croppa/croppa.c index 27625c9..65f721b 100644 --- a/tools/croppa/croppa.c +++ b/tools/croppa/croppa.c @@ -39,10 +39,6 @@ cleanup() DestroyImage(image.image); } - if (image.croppedImage != (Image *)NULL) { - DestroyImage(image.croppedImage); - } - if (image.imageInfo != (ImageInfo *) NULL) { DestroyImageInfo(image.imageInfo); } @@ -218,7 +214,7 @@ main(int argc, char **argv) image.croppedImage = CropImage(image.image, &rect, &exception); if (config.rows > 1 || config.cols > 1) { - sprintf(image.croppedImage->filename, "%d-%s", count, outputFile); + sprintf(image.croppedImage->filename, "%s-%d.png", outputFile, count); } else { strcpy(image.croppedImage->filename, outputFile); } @@ -227,6 +223,10 @@ main(int argc, char **argv) CatchException(&image.croppedImage->exception); abort_("Failed to write image %d\n", outputFile); } + + if (image.croppedImage != (Image *)NULL) { + DestroyImage(image.croppedImage); + } } }