From cded663eb8c4aa38672f2f3706ca367480ff6d8c Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Sun, 24 Apr 2016 12:26:36 +1000 Subject: [PATCH] rename pig -> player --- 028.bs/Makefile | 2 +- 028.bs/constants.i | 12 ++--- 028.bs/game1.s | 16 +++---- 028.bs/{pig.s => player.s} | 96 ++++++++++++++++++-------------------- 4 files changed, 61 insertions(+), 65 deletions(-) rename 028.bs/{pig.s => player.s} (64%) diff --git a/028.bs/Makefile b/028.bs/Makefile index 2316a3a..cb9586c 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -11,7 +11,7 @@ BASE_ADDRESS=4000 NUM_COLORS=8 BOOTBLOCK_ASM=alpine_bootblock.s -OBJS=out/init.o out/utils.o out/image.o out/blit.o out/joystick.o out/pig.o out/items.o out/blittext.o out/music.o out/P6112-Play.o out/splash.o +OBJS=out/init.o out/utils.o out/image.o out/blit.o out/joystick.o out/player.o out/items.o out/blittext.o out/music.o out/P6112-Play.o out/splash.o IMAGES=foreground.png \ background.png \ diff --git a/028.bs/constants.i b/028.bs/constants.i index 215b4d3..58fa08a 100644 --- a/028.bs/constants.i +++ b/028.bs/constants.i @@ -1,13 +1,13 @@ MPANEL_COPPER_WAIT equ $9ad1 -PIG_INITIAL_X equ $c0 -PIG_INITIAL_Y equ $e4 +PLAYER_INITIAL_X equ $c0 +PLAYER_INITIAL_Y equ $e4 -PIG_JUMP_PIXELS equ 8 -PIG_PAUSE_PIXELS equ 16 -PIG_MOVE_PIXELS equ 2 -PIG_SPRITE_VERTICAL_BYTES equ ((16*4)+12) +PLAYER_JUMP_PIXELS equ 8 +PLAYER_PAUSE_PIXELS equ 16 +PLAYER_MOVE_PIXELS equ 2 +PLAYER_SPRITE_VERTICAL_BYTES equ ((16*4)+12) FOREGROUND_DELAY_BIT equ 0 diff --git a/028.bs/game1.s b/028.bs/game1.s index 57c7562..792e4f3 100644 --- a/028.bs/game1.s +++ b/028.bs/game1.s @@ -76,7 +76,7 @@ Reset: jsr BlueFill jsr Message jsr InstallGreyPalette - jsr HidePig + jsr HidePlayer MainLoop: MOVE.W #$0024,BPLCON2(a6) @@ -113,7 +113,7 @@ FadeInLoop: bsr InstallNextGreyPalette cmp.l #FOREGROUND_PLAYAREA_WIDTH_WORDS+25,d6 bne .c1 - jsr InitialisePig + jsr InitialisePlayer jsr EnableItemSprites bra GameLoop .c1: @@ -135,7 +135,7 @@ GameLoop: .s2: jsr ProcessJoystick - jsr CheckPigMiss + jsr CheckPlayerMiss bsr Update bsr RenderNextForegroundFrame bsr RenderNextBackgroundFrame @@ -343,7 +343,7 @@ PostMissedTile: bra Reset -CheckPigMiss: +CheckPlayerMiss: lea map,a2 ;; calculate the a2 offset of the top right tile based on foreground scroll @@ -356,16 +356,16 @@ CheckPigMiss: ;; add the offset based on the sprite's x position move.w spriteLagX,d0 - sub.w #PIG_INITIAL_X,d0 + sub.w #PLAYER_INITIAL_X,d0 lsr.w #4,d0 ; x columns move.l #(FOREGROUND_PLAYAREA_WIDTH_WORDS/2)-1,d1 sub.w d0,d1 mulu.w #FOREGROUND_PLAYAREA_HEIGHT_WORDS*2,d1 - sub.l d1,a2 ; pig x if y == bottom ? + sub.l d1,a2 ; player x if y == bottom ? ;; add the offset based on the sprite's y postion - move.w #PIG_INITIAL_Y,d0 + move.w #PLAYER_INITIAL_Y,d0 sub.w spriteY,d0 lsr.w #4,d0 ; y columns add.w #1,d0 @@ -400,7 +400,7 @@ BigBang: bsr HoriScrollPlayfield jsr SwitchBuffers jsr ProcessJoystick - jsr UpdatePigFallingAnimation + jsr UpdatePlayerFallingAnimation ;; bsr Update lea map,a2 diff --git a/028.bs/pig.s b/028.bs/player.s similarity index 64% rename from 028.bs/pig.s rename to 028.bs/player.s index 47bf3ca..27a6bbf 100644 --- a/028.bs/pig.s +++ b/028.bs/player.s @@ -2,34 +2,34 @@ xdef UpdatePlayer xdef ProcessJoystick - xdef InitialisePig - xdef HidePig + xdef InitialisePlayer + xdef HidePlayer xdef SetupSpriteData xdef ScrollSprites xdef deadSprite xdef spriteX xdef spriteLagX xdef spriteY - xdef UpdatePigFallingAnimation + xdef UpdatePlayerFallingAnimation xdef InstallPlayerColorPalette PLAYER_INSTALL_COLOR_PALETTE equ 0 PLAYER_SPRITE_DATA equ 4 -InitialisePig: +InitialisePlayer: move.l playerSpriteConfig,a0 move.l PLAYER_SPRITE_DATA(a0),d0 - add.l #6*PIG_SPRITE_VERTICAL_BYTES,d0 + add.l #6*PLAYER_SPRITE_VERTICAL_BYTES,d0 move.l d0,currentSprite - move.w #0,spritePigFallingAnimation - move.w #PIG_INITIAL_X,spriteX - move.w #PIG_INITIAL_Y,spriteY - move.w #PIG_INITIAL_Y+16,spriteYEnd + move.w #0,spritePlayerFallingAnimation + move.w #PLAYER_INITIAL_X,spriteX + move.w #PLAYER_INITIAL_Y,spriteY + move.w #PLAYER_INITIAL_Y+16,spriteYEnd rts -HidePig: +HidePlayer: move.w #$f000,spriteX rts @@ -40,18 +40,18 @@ ScrollSprites: rts -UpdatePigFallingAnimation: - move.w spritePigFallingAnimation,d0 +UpdatePlayerFallingAnimation: + move.w spritePlayerFallingAnimation,d0 lsr.w #1,d0 - mulu.w #PIG_SPRITE_VERTICAL_BYTES,d0 + mulu.w #PLAYER_SPRITE_VERTICAL_BYTES,d0 move.l #spriteFalling1,a0 add.l d0,a0 move.l a0,currentSprite - add.w #1,spritePigFallingAnimation - cmp.w #4<<1,spritePigFallingAnimation + add.w #1,spritePlayerFallingAnimation + cmp.w #4<<1,spritePlayerFallingAnimation blt .dontResetAnimation - move.w #0,spritePigFallingAnimation - bsr HidePig + move.w #0,spritePlayerFallingAnimation + bsr HidePlayer .dontResetAnimation: rts @@ -60,64 +60,64 @@ UpdatePlayer: ;; right move.l playerSpriteConfig,a0 move.l PLAYER_SPRITE_DATA(a0),d0 - cmp.w #PIG_PAUSE_PIXELS,spriteR + cmp.w #PLAYER_PAUSE_PIXELS,spriteR ble .skipRight - add.w #PIG_MOVE_PIXELS,spriteX - add.l #7*PIG_SPRITE_VERTICAL_BYTES,d0 + add.w #PLAYER_MOVE_PIXELS,spriteX + add.l #7*PLAYER_SPRITE_VERTICAL_BYTES,d0 move.l d0,currentSprite .skipRight cmp.w #0,spriteR beq .notRight sub.w #1,spriteR - cmp.w #PIG_PAUSE_PIXELS,spriteR + cmp.w #PLAYER_PAUSE_PIXELS,spriteR bge .notRight - add.l #6*PIG_SPRITE_VERTICAL_BYTES,d0 + add.l #6*PLAYER_SPRITE_VERTICAL_BYTES,d0 move.l d0,currentSprite .notRight: ;; up - cmp.w #PIG_PAUSE_PIXELS,spriteU + cmp.w #PLAYER_PAUSE_PIXELS,spriteU ble .skipUp - sub.w #PIG_MOVE_PIXELS,spriteY - sub.w #PIG_MOVE_PIXELS,spriteYEnd - add.l #1*PIG_SPRITE_VERTICAL_BYTES,d0 + sub.w #PLAYER_MOVE_PIXELS,spriteY + sub.w #PLAYER_MOVE_PIXELS,spriteYEnd + add.l #1*PLAYER_SPRITE_VERTICAL_BYTES,d0 move.l d0,currentSprite .skipUp: cmp.w #0,spriteU beq .notUp sub.w #1,spriteU - cmp.w #PIG_PAUSE_PIXELS,spriteU + cmp.w #PLAYER_PAUSE_PIXELS,spriteU bge .notUp move.l d0,currentSprite .notUp: ;; down - cmp.w #PIG_PAUSE_PIXELS,spriteD + cmp.w #PLAYER_PAUSE_PIXELS,spriteD ble .skipDown - add.w #PIG_MOVE_PIXELS,spriteY - add.w #PIG_MOVE_PIXELS,spriteYEnd - add.l #3*PIG_SPRITE_VERTICAL_BYTES,d0 + add.w #PLAYER_MOVE_PIXELS,spriteY + add.w #PLAYER_MOVE_PIXELS,spriteYEnd + add.l #3*PLAYER_SPRITE_VERTICAL_BYTES,d0 move.l d0,currentSprite .skipDown: cmp.w #0,spriteD beq .notDown sub.w #1,spriteD - cmp.w #PIG_PAUSE_PIXELS,spriteD + cmp.w #PLAYER_PAUSE_PIXELS,spriteD bge .notDown - add.l #2*PIG_SPRITE_VERTICAL_BYTES,d0 + add.l #2*PLAYER_SPRITE_VERTICAL_BYTES,d0 move.l d0,currentSprite .notDown: ;; left - cmp.w #PIG_PAUSE_PIXELS,spriteL + cmp.w #PLAYER_PAUSE_PIXELS,spriteL ble .skipLeft - sub.w #PIG_MOVE_PIXELS,spriteX - add.l #5*PIG_SPRITE_VERTICAL_BYTES,d0 + sub.w #PLAYER_MOVE_PIXELS,spriteX + add.l #5*PLAYER_SPRITE_VERTICAL_BYTES,d0 move.l d0,currentSprite .skipLeft cmp.w #0,spriteL beq .notLeft sub.w #1,spriteL - cmp.w #PIG_PAUSE_PIXELS,spriteL + cmp.w #PLAYER_PAUSE_PIXELS,spriteL bge .notLeft - add.l #4*PIG_SPRITE_VERTICAL_BYTES,d0 + add.l #4*PLAYER_SPRITE_VERTICAL_BYTES,d0 move.l d0,currentSprite .notLeft: cmp.w #$cf,spriteX @@ -144,23 +144,19 @@ ProcessJoystick: cmp.b #3,joystickpos bne .notRight - move.w #PIG_JUMP_PIXELS+PIG_PAUSE_PIXELS,spriteR - move.l #spritePigRight,currentSprite + move.w #PLAYER_JUMP_PIXELS+PLAYER_PAUSE_PIXELS,spriteR .notRight: cmp.b #1,joystickpos bne .notUp - move.w #PIG_JUMP_PIXELS+PIG_PAUSE_PIXELS,spriteU - move.l #spritePigUp,currentSprite + move.w #PLAYER_JUMP_PIXELS+PLAYER_PAUSE_PIXELS,spriteU .notUp: cmp.b #5,joystickpos bne .notDown - move.w #PIG_JUMP_PIXELS+PIG_PAUSE_PIXELS,spriteD - move.l #spritePigDown,currentSprite + move.w #PLAYER_JUMP_PIXELS+PLAYER_PAUSE_PIXELS,spriteD .notDown: cmp.b #7,joystickpos bne .notLeft - move.w #PIG_JUMP_PIXELS+PIG_PAUSE_PIXELS,spriteL - move.l #spritePigLeft,currentSprite + move.w #PLAYER_JUMP_PIXELS+PLAYER_PAUSE_PIXELS,spriteL .notLeft: .skip: rts @@ -200,7 +196,7 @@ InstallPlayerColorPalette: jsr (a1) rts -InstallPigColorPalette: +InstallPlayerColorPalette: include "out/sprite_pig-0-palette.s" rts @@ -209,7 +205,7 @@ InstallRobotColorPalette: rts pigPlayerSpriteConfig: - dc.l InstallPigColorPalette + dc.l InstallPlayerColorPalette dc.l spritePig robotPlayerSpriteConfig: @@ -221,12 +217,12 @@ playerSpriteConfig: include "sprite_data.i" -spritePigFallingAnimation: +spritePlayerFallingAnimation: dc.w 0 currentSpriteOffset: dc.l 0 currentSprite: - dc.l spritePigRight + dc.l spritePig deadSprite: dc.l 0 spriteR: