diff --git a/028.game2/Makefile b/028.game2/Makefile index eb86dc5..d8b6ae1 100644 --- a/028.game2/Makefile +++ b/028.game2/Makefile @@ -66,10 +66,10 @@ 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_pig%.png: assets/assets.png - ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_pig --width=16 --height=16 --rows=1 --cols=8 --dx=16 --dy=16 --x=128 --y=144 + ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_pig --width=16 --height=16 --rows=1 --cols=8 --dx=16 --dy=16 --x=192 --y=112 out/sprite_coin%.png: assets/assets.png - ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_coin --width=16 --height=15 --rows=1 --cols=4 --dx=16 --dy=16 --x=128 --y=176 + ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_coin --width=16 --height=15 --rows=1 --cols=4 --dx=16 --dy=16 --x=192 --y=144 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 index 418136b..a9677e0 100644 Binary files a/028.game2/assets/assets.png and b/028.game2/assets/assets.png differ diff --git a/028.game2/assets/items.png b/028.game2/assets/items.png index c164bb5..c9bf30e 100644 Binary files a/028.game2/assets/items.png and b/028.game2/assets/items.png differ diff --git a/028.game2/background.tmx b/028.game2/background.tmx index 1c57769..1c96d09 100644 --- a/028.game2/background.tmx +++ b/028.game2/background.tmx @@ -5,7 +5,7 @@ - eJztmkFuwjAQAP0BHkFFgQ+UJNAvQPsB+APc+D2bA1Jkpc6uvYFUmcMckBxjzyq2d+M6hHDvsIp+/0WtbNfyKayFjbBV9ncWLgNjs4whZ064wMUQlUMfjbAXDsK38pmrcHMa89OfJh64wEXpvFqWwoey7VE4CT/Cr9P/vyoeuJi3i9z35UvYvXFOLdb3PhWPChe46HHhuXZ4otm/m+C7BuICFzHv3NdK8d6fcYELK331grmCC1zElNQLuiwmMBdc4OI/oc2jLDWRFF794AIXWkrq4E3Q5VGWmkhqPRq7toILXHgylfr3FMAFLqYE+SUuLC5yzmBjfJcfi3h/TeWXuMBF3C7nDNYE23cY7zxorDjgAhceWM+JJXlQX36VioP2vikucFFKbi3Ccs84507yUBxiFx73oHExLxcPLXqIig== + eJztmkkOwjAMRcsBOEQR04YltAxXYLgA3AHuv8BdoCKrTW3HHdT+xVtUStPkRRnsJk+SZDcrWbLnOnJhuYIVlV0TG2Jb8x6v70nPr4a2adpg6RNcwEUTmcO3jlTHiTgTF2F9byr3MX6bt/nnTzIecAEXsf0qSKmehbCuK5W7EXfi0eHc9hgPuJi2C+t82dN7hx77VKCd96HxyCLWDrgYrwvPtcMTyf7tvQbCBVxw+tzXYvHen+ECLrRU5QumClzABScmX/DPfAQu4QIuukQaR6WKnEgIr3rgAi6kxOTBpXGUJicSWo/azq3ABVx4MpT89xCAC7gYEogv4ULjIjWcwdr4L98WfH8NxZdwARe8nOUMpv0PY3HdxzjABVx4oD0nxsRBVfFVaByk903hAi5iseYiNPeMLXeSm8aBu/C4Bw0X03LxBT9lUNQ= diff --git a/028.game2/foreground.tmx b/028.game2/foreground.tmx index babf73a..31e64b6 100644 --- a/028.game2/foreground.tmx +++ b/028.game2/foreground.tmx @@ -8,12 +8,12 @@ - eJxjZGBg0GXEjhlH5eguZwekmYBYDAs9Kkd/OS0c8qNyAyM3GNPISJYbjGlkJMsNxjQykuUGYxoZyXKaDLjbYKNy9JcDAIrySzM= + eJxjZGBg0GXEjhlH5eguZwekmYBYDAs9Kkd/OS0c8sTIhQNxLxn6RuVwy1ESn6lAnE2GvlE5/PnjPBCfxELD5GB5IBBNbjc0TgZL2hoOcsTEWT00DnbjkZuMRW4wpbuhIketuK5kQM07gy3dDRU5TQbcbbBROfrLAQBQb1rL - eJxjYBgFgx04M+KXdyQgjw6ciFRPrLpRgADoceE6GoYogBppCt0MfOkfJDeajukPXHCEOSg+kOMLnT8QYCinDydGVEwOGAxxQAkgxd9DOa6pBYZyXI+C4QUASQkGyg== + eJxjYBgFgw04MuLnE1JPCDgRqZ5YdcMdgMKX2DBGV+dKhD6QHucREtbUSFOwMEancamFybuQaDep6kcqQI5TQnGCnpdIyVsgQEx+IhUM5XIO5HZkDAKE6g/0sgY5DtzICAty9FATkBJ/gyWuSa2z3amonlS7R8EooBUAAJkfC84= diff --git a/028.game2/game1.s b/028.game2/game1.s index 5d6a34c..44dc99e 100644 --- a/028.game2/game1.s +++ b/028.game2/game1.s @@ -129,7 +129,10 @@ GameLoop: bsr RenderNextBackgroundFrame if 0 - move.w #$f00,COLOR00(a6) + move.l #8000,d0 +.checkLoop: + dbra d0,.checkLoop + move.w #$f00,COLOR00(a6) endif bra GameLoop @@ -241,14 +244,17 @@ RenderNextForegroundFrame: lsr.l #1,d0 and.b #$f0,d0 add.l d0,a2 - move.l #FOREGROUND_PLAYAREA_HEIGHT_WORDS-1,d3 ; 8 tiles per column + ;; move.l #FOREGROUND_PLAYAREA_HEIGHT_WORDS-1,d3 ; 8 tiles per column + move.l 0,d3 .loop: move.l d3,d2 bsr RenderForegroundTile bsr ClearForegroundTile jsr RenderItemSprite add.l #2,a2 - dbra d3,.loop + add.l #1,d3 + cmp.l #FOREGROUND_PLAYAREA_HEIGHT_WORDS,d3 + blt .loop rts @@ -317,8 +323,8 @@ ClearForegroundTile: add.l #2,(a4) bra .s2 .s1: - ;; add.w #11520,a1 ; source tile - add.w #20880,a1 ; + lea foregroundTilemap,a1 + add.w #21520,a1 ; source tile .s2: jsr BlitTile .s3: diff --git a/028.game2/items.s b/028.game2/items.s index 7925feb..7da3702 100644 --- a/028.game2/items.s +++ b/028.game2/items.s @@ -25,9 +25,9 @@ ScrollItemSprites: rts ClearItemSpriteData: - move.w #ITEM_SPRITE_NUM_VERTICAL_SPRITES-1,d4 - sub.w d2,d4 ; this is because of the upside board at the moment - move.w d4,d2 + ;; move.w #ITEM_SPRITE_NUM_VERTICAL_SPRITES-1,d4 + ;; sub.w d2,d4 ; this is because of the upside board at the moment + ;; move.w d4,d2 move.w #ITEM_NUM_COIN_ANIMS-1,d4 move.l #spriteCoin1,a0 .l2: @@ -112,7 +112,8 @@ RenderItemSprite: GetSpriteSlot: move.w (a3),d0 ; sprite slot - + sub.w #1,d0 + move.w d0,d1 lsl.w #ITEM_STRUCT_MULU_SHIFT,d0 ; multiply by 16 (item control structure size) lea item1,a1