diff --git a/demos/kfest-2022/demo-5/App.Main.s b/demos/kfest-2022/demo-5/App.Main.s index f94f4ff..52a921b 100644 --- a/demos/kfest-2022/demo-5/App.Main.s +++ b/demos/kfest-2022/demo-5/App.Main.s @@ -202,9 +202,6 @@ HERO_SLOT equ 1 pei PlayerY2 _GTEAddSprite - pea #RENDER_WITH_SHADOWING - _GTERender - EvtLoop pha _GTEReadControl @@ -280,7 +277,8 @@ do_render pha _GTEMoveSprite ; Move the sprite to this local position - pea #RENDER_WITH_SHADOWING +; pea #RENDER_WITH_SHADOWING + pea $0000 _GTERender ; Update the performance counters diff --git a/demos/kfest-2022/demo-9/App.Main.s b/demos/kfest-2022/demo-9/App.Main.s index b9e3d0f..feba6b1 100644 --- a/demos/kfest-2022/demo-9/App.Main.s +++ b/demos/kfest-2022/demo-9/App.Main.s @@ -172,16 +172,64 @@ HERO_SLOT_2 equ 2 pea HERO_VBUFF_4 _GTECreateSpriteStamp - pea HERO_SLOT_1 ; Put the player in slot 1 - pea HERO_FLAGS + DO 0 + lda #SPRITE_16X16 + sta SpriteFlags1 + lda #SPRITE_16X8 + sta SpriteFlags2 + ELSE + lda #SPRITE_16X16+SPRITE_COMPILED + sta SpriteFlags1 + lda #SPRITE_16X8+SPRITE_COMPILED + sta SpriteFlags2 + + pha ; Space for result + pea HERO_SIZE pea HERO_VBUFF_1 + _GTECompileSpriteStamp + pla + sta HeroFrames1+2 + sta HeroFrames1+6 + + pha ; Space for result + pea HERO_SIZE + pea HERO_VBUFF_2 + _GTECompileSpriteStamp + pla + sta HeroFrames1+0 + sta HeroFrames1+4 + + pha ; Space for result + pea HERO_SIZE + pea HERO_VBUFF_3 + _GTECompileSpriteStamp + pla + sta HeroFrames2+2 + sta HeroFrames2+6 + + pha ; Space for result + pea HERO_SIZE + pea HERO_VBUFF_4 + _GTECompileSpriteStamp + pla + sta HeroFrames2+0 + sta HeroFrames2+4 + FIN + + pea HERO_SLOT_1 ; Put the player in slot 1 + lda SpriteFlags1 + pha + lda HeroFrames1 + pha pei PlayerX pei PlayerY _GTEAddSprite pea HERO_SLOT_2 - pea HERO_FLAGS - pea HERO_VBUFF_2 + lda SpriteFlags2 + pha + lda HeroFrames2 + pha pei PlayerX lda PlayerY clc @@ -294,7 +342,9 @@ do_render pha _GTESetBG1Origin - pea #RENDER_BG1_HORZ_OFFSET +; pea #RENDER_BG1_HORZ_OFFSET + pea #RENDER_WITH_SHADOWING +; pea #0 _GTERender ; Update the performance counters @@ -525,6 +575,10 @@ Fatal brk $00 qtRec adrl $0000 da $00 +; Sprite VBUFF / Compile tokens +SpriteFlags1 ds 2 +SpriteFlags2 ds 2 + ; Color palette MyDirectPage ds 2 diff --git a/demos/shell/App.Main.s b/demos/shell/App.Main.s index 28c7222..add3cdd 100644 --- a/demos/shell/App.Main.s +++ b/demos/shell/App.Main.s @@ -301,9 +301,12 @@ DoLoadBG1 ldx #BG1AltDataFile jsr LoadFile + lda altBG1Bank + jsl SetBG1Bank + ldx BankLoad lda #0 - ldy BG1AltBank + ldy BG1DataBank jsl CopyBinToBG1 rts diff --git a/demos/shell/Overlay.s b/demos/shell/Overlay.s index a72abf0..a440541 100644 --- a/demos/shell/Overlay.s +++ b/demos/shell/Overlay.s @@ -105,7 +105,7 @@ InitOverlay ldx #r_line+{CHAR_WIDTH*4} jsr _DrawChar - pea $0000 + pea $0000 ; logical lines for the overlay bar pea $0008 pea #^StatusBar pea #StatusBar @@ -174,6 +174,8 @@ oneSecondCounter ds 2 ; Draw the overlay ; A = address of the left edge of the screen +; X = top line to start drawing the overlay (typically 0) +; Y = bottom line to stop drawing the overlayer (typically the overlay height set during call to _SetOverlay) StatusBar phb ; Called via JSL phd ; save the direct page register