From d3f5124899e591fa05a4a3894b9d9418af100af3 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 17 Jul 2024 13:31:09 -0400 Subject: [PATCH] riven: clean up some of the hgr -> gr transitions --- games/riven_hgr/disk41_files/movie_cove.s | 8 +++++++- games/riven_hgr/qload_floppy.s | 16 +++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/games/riven_hgr/disk41_files/movie_cove.s b/games/riven_hgr/disk41_files/movie_cove.s index 75648a52..3868e17c 100644 --- a/games/riven_hgr/disk41_files/movie_cove.s +++ b/games/riven_hgr/disk41_files/movie_cove.s @@ -21,11 +21,17 @@ movie_cove_start: ; Setup graphics ;=================== + ; clear lores before we flip to it + + lda #0 + sta DRAW_PAGE + jsr clear_gr_all + bit SET_GR bit LORES bit PAGE1 - jsr GR +; jsr GR bit FULLGR lda #0 diff --git a/games/riven_hgr/qload_floppy.s b/games/riven_hgr/qload_floppy.s index 248fc46a..6cdd03ae 100644 --- a/games/riven_hgr/qload_floppy.s +++ b/games/riven_hgr/qload_floppy.s @@ -32,7 +32,7 @@ entry_smc: lda LEVEL_OVER bmi change_disk - jmp main_game_loop + bpl main_game_loop ; bra ;==================================== @@ -54,9 +54,9 @@ load_file: lda LENGTH_ARRAY,X sta load_length - jsr load_new + jmp load_new ; tail call - rts +; rts ;=================================================== ;=================================================== @@ -96,10 +96,16 @@ change_disk: ; switch to GR and print DNI number too - jsr GR - jsr HOME +; jsr GR +; jsr HOME + + lda #0 + sta DRAW_PAGE + jsr clear_gr_all + jsr clear_bottom bit LORES + bit TEXTGR lda #