From 2c4305a0ca1c13f7858fe70e2c2aa8a208207175 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Wed, 18 May 2016 17:03:44 +1000 Subject: [PATCH] menu text color/credits update --- 028.bs/P6112-Options.i | 2 +- 028.bs/credits.s | 18 ++++----- 028.bs/menu.s | 83 ++++++++++++++++++++++++++++++------------ 3 files changed, 69 insertions(+), 34 deletions(-) diff --git a/028.bs/P6112-Options.i b/028.bs/P6112-Options.i index e65ded3..1782015 100644 --- a/028.bs/P6112-Options.i +++ b/028.bs/P6112-Options.i @@ -5,7 +5,7 @@ P61mode =2 ;Try other modes ONLY IF there are no Fxx commands >= 20. ;; --- options common to all P61modes --- -usecode=-1;$8000 ;CHANGE! to the USE hexcode from P61con for a big +usecode=$9409;$8000 ;CHANGE! to the USE hexcode from P61con for a big ;CPU-time gain! (See module usecodes at end of source) ;Multiple songs, single playroutine? Just "OR" the ;usecodes together! diff --git a/028.bs/credits.s b/028.bs/credits.s index 22d0ae3..c2365f1 100644 --- a/028.bs/credits.s +++ b/028.bs/credits.s @@ -92,13 +92,13 @@ Credits: RenderText: lea credits,a1 - move.w #72,d0 + move.w #48,d0 move.w #20,d1 .loop: cmp.b #0,(a1) beq .done lea foregroundBitplanes1,a0 - jsr DrawWSMaskedText8 + jsr DrawWSMaskedText8 .findNull: cmp.b #0,(a1)+ bne .findNull @@ -109,9 +109,9 @@ RenderText: credits: - dc.b " BLOCKY SKIES" + dc.b " BLOCKY SKIES" dc.b 0 - dc.b " ------------" + dc.b " ------------" dc.b 0 dc.b " " dc.b 0 @@ -119,7 +119,7 @@ credits: dc.b 0 dc.b "GRAPHICS - CHIPMUNK" dc.b 0 - dc.b "MUSIC - SOMEBODY" + dc.b "MUSIC - Simone \"JMD\" Bernacchia" dc.b 0 dc.b "CODE - ALPINE9000" dc.b 0 @@ -127,17 +127,17 @@ credits: dc.b 0 dc.b "TRACKLOADER - PHOTON/SCOOPEX" dc.b 0 - dc.b "P61 PLAYER - GURU,PHOTON" + dc.b "P6112 CODE - GURU&PHOTON/SCOOPEX" dc.b 0 dc.b " " dc.b 0 - dc.b " THANKS" + dc.b " THANKS" dc.b 0 - dc.b " ------" + dc.b " ------" dc.b 0 dc.b "WIN-UAE - TONI WILEN" dc.b 0 - dc.b "FS-UAE - FrodeSolheim" + dc.b "FS-UAE - Frode Solheim" dc.b 0 dc.b "VASM/VLINK - PHX/Volker" align 4 diff --git a/028.bs/menu.s b/028.bs/menu.s index b4793e5..ff8e674 100644 --- a/028.bs/menu.s +++ b/028.bs/menu.s @@ -6,14 +6,15 @@ SPLASH_COLOR_DEPTH equ 5 SPLASH_SCREEN_WIDTH_BYTES equ 40 PLAY_COPPER_WORD equ $bad1 -MUSIC_COPPER_WORD equ PLAY_COPPER_WORD+$2000 -DIFFICULTY_COPPER_WORD equ PLAY_COPPER_WORD+$1000 -CREDITS_COPPER_WORD equ PLAY_COPPER_WORD+$3000 MENU_SELECTED_TOP_COLOR equ $be0 ;$e71 MENU_SELECTED_BOTTOM_COLOR equ $9d4 ;$fe7 MENU_TEXT_COLOR equ $7ef +MENU_TEXT_BOTTOM_COLOR equ $5cd +MENU_OFFSET equ levelTopColor-playTopColor +MENU_BOTTOM_OFFSET equ (playBottomColor-playTopColor) + ShowMenu: lea CUSTOM,a6 @@ -97,22 +98,34 @@ RenderMenu: rts MenuUp: - cmp.w #PLAY_COPPER_WORD,selectedStartPtr + cmp.l #playTopColor,selectedPtr beq .done PlaySound Jump - sub.w #$1000,selectedStartPtr - sub.w #$1000,selectedStartPtr2 - sub.w #$1000,selectedEndPtr + move.l selectedPtr,a0 + move.w #MENU_TEXT_COLOR,(a0) + add.l #MENU_BOTTOM_OFFSET,a0 + move.w #MENU_TEXT_BOTTOM_COLOR,(a0) + sub.l #MENU_OFFSET,selectedPtr + move.l selectedPtr,a0 + move.w #MENU_SELECTED_TOP_COLOR,(a0) + add.l #MENU_BOTTOM_OFFSET,a0 + move.w #MENU_SELECTED_BOTTOM_COLOR,(a0) .done: rts MenuDown: - cmp.w #$ead1,selectedStartPtr + cmp.l #creditsTopColor,selectedPtr beq .done PlaySound Jump - add.w #$1000,selectedStartPtr - add.w #$1000,selectedStartPtr2 - add.w #$1000,selectedEndPtr + move.l selectedPtr,a0 + move.w #MENU_TEXT_COLOR,(a0) + add.l #MENU_BOTTOM_OFFSET,a0 + move.w #MENU_TEXT_BOTTOM_COLOR,(a0) + add.l #MENU_OFFSET-MENU_BOTTOM_OFFSET,a0 + move.w #MENU_SELECTED_TOP_COLOR,(a0) + add.l #MENU_BOTTOM_OFFSET,a0 + move.w #MENU_SELECTED_BOTTOM_COLOR,(a0) + add.l #MENU_OFFSET,selectedPtr .done: rts @@ -164,13 +177,13 @@ RefreshDifficulty: rts ButtonPressed: - cmp.w #PLAY_COPPER_WORD,selectedStartPtr + cmp.l #playTopColor,selectedPtr beq .playButton - cmp.w #MUSIC_COPPER_WORD,selectedStartPtr + cmp.l #musicTopColor,selectedPtr beq .musicButton - cmp.w #DIFFICULTY_COPPER_WORD,selectedStartPtr + cmp.l #levelTopColor,selectedPtr beq .difficultyButton - cmp.w #CREDITS_COPPER_WORD,selectedStartPtr + cmp.l #creditsTopColor,selectedPtr beq .creditsButton bra .done .difficultyButton: @@ -277,6 +290,7 @@ musicOff: dc.b "MUSIC - OFF " dc.b 0 + align 4 splashCopperList: splashCopperListBplPtr: dc.w BPL1PTL,0 @@ -292,19 +306,40 @@ splashCopperListBplPtr: dc.w BPL6PTL,0 dc.w BPL6PTH,0 - dc.w COLOR31,MENU_TEXT_COLOR -selectedStartPtr: - dc.w PLAY_COPPER_WORD,$fffe - dc.w COLOR31,MENU_SELECTED_TOP_COLOR -selectedStartPtr2: - dc.w PLAY_COPPER_WORD+(($1000/4)*3),$fffe - dc.w COLOR31,MENU_SELECTED_BOTTOM_COLOR -selectedEndPtr: + dc.w PLAY_COPPER_WORD,$fffe + dc.w COLOR31 +playTopColor: + dc.w MENU_SELECTED_TOP_COLOR + dc.w PLAY_COPPER_WORD+(($1000/4)*3),$fffe + dc.w COLOR31 +playBottomColor: + dc.w MENU_SELECTED_BOTTOM_COLOR + dc.w PLAY_COPPER_WORD+$1000,$fffe - dc.w COLOR31,MENU_TEXT_COLOR + dc.w COLOR31 +levelTopColor: + dc.w MENU_TEXT_COLOR + dc.w PLAY_COPPER_WORD+$1000+(($1000/4)*3),$fffe + dc.w COLOR31,MENU_TEXT_BOTTOM_COLOR + + dc.w PLAY_COPPER_WORD+$2000,$fffe + dc.w COLOR31 +musicTopColor: + dc.w MENU_TEXT_COLOR + dc.w PLAY_COPPER_WORD+$2000+(($1000/4)*3),$fffe + dc.w COLOR31,MENU_TEXT_BOTTOM_COLOR + + dc.w PLAY_COPPER_WORD+$3000,$fffe + dc.w COLOR31 +creditsTopColor: + dc.w MENU_TEXT_COLOR + dc.w PLAY_COPPER_WORD+$3000+(($1000/4)*3),$fffe + dc.w COLOR31,MENU_TEXT_BOTTOM_COLOR dc.l $fffffffe +selectedPtr: + dc.l playTopColor splashSave: incbin "out/splashSave.bin"