Apple-2-SW
/
dos33fsprogs
mirror of https://github.com/deater/dos33fsprogs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lemm: move some things to qload to free up space

This commit is contained in:
Vince Weaver 2022-03-28 00:53:34 -04:00
parent bb027fa983
commit 6d5b1ff592
5 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
games/lemm/Makefile
View File

@ -19,7 +19,7 @@ all: lemm.dsk
lemm.dsk: QBOOT QLOAD LEMM \
LEVEL1 LEVEL2 LEVEL3 LEVEL4 LEVEL5
LEVEL1 LEVEL2 LEVEL3 LEVEL4 LEVEL5 LEVEL6
cp $(EMPTY_DISK) lemm.dsk
$(DOS33_RAW) lemm.dsk 0 0 QBOOT 0 1
$(DOS33_RAW) lemm.dsk 0 2 QBOOT 1 1
@ -31,6 +31,7 @@ lemm.dsk: QBOOT QLOAD LEMM \
$(DOS33_RAW) lemm.dsk 16 0 LEVEL3 0 0
$(DOS33_RAW) lemm.dsk 19 0 LEVEL4 0 0
$(DOS33_RAW) lemm.dsk 22 0 LEVEL5 0 0
$(DOS33_RAW) lemm.dsk 25 0 LEVEL6 0 0
###
@ -47,9 +48,11 @@ QLOAD: qload.o
ld65 -o QLOAD qload.o -C $(LINKER_SCRIPTS)/apple2_1200.inc
qload.o: qload.s qboot.inc \
hgr.inc \
audio.s decompress_fast_v2.s gr_offsets.s \
wait.s wait_a_bit.s \
hgr_hlin.s hgr_vlin.s hgr_box.s hgr_tables.s
hgr_hlin.s hgr_vlin.s hgr_box.s hgr_tables.s hgr_14x14_sprite.s \
hgr_partial_restore.s
ca65 -o qload.o qload.s -l qload.lst
###
@ -68,6 +71,11 @@ qload.inc: generate_common QLOAD
./generate_common -a 0x1200 -s hgr_hlin_page_toggle qload.lst >> qload.inc
./generate_common -a 0x1200 -s hgr_vlin_page_toggle qload.lst >> qload.inc
./generate_common -a 0x1200 -s hgr_box_page_toggle qload.lst >> qload.inc
./generate_common -a 0x1200 -s hgr_make_tables qload.lst >> qload.inc
./generate_common -a 0x1200 -s hgr_partial_restore qload.lst >> qload.inc
./generate_common -a 0x1200 -s hgr_draw_sprite_14x14 qload.lst >> qload.inc
./generate_common -a 0x1200 -s crosshair_sprite_l qload.lst >> qload.inc
./generate_common -a 0x1200 -s select_sprite_l qload.lst >> qload.inc
###
@ -90,12 +98,12 @@ lemm_test.o: lemm_test.s zp.inc hardware.inc \
LEMM: lemm.o
ld65 -o LEMM lemm.o -C ../../linker_scripts/apple2_6000.inc
lemm.o: lemm.s zp.inc hardware.inc qload.inc \
lemm.o: lemm.s zp.inc hardware.inc qload.inc hgr.inc \
graphics/sprites.inc \
intro_level.s update_time.s hgr_sprite.s draw_flames.s \
draw_door.s move_lemming.s draw_lemming.s \
update_menu.s init_level.s \
interrupt_handler.s keyboard.s draw_pointer.s \
interrupt_handler.s keyboard.s \
pointer_sprites.inc particle_hgr.s release_lemming.s \
title.s audio.s letsgo.s load_music.s
ca65 -o lemm.o lemm.s -l lemm.lst
@ -108,7 +116,6 @@ lemm.inc: generate_common LEMM
./generate_common -a 0x6000 -s chunk_l_smc lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s load_song_chunk lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s intro_level lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s hgr_make_tables lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s play_letsgo lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s lemming_out lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s lemming_exploding lemm.lst >> lemm.inc
@ -123,8 +130,6 @@ lemm.inc: generate_common LEMM
./generate_common -a 0x6000 -s draw_door lemm.lst >> lemm.inc
./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 draw_pointer lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s erase_pointer 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 outro_level lemm.lst >> lemm.inc
@ -144,6 +149,8 @@ lemm.inc: generate_common LEMM
./generate_common -a 0x6000 -s intro_text_smc_h lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s release_lemming lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s init_level lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s draw_pointer lemm.lst >> lemm.inc
./generate_common -a 0x6000 -s erase_pointer lemm.lst >> lemm.inc
####
@ -198,6 +205,16 @@ level5.o: level5.s zp.inc hardware.inc qload.inc lemm.inc \
graphics/graphics_level5.inc
ca65 -o level5.o level5.s -l level5.lst
####
LEVEL6: level6.o
ld65 -o LEVEL6 level6.o -C ../../linker_scripts/apple2_9000.inc
level6.o: level6.s zp.inc hardware.inc qload.inc lemm.inc \
release_lemming.s \
graphics/graphics_level6.inc
ca65 -o level6.o level6.s -l level6.lst
@ -219,6 +236,6 @@ graphics/graphics_test.inc:
clean:
rm -f *~ *.o *.lst HELLO LEMM LEMM_TEST generate_common \
LEVEL1 LEVEL2 LEVEL3 LEVEL4 LEVEL5 \
lemm.inc
LEVEL1 LEVEL2 LEVEL3 LEVEL4 LEVEL5 LEVEL6 \
lemm.inc qload.inc

1
games/lemm/draw_pointer.s
View File

@ -1,3 +1,4 @@
;====================================
; draw pointer
;====================================

11
games/lemm/hgr_tables.s
View File

@ -1,13 +1,4 @@
;div7_table = $bc00
;mod7_table = $bd00
;hposn_high = $be00
;hposn_low = $bf00
div7_table = $c00
mod7_table = $d00
hposn_high = $e00
hposn_low = $f00
.include "hgr.inc"
;=====================

16
games/lemm/lemm.s
View File

@ -2,11 +2,11 @@
; by deater (Vince Weaver) <vince@deater.net>
; Zero Page
.include "zp.inc"
.include "zp.inc" ; Zero Page use
.include "hardware.inc"
.include "qload.inc"
.include "lemming_status.inc"
.include "hgr.inc"
lemm:
;=====================
@ -235,7 +235,7 @@ zurg:
cmp #'1'+$80
bcc oof
cmp #'6'+$80
cmp #'7'+$80
bcs oof
and #$7f
@ -296,7 +296,7 @@ level_won:
inc WHICH_LEVEL
lda WHICH_LEVEL
cmp #6
cmp #7
bcc level_continue
lda #1 ; wrap to level1?
@ -324,19 +324,15 @@ level_continue:
.include "gr_fast_clear.s"
.include "hgr_partial_save.s"
.include "move_lemming.s"
.include "draw_lemming.s"
.include "hgr_14x14_sprite.s"
.include "text_print.s"
.include "lc_detect.s"
.include "draw_pointer.s"
.include "hgr_tables.s"
.include "hgr_sprite.s"
.include "update_time.s"
.include "intro_level.s"
@ -363,6 +359,10 @@ level_continue:
; .include "hgr_hlin.s"
; .include "hgr_vlin.s"
; .include "hgr_box.s"
; .include "hgr_tables.s"
; .include "hgr_partial_restore.s"
; .include "hgr_14x14_sprite.s"
; pt3 player

14
games/lemm/qload.s
View File

@ -161,27 +161,27 @@ error_string:
which_disk_array:
.byte 1,1,1,1 ; LEMM, LEVEL1, LEVEL2, LEVEL3
.byte 1,1,1,1 ; LEVEL4, LEVEL5
.byte 1,1,1,1 ; LEVEL4, LEVEL5, LEVEL6
.byte 1,1,1,1 ;
load_address_array:
.byte $60,$90,$90,$90 ; LEMM, LEVEL1, LEVEL2, LEVEL3
.byte $90,$90,$A0,$A0 ; LEVEL4, LEVEL5
.byte $A0,$A0,$A0,$A0 ;
.byte $90,$90,$90,$90 ; LEVEL4, LEVEL5, LEVEL6
.byte $90,$90,$90,$90 ;
track_array:
.byte 3,10,13,16 ; LEMM, LEVEL1, LEVEL2, LEVEL3
.byte 19,22,25,28 ; LEVEL4, LEVEL5
.byte 19,22,25,28 ; LEVEL4, LEVEL5, LEVEL6
.byte 31,31,31,31 ;
sector_array:
.byte 0, 0, 0, 0 ; LEMM, LEVEL1, LEVEL2, LEVEL3
.byte 0, 0, 0, 0 ; LEVEL4, LEVEL5
.byte 0, 0, 0, 0 ; LEVEL4, LEVEL5, LEVEL6
.byte 0, 0, 0, 0 ;
length_array:
.byte 48, 46, 46, 46 ; LEMM, LEVEL1, LEVEL2, LEVEL3
.byte 46, 46, 32, 32 ; LEVEL4, LEVEL5
.byte 46, 46, 46, 32 ; LEVEL4, LEVEL5, LEVEL6
.byte 32, 32, 32, 32 ;
@ -194,6 +194,8 @@ length_array:
.include "hgr_vlin.s"
.include "hgr_box.s"
.include "hgr_tables.s"
.include "hgr_partial_restore.s"
.include "hgr_14x14_sprite.s"
qload_end: