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

ootw: c3 and c4 split off

This commit is contained in:
Vince Weaver 2021-03-23 10:33:51 -04:00
parent 4bebba110f
commit af68a322e7
19 changed files with 135 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
games/ootw/Makefile
View File

@ -5,27 +5,28 @@ PNG2RLE = ../../utils/gr-utils/png2rle
PNG2LZ4 = ../../utils/gr-utils/png2lz4
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
EMPTY_DISK = ../../empty_disk
all: ootw.dsk ootw_side2.dsk ootw_side3.dsk
ootw.dsk: HELLO TITLE \
./intro/INTRO ./ootw_c1/OOTW_C1 ./ootw_c2/OOTW_C2 \
OOTW_C3 OOTW_C4 OOTW_C5
cp empty.dsk ootw.dsk
./ootw_c3/OOTW_C3 ./ootw_c4/OOTW_C4 OOTW_C5
cp $(EMPTY_DISK)/empty.dsk ootw.dsk
$(DOS33) -y ootw.dsk SAVE A HELLO
$(DOS33) -y ootw.dsk BSAVE -a 0xd00 TITLE
$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./intro/INTRO INTRO
$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c1/OOTW_C1
$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c2/OOTW_C2
$(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C3
$(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C4
$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c3/OOTW_C3
$(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c4/OOTW_C4
$(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C5
# $(DOS33) -y ootw.dsk BSAVE -a 0x1700 AUDIO_TEST
# $(DOS33) -y ootw.dsk BSAVE -a 0x2000 COMPRESS-TEST
ootw_side2.dsk: HELLO TITLE \
OOTW_C6 OOTW_C7 OOTW_C8 OOTW_C9 OOTW_C10
cp empty.dsk ootw_side2.dsk
cp $(EMPTY_DISK)/empty.dsk ootw_side2.dsk
$(DOS33) -y ootw_side2.dsk SAVE A HELLO HELLO
$(DOS33) -y ootw_side2.dsk BSAVE -a 0xd00 TITLE
$(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 OOTW_C6
@ -36,7 +37,7 @@ ootw_side2.dsk: HELLO TITLE \
ootw_side3.dsk: HELLO TITLE ENDING \
OOTW_C11 OOTW_C12 OOTW_C13 OOTW_C14 OOTW_C15
cp empty.dsk ootw_side3.dsk
cp $(EMPTY_DISK)/empty.dsk ootw_side3.dsk
$(DOS33) -y ootw_side3.dsk SAVE A HELLO HELLO
$(DOS33) -y ootw_side3.dsk BSAVE -a 0xd00 TITLE
$(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 OOTW_C11
@ -48,37 +49,6 @@ ootw_side3.dsk: HELLO TITLE ENDING \
####
OOTW_C3: ootw_c3.o
ld65 -o OOTW_C3 ootw_c3.o -C ../../linker_scripts/apple2_1700.inc
ootw_c3.o: ootw_c3.s \
gr_copy.s gr_copy_offset.s gr_fast_clear.s gr_pageflip.s gr_unrle.s \
gr_putsprite.s gr_putsprite_flipped.s gr_putsprite_crop.s \
keyboard.s \
ootw_c3_vent.s \
ootw_graphics/sprites/physicist_rolling.inc \
ootw_graphics/l3vent/ootw_c3_vent.inc
ca65 -o ootw_c3.o ootw_c3.s -l ootw_c3.lst
###
OOTW_C4: ootw_c4.o
ld65 -o OOTW_C4 ootw_c4.o -C ../../linker_scripts/apple2_1700.inc
ootw_c4.o: ootw_c4.s \
gr_copy.s gr_twoscreen_scroll.s gr_fast_clear.s gr_pageflip.s \
gr_unrle.s gr_hlin.s \
gr_putsprite.s gr_putsprite_flipped.s gr_putsprite_crop.s \
keyboard.s gr_run_sequence.s physicist.s \
collision.s alien.s alien_laser.s \
ootw_c4_city.s ootw_c4_action.s \
door.s laser.s shield.s blast.s gun.s charger.s \
ootw_graphics/sprites/physicist.inc \
ootw_graphics/l4city/ootw_c4_city.inc
ca65 -o ootw_c4.o ootw_c4.s -l ootw_c4.lst
###
OOTW_C5: ootw_c5.o
ld65 -o OOTW_C5 ootw_c5.o -C ../../linker_scripts/apple2_1700.inc
@ -260,6 +230,11 @@ ootw_c1/OOTW_C1:
ootw_c2/OOTW_C2:
cd ootw_c2 && make
ootw_c3/OOTW_C3:
cd ootw_c3 && make
ootw_c4/OOTW_C4:
cd ootw_c4 && make
####

BIN
games/ootw/empty.dsk
View File

Binary file not shown.

35
games/ootw/ootw_c3/Makefile Normal file
View File

@ -0,0 +1,35 @@
include ../../../Makefile.inc
COMMON = ..
SPRITES = ../ootw_graphics/sprites
LINKER_SCRIPTS = ../../../linker_scripts
all: OOTW_C3
####
OOTW_C3: ootw_c3.o
ld65 -o OOTW_C3 ootw_c3.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
ootw_c3.o: ootw_c3.s \
$(COMMON)/gr_copy.s \
$(COMMON)/gr_copy_offset.s \
$(COMMON)/gr_fast_clear.s \
$(COMMON)/gr_pageflip.s \
$(COMMON)/gr_unrle.s \
$(COMMON)/gr_putsprite.s \
$(COMMON)/gr_putsprite_flipped.s \
$(COMMON)/gr_putsprite_crop.s \
$(COMMON)/keyboard.s \
ootw_c3_vent.s \
$(SPRITES)/physicist_rolling.inc \
graphics/l3_vent/ootw_c3_vent.inc
ca65 -o ootw_c3.o ootw_c3.s -l ootw_c3.lst
#####
clean:
rm -f *~ *.o *.lst *.lz4 OOTW_C3

0
games/ootw/ootw_graphics/l3vent/Makefile → games/ootw/ootw_c3/graphics/l3_vent/Makefile
View File

0
games/ootw/ootw_graphics/l3vent/ootw_c3_vent.inc → games/ootw/ootw_c3/graphics/l3_vent/ootw_c3_vent.inc
View File

0
games/ootw/ootw_graphics/l3vent/vent.png → games/ootw/ootw_c3/graphics/l3_vent/vent.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

33
games/ootw/ootw_c3.s → games/ootw/ootw_c3/ootw_c3.s
View File

@ -2,8 +2,8 @@
; by Vince "Deater" Weaver <vince@deater.net>
.include "zp.inc"
.include "hardware.inc"
.include "../zp.inc"
.include "../hardware.inc"
@ -80,24 +80,19 @@ end_message:
.byte 11,20,"ACCESS CODE: VENT",0
.include "ootw_c3_vent.s"
.include "text_print.s"
.include "gr_pageflip.s"
.include "gr_unrle.s"
.include "gr_fast_clear.s"
.include "gr_copy.s"
;.include "gr_copy_offset.s"
.include "gr_putsprite.s"
;.include "gr_putsprite_flipped.s"
.include "gr_putsprite_crop.s"
.include "gr_offsets.s"
.include "gr_offsets_hl.s"
;.include "gr_run_sequence.s"
;.include "gr_overlay.s"
;.include "random16.s"
.include "keyboard.s"
.include "../text_print.s"
.include "../gr_pageflip.s"
.include "../gr_unrle.s"
.include "../gr_fast_clear.s"
.include "../gr_copy.s"
.include "../gr_putsprite.s"
.include "../gr_putsprite_crop.s"
.include "../gr_offsets.s"
.include "../gr_offsets_hl.s"
.include "../keyboard.s"
; room backgrounds
.include "ootw_graphics/l3vent/ootw_c3_vent.inc"
.include "graphics/l3_vent/ootw_c3_vent.inc"
; sprites
.include "ootw_graphics/sprites/physicist_rolling.inc"
.include "../ootw_graphics/sprites/physicist_rolling.inc"

0
games/ootw/ootw_c3_vent.s → games/ootw/ootw_c3/ootw_c3_vent.s
View File

46
games/ootw/ootw_c4/Makefile Normal file
View File

@ -0,0 +1,46 @@
include ../../../Makefile.inc
COMMON = ..
LINKER_SCRIPTS = ../../../linker_scripts
SPRITES = ../ootw_graphics/sprites
all: OOTW_C4
####
OOTW_C4: ootw_c4.o
ld65 -o OOTW_C4 ootw_c4.o -C $(LINKER_SCRIPTS)/apple2_1700.inc
ootw_c4.o: ootw_c4.s \
$(COMMON)/gr_copy.s \
$(COMMON)/gr_twoscreen_scroll.s \
$(COMMON)/gr_fast_clear.s \
$(COMMON)/gr_pageflip.s \
$(COMMON)/gr_unrle.s \
$(COMMON)/gr_hlin.s \
$(COMMON)/gr_putsprite.s \
$(COMMON)/gr_putsprite_flipped.s \
$(COMMON)/gr_putsprite_crop.s \
$(COMMON)/keyboard.s \
$(COMMON)/gr_run_sequence.s \
$(COMMON)/physicist.s \
$(COMMON)/collision.s \
$(COMMON)/alien.s \
$(COMMON)/alien_laser.s \
ootw_c4_city.s ootw_c4_action.s \
$(COMMON)/door.s \
$(COMMON)/laser.s \
$(COMMON)/shield.s \
$(COMMON)/blast.s \
$(COMMON)/gun.s \
$(COMMON)/charger.s \
$(SPRITES)/physicist.inc \
graphics/l4_city/ootw_c4_city.inc
ca65 -o ootw_c4.o ootw_c4.s -l ootw_c4.lst
###
clean:
rm -f *~ *.o *.lst *.lz4 OOTW_C4

0
games/ootw/ootw_graphics/l4city/Makefile → games/ootw/ootw_c4/graphics/l4_city/Makefile
View File

0
games/ootw/ootw_graphics/l4city/causeway1.png → games/ootw/ootw_c4/graphics/l4_city/causeway1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

0
games/ootw/ootw_graphics/l4city/causeway2.png → games/ootw/ootw_c4/graphics/l4_city/causeway2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 456 B

0
games/ootw/ootw_graphics/l4city/hallway.png → games/ootw/ootw_c4/graphics/l4_city/hallway.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 323 B

0
games/ootw/ootw_graphics/l4city/ootw_c4_city.inc → games/ootw/ootw_c4/graphics/l4_city/ootw_c4_city.inc
View File

0
games/ootw/ootw_graphics/l4city/pit.png → games/ootw/ootw_c4/graphics/l4_city/pit.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

0
games/ootw/ootw_graphics/l4city/recharge.png → games/ootw/ootw_c4/graphics/l4_city/recharge.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

57
games/ootw/ootw_c4.s → games/ootw/ootw_c4/ootw_c4.s
View File

@ -2,8 +2,8 @@
; by Vince "Deater" Weaver <vince@deater.net>
.include "zp.inc"
.include "hardware.inc"
.include "../zp.inc"
.include "../hardware.inc"
@ -85,39 +85,38 @@ end_message:
.byte 11,20,"ACCESS CODE: RCHG",0
.include "ootw_c4_city.s"
.include "text_print.s"
.include "gr_pageflip.s"
.include "gr_unrle.s"
.include "gr_fast_clear.s"
.include "gr_copy.s"
.include "gr_hlin.s"
.include "gr_twoscreen_scroll.s"
.include "gr_putsprite.s"
.include "gr_putsprite_flipped.s"
.include "gr_putsprite_crop.s"
.include "gr_offsets.s"
;.include "random16.s"
.include "keyboard.s"
.include "../text_print.s"
.include "../gr_pageflip.s"
.include "../gr_unrle.s"
.include "../gr_fast_clear.s"
.include "../gr_copy.s"
.include "../gr_hlin.s"
.include "../gr_twoscreen_scroll.s"
.include "../gr_putsprite.s"
.include "../gr_putsprite_flipped.s"
.include "../gr_putsprite_crop.s"
.include "../gr_offsets.s"
.include "../keyboard.s"
.include "physicist.s"
.include "alien.s"
.include "../physicist.s"
.include "../alien.s"
.include "door.s"
.include "charger.s"
.include "gun.s"
.include "laser.s"
.include "shield.s"
.include "blast.s"
.include "collision.s"
.include "dummy_friend.s"
.include "alien_laser.s"
.include "../door.s"
.include "../charger.s"
.include "../gun.s"
.include "../laser.s"
.include "../shield.s"
.include "../blast.s"
.include "../collision.s"
.include "../dummy_friend.s"
.include "../alien_laser.s"
.include "ootw_c4_action.s"
; room backgrounds
.include "ootw_graphics/l4city/ootw_c4_city.inc"
.include "graphics/l4_city/ootw_c4_city.inc"
; sprites
.include "ootw_graphics/sprites/physicist.inc"
.include "ootw_graphics/sprites/alien.inc"
.include "../ootw_graphics/sprites/physicist.inc"
.include "../ootw_graphics/sprites/alien.inc"

0
games/ootw/ootw_c4_action.s → games/ootw/ootw_c4/ootw_c4_action.s
View File

0
games/ootw/ootw_c4_city.s → games/ootw/ootw_c4/ootw_c4_city.s
View File