From 46e6467da767b3770abf3516c2a754d8410193d8 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 9 Apr 2022 22:02:37 -0400 Subject: [PATCH] lemm: move some stuff to qload to free up some room --- games/lemm/Makefile | 17 +++++++++++++++-- games/lemm/lemm.s | 14 +++++++------- games/lemm/qload.s | 6 ++++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/games/lemm/Makefile b/games/lemm/Makefile index 0ea12403..5d56d39d 100644 --- a/games/lemm/Makefile +++ b/games/lemm/Makefile @@ -58,7 +58,10 @@ qload.o: qload.s qboot.inc \ wait.s wait_a_bit.s \ hgr_hlin.s hgr_vlin.s hgr_box.s hgr_tables.s hgr_14x14_sprite.s \ hgr_sprite.s hgr_partial_restore.s lc_detect.s gr_fast_clear.s \ - text_print.s + text_print.s simple_sounds.s \ + pt3_lib_detect_model.s pt3_lib_mockingboard_detect.s \ + pt3_lib_mockingboard_setup.s interrupt_handler.s \ + pt3_lib_mockingboard_patch.s ca65 -o qload.o qload.s -l qload.lst ### @@ -93,6 +96,16 @@ qload.inc: generate_common QLOAD ./generate_common -a 0x1200 -s set_normal qload.lst >> qload.inc ./generate_common -a 0x1200 -s set_inverse qload.lst >> qload.inc ./generate_common -a 0x1200 -s clear_all qload.lst >> qload.inc + ./generate_common -a 0x1200 -s click_speaker qload.lst >> qload.inc + ./generate_common -a 0x1200 -s detect_appleii_model qload.lst >> qload.inc + ./generate_common -a 0x1200 -s mockingboard_detect qload.lst >> qload.inc + ./generate_common -a 0x1200 -s mockingboard_patch qload.lst >> qload.inc + ./generate_common -a 0x1200 -s mockingboard_init qload.lst >> qload.inc + ./generate_common -a 0x1200 -s mockingboard_setup_interrupt qload.lst >> qload.inc + ./generate_common -a 0x1200 -s disable_music qload.lst >> qload.inc + ./generate_common -a 0x1200 -s reset_ay_both qload.lst >> qload.inc + ./generate_common -a 0x1200 -s clear_ay_both qload.lst >> qload.inc + ### @@ -147,7 +160,7 @@ lemm.inc: generate_common LEMM ./generate_common -a 0x6000 -s draw_door_5 lemm.lst >> lemm.inc ./generate_common -a 0x6000 -s draw_flames lemm.lst >> lemm.inc ./generate_common -a 0x6000 -s handle_keypress lemm.lst >> lemm.inc - ./generate_common -a 0x6000 -s disable_music lemm.lst >> lemm.inc +# ./generate_common -a 0x6000 -s disable_music lemm.lst >> lemm.inc ./generate_common -a 0x6000 -s outro_level lemm.lst >> lemm.inc ./generate_common -a 0x6000 -s update_lemmings_out lemm.lst >> lemm.inc ./generate_common -a 0x6000 -s level_preview_h_smc lemm.lst >> lemm.inc diff --git a/games/lemm/lemm.s b/games/lemm/lemm.s index 35f98108..ee2921b3 100644 --- a/games/lemm/lemm.s +++ b/games/lemm/lemm.s @@ -352,7 +352,6 @@ level_continue: .include "particle_hgr.s" .include "load_music.s" - .include "simple_sounds.s" .include "release_lemming.s" .include "init_level.s" @@ -372,16 +371,17 @@ level_continue: ; .include "lc_detect.s" ; .include "gr_fast_clear.s" ; .include "text_print.s" +; .include "simple_sounds.s" ; pt3 player -;.include "pt3_lib_mockingboard.inc" -.include "pt3_lib_detect_model.s" -.include "pt3_lib_mockingboard_detect.s" -.include "pt3_lib_mockingboard_setup.s" -.include "interrupt_handler.s" -.include "pt3_lib_mockingboard_patch.s" +;;.include "pt3_lib_mockingboard.inc" +;.include "pt3_lib_detect_model.s" +;.include "pt3_lib_mockingboard_detect.s" +;.include "pt3_lib_mockingboard_setup.s" +;.include "interrupt_handler.s" +;.include "pt3_lib_mockingboard_patch.s" config_string: diff --git a/games/lemm/qload.s b/games/lemm/qload.s index b054c107..6bd3d2fd 100644 --- a/games/lemm/qload.s +++ b/games/lemm/qload.s @@ -200,6 +200,12 @@ length_array: .include "lc_detect.s" .include "gr_fast_clear.s" .include "text_print.s" + .include "simple_sounds.s" + .include "pt3_lib_detect_model.s" + .include "pt3_lib_mockingboard_detect.s" + .include "pt3_lib_mockingboard_setup.s" + .include "interrupt_handler.s" + .include "pt3_lib_mockingboard_patch.s" qload_end: