From 759f23a005242ba8dccca2aeef27e94dd9159df5 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 15 Nov 2019 20:31:17 -0500 Subject: [PATCH] ds: fix problem where credits didn't work was over-writing the main() routine, oops --- demosplash/demosplash.s | 46 +++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/demosplash/demosplash.s b/demosplash/demosplash.s index 01cc71be..8c173330 100644 --- a/demosplash/demosplash.s +++ b/demosplash/demosplash.s @@ -59,6 +59,32 @@ zp_clear_loop: bit FULLGR bit KEYRESET + jmp main_body + + +; Pictures (no need to align) +.include "appleII_40_96.inc" +.include "k_40_48d.inc" +.include "graphics/book_open/book_open.inc" +.include "graphics/starbase/starbase.inc" +.include "graphics/starbase/ship_flames.inc" +.include "graphics/starbase/star_wipe.inc" + +; Apple II intro +.include "appleII_intro.s" + +; missing +.include "missing.s" + +; missing +.include "open_book.s" + +; Starbase +.include "starbase.s" + +; UP UNTIL THIS POINT CAN BE WIPED BY SOUND AT END + +main_body: ;=========================== ; apple II intro ;============================ @@ -148,27 +174,7 @@ wait_until_keypressed: bit KEYRESET rts -; Pictures (no need to align) -.include "appleII_40_96.inc" -.include "k_40_48d.inc" -.include "graphics/book_open/book_open.inc" -.include "graphics/starbase/starbase.inc" -.include "graphics/starbase/ship_flames.inc" -.include "graphics/starbase/star_wipe.inc" -; Apple II intro -.include "appleII_intro.s" - -; missing -.include "missing.s" - -; missing -.include "open_book.s" - -; Starbase -.include "starbase.s" - -; UP UNTIL THIS POINT CAN BE WIPED BY SOUND AT END ; FIXME: put at end after music? ;.include "earth.inc"