diff --git a/028.bs/game1.s b/028.bs/game1.s index cb03a3f..18abaae 100644 --- a/028.bs/game1.s +++ b/028.bs/game1.s @@ -85,6 +85,7 @@ MainMenu: bra InitialiseNewGame Reset: + move.w #1,splashInvalid move.w #0,stopScrollingPending move.w #PANEL_LIVES_X,d0 lea livesCounterShortText,a1 diff --git a/028.bs/menu.s b/028.bs/menu.s index 9ca351e..f31c4eb 100644 --- a/028.bs/menu.s +++ b/028.bs/menu.s @@ -19,6 +19,8 @@ MENU_BOTTOM_OFFSET equ (playBottomColor-playTopColor) ShowMenu: lea CUSTOM,a6 + jsr ReloadSplashScreen + jsr WaitVerticalBlank ;; set up default palette include "out/menu-palette.s" diff --git a/028.bs/splash.s b/028.bs/splash.s index 9c3e6e6..23d3ccd 100644 --- a/028.bs/splash.s +++ b/028.bs/splash.s @@ -1,16 +1,22 @@ include "includes.i" xdef ShowSplash + xdef ReloadSplashScreen xdef splash + xdef splashInvalid SPLASH_COLOR_DEPTH equ 5 SPLASH_SCREEN_WIDTH_BYTES equ 40 ReloadSplashScreen: + cmp.w #0,splashInvalid + beq .skip + move.w #0,splashInvalid move.l #endDiskSplash-diskSplash,d0 move.l #splash,a0 move.l #diskSplash,a1 jsr LoadDiskData +.skip: rts ShowSplash: @@ -79,7 +85,9 @@ splashCopperListBplPtr: dc.w BPL6PTH,0 dc.l $fffffffe - +splashInvalid: + dc.w 1 + section .bss splash: ds.b endDiskSplash-diskSplash