From 2e213c6568f7b9bcdc5653dab5be9125bee29886 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 23 Mar 2021 11:56:45 -0400 Subject: [PATCH] ootw: things mostly building again --- games/ootw/Makefile | 181 ++---------------- games/ootw/ending/Makefile | 29 +++ .../audio}/ootw_outro.pt3 | Bin games/ootw/{ => ending}/ending.s | 32 ++-- .../graphics/{l16_end => ending}/Makefile | 0 .../graphics/{l16_end => ending}/flying01.png | Bin .../graphics/{l16_end => ending}/flying03.png | Bin .../graphics/{l16_end => ending}/flying05.png | Bin .../graphics/{l16_end => ending}/flying07.png | Bin .../graphics/{l16_end => ending}/flying09.png | Bin .../graphics/{l16_end => ending}/flying11.png | Bin .../{l16_end => ending}/left_unfurl1.png | Bin .../{l16_end => ending}/left_unfurl2.png | Bin .../graphics/{l16_end => ending}/onboard.png | Bin .../{l16_end => ending}/ootw_c16_end.inc | 0 .../{l16_end => ending}/right_unfurl1.png | Bin .../{l16_end => ending}/right_unfurl2.png | Bin .../{l16_end => ending}/rooftop00.png | Bin .../{l16_end => ending}/rooftop01.png | Bin .../{l16_end => ending}/rooftop02.png | Bin .../{l16_end => ending}/rooftop03.png | Bin .../graphics/{l16_end => ending}/sky_bg.png | Bin .../{l16_end => ending}/the_end01.png | Bin .../{l16_end => ending}/the_end02.png | Bin .../{l16_end => ending}/the_end03.png | Bin .../{l16_end => ending}/the_end04.png | Bin .../{l16_end => ending}/the_end05.png | Bin .../{l16_end => ending}/the_end06.png | Bin .../{l16_end => ending}/the_end07.png | Bin .../{l16_end => ending}/the_end08.png | Bin .../{l16_end => ending}/the_end09.png | Bin .../{l16_end => ending}/the_end10.png | Bin .../graphics/{l16_end => ending}/wing_bg.png | Bin games/ootw/ootw_c10/Makefile | 40 ++++ games/ootw/ootw_c10/ootw_c10.s | 52 +++-- games/ootw/ootw_c11/Makefile | 40 ++++ games/ootw/ootw_c11/ootw_c11.s | 52 +++-- games/ootw/ootw_c12/Makefile | 40 ++++ games/ootw/ootw_c12/ootw_c12.s | 52 +++-- games/ootw/ootw_c13/Makefile | 40 ++++ games/ootw/ootw_c13/ootw_c13.s | 52 +++-- games/ootw/ootw_c14/Makefile | 40 ++++ games/ootw/ootw_c14/ootw_c14.s | 52 +++-- games/ootw/ootw_c15/Makefile | 46 +++++ games/ootw/ootw_c15/ootw_c15.s | 74 ++++--- games/ootw/ootw_c6/Makefile | 40 ++++ games/ootw/ootw_c6/ootw_c6.s | 52 +++-- games/ootw/ootw_c7/ootw_c7.s | 52 +++-- games/ootw/ootw_c8/Makefile | 40 ++++ games/ootw/ootw_c8/ootw_c8.s | 52 +++-- games/ootw/ootw_c9/Makefile | 40 ++++ games/ootw/ootw_c9/ootw_c9.s | 53 +++-- .../ootw/{ => pt3_player}/interrupt_handler.s | 1 + games/ootw/{ => pt3_player}/pt3_lib_core.s | 0 games/ootw/{ => pt3_player}/pt3_lib_init.s | 0 .../{ => pt3_player}/pt3_lib_irq_handler.s | 3 +- .../pt3_lib_mockingboard_detect.s | 0 .../pt3_lib_mockingboard_setup.s | 0 58 files changed, 677 insertions(+), 478 deletions(-) create mode 100644 games/ootw/ending/Makefile rename games/ootw/{ootw_audio => ending/audio}/ootw_outro.pt3 (100%) rename games/ootw/{ => ending}/ending.s (95%) rename games/ootw/ending/graphics/{l16_end => ending}/Makefile (100%) rename games/ootw/ending/graphics/{l16_end => ending}/flying01.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/flying03.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/flying05.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/flying07.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/flying09.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/flying11.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/left_unfurl1.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/left_unfurl2.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/onboard.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/ootw_c16_end.inc (100%) rename games/ootw/ending/graphics/{l16_end => ending}/right_unfurl1.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/right_unfurl2.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/rooftop00.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/rooftop01.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/rooftop02.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/rooftop03.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/sky_bg.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end01.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end02.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end03.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end04.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end05.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end06.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end07.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end08.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end09.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/the_end10.png (100%) rename games/ootw/ending/graphics/{l16_end => ending}/wing_bg.png (100%) create mode 100644 games/ootw/ootw_c10/Makefile create mode 100644 games/ootw/ootw_c11/Makefile create mode 100644 games/ootw/ootw_c12/Makefile create mode 100644 games/ootw/ootw_c13/Makefile create mode 100644 games/ootw/ootw_c14/Makefile create mode 100644 games/ootw/ootw_c15/Makefile create mode 100644 games/ootw/ootw_c6/Makefile create mode 100644 games/ootw/ootw_c8/Makefile create mode 100644 games/ootw/ootw_c9/Makefile rename games/ootw/{ => pt3_player}/interrupt_handler.s (98%) rename games/ootw/{ => pt3_player}/pt3_lib_core.s (100%) rename games/ootw/{ => pt3_player}/pt3_lib_init.s (100%) rename games/ootw/{ => pt3_player}/pt3_lib_irq_handler.s (97%) rename games/ootw/{ => pt3_player}/pt3_lib_mockingboard_detect.s (100%) rename games/ootw/{ => pt3_player}/pt3_lib_mockingboard_setup.s (100%) diff --git a/games/ootw/Makefile b/games/ootw/Makefile index 3093a51f..53412601 100644 --- a/games/ootw/Makefile +++ b/games/ootw/Makefile @@ -34,165 +34,18 @@ ootw_side2.dsk: HELLO TITLE \ $(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c9/OOTW_C9 OOTW_C9 $(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c10/OOTW_C10 OOTW_C10 -ootw_side3.dsk: HELLO TITLE ENDING \ - OOTW_C11 OOTW_C12 OOTW_C13 OOTW_C14 OOTW_C15 +ootw_side3.dsk: HELLO TITLE ./ending/ENDING \ + ./ootw_c11/OOTW_C11 ./ootw_c12/OOTW_C12 ./ootw_c13/OOTW_C13 \ + ./ootw_c14/OOTW_C14 ./ootw_c15/OOTW_C15 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 - $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 OOTW_C12 - $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 OOTW_C13 - $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 OOTW_C14 - $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 OOTW_C15 - $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ENDING - -#### - -OOTW_C6: ootw_c6.o - ld65 -o OOTW_C6 ootw_c6.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c6.o: ootw_c6.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 gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l6cave/ootw_c6_cave.inc - ca65 -o ootw_c6.o ootw_c6.s -l ootw_c6.lst -### - -OOTW_C7: ootw_c7.o - ld65 -o OOTW_C7 ootw_c7.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c7.o: ootw_c7.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 gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l7cave/ootw_c7_cave.inc - ca65 -o ootw_c7.o ootw_c7.s -l ootw_c7.lst -### - -OOTW_C8: ootw_c8.o - ld65 -o OOTW_C8 ootw_c8.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c8.o: ootw_c8.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 gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l8crawl/ootw_c8_crawl.inc - ca65 -o ootw_c8.o ootw_c8.s -l ootw_c8.lst - -### - -OOTW_C9: ootw_c9.o - ld65 -o OOTW_C9 ootw_c9.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c9.o: ootw_c9.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 gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l9swim/ootw_c9_swim.inc - ca65 -o ootw_c9.o ootw_c9.s -l ootw_c9.lst - -### - -OOTW_C10: ootw_c10.o - ld65 -o OOTW_C10 ootw_c10.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c10.o: ootw_c10.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 gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l9swim/ootw_c9_swim.inc - ca65 -o ootw_c10.o ootw_c10.s -l ootw_c10.lst - -### - -OOTW_C11: ootw_c11.o - ld65 -o OOTW_C11 ootw_c11.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c11.o: ootw_c11.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 gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l11above/ootw_c11_room.inc - ca65 -o ootw_c11.o ootw_c11.s -l ootw_c11.lst - -### - -OOTW_C12: ootw_c12.o - ld65 -o OOTW_C12 ootw_c12.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c12.o: ootw_c12.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 gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l12room/ootw_c12_room.inc - ca65 -o ootw_c12.o ootw_c12.s -l ootw_c12.lst - -### - -OOTW_C13: ootw_c13.o - ld65 -o OOTW_C13 ootw_c13.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c13.o: ootw_c13.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 gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l13room/ootw_c13_room.inc - ca65 -o ootw_c13.o ootw_c13.s -l ootw_c13.lst - - - - -### - -OOTW_C14: ootw_c14.o - ld65 -o OOTW_C14 ootw_c14.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c14.o: ootw_c14.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 gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l14arena/ootw_c14_arena.inc - ca65 -o ootw_c14.o ootw_c14.s -l ootw_c14.lst - -### - -OOTW_C15: ootw_c15.o - ld65 -o OOTW_C15 ootw_c15.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c15.o: ootw_c15.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 \ - gr_trapezoid.s \ - keyboard.s gr_run_sequence.s physicist.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l15final/ootw_c15_bath.inc \ - ootw_graphics/l15final/ootw_c15_walk.inc \ - ootw_graphics/l15final/ootw_c15_final.inc \ - ootw_graphics/l15final/ootw_c15_walkway.inc \ - ootw_graphics/l15final/ootw_c15_bridge.inc \ - ootw_graphics/l15final/ootw_c15_fall.inc - ca65 -o ootw_c15.o ootw_c15.s -l ootw_c15.lst - + $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c11/OOTW_C11 + $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c12/OOTW_C12 + $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c13/OOTW_C13 + $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c14/OOTW_C14 + $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c15/OOTW_C15 + $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ending/ENDING #### @@ -243,7 +96,7 @@ ootw_c11/OOTW_C11: cd ootw_c11 && make ootw_c12/OOTW_C12: - cd ootw_c12 & make + cd ootw_c12 && make ootw_c13/OOTW_C13: cd ootw_c13 && make @@ -254,6 +107,8 @@ ootw_c14/OOTW_C14: ootw_c15/OOTW_C15: cd ootw_c15 && make +ending/ENDING: + cd ending && make #### @@ -296,18 +151,6 @@ HELLO2: hello2.bas ##### -ENDING: ending.o - ld65 -o ENDING ending.o -C ../../linker_scripts/apple2_1700.inc - -ending.o: ending.s \ - pt3_lib_core.s pt3_lib_init.s pt3_lib_mockingboard_detect.s \ - pt3_lib_mockingboard_setup.s pt3_lib_irq_handler.s interrupt_handler.s \ - ootw_graphics/l15final/ootw_c15_final.inc \ - ootw_graphics/l16end/ootw_c16_end.inc \ - ootw_audio/ootw_outro.pt3 - ca65 -o ending.o ending.s -l ending.lst -##### - compress_test.inc: intro_graphics/07_soda/drinking01.png $(PNG2RLE) asm intro_graphics/07_soda/drinking01.png test_rle > compress_test.inc $(PNG2LZ4) asm intro_graphics/07_soda/drinking01.png test_lz4 >> compress_test.inc diff --git a/games/ootw/ending/Makefile b/games/ootw/ending/Makefile new file mode 100644 index 00000000..47138da7 --- /dev/null +++ b/games/ootw/ending/Makefile @@ -0,0 +1,29 @@ +include ../../../Makefile.inc + +LINKER_SCRIPTS = ../../../linker_scripts +PT3_PLAYER = ../pt3_player + +all: ENDING + +##### + +ENDING: ending.o + ld65 -o ENDING ending.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ending.o: ending.s \ + $(PT3_PLAYER)/pt3_lib_core.s \ + $(PT3_PLAYER)/pt3_lib_init.s \ + $(PT3_PLAYER)/pt3_lib_mockingboard_detect.s \ + $(PT3_PLAYER)/pt3_lib_mockingboard_setup.s \ + $(PT3_PLAYER)/pt3_lib_irq_handler.s \ + $(PT3_PLAYER)/interrupt_handler.s \ + ../ootw_c15/graphics/l15_final/ootw_c15_final.inc \ + graphics/ending/ootw_c16_end.inc \ + audio/ootw_outro.pt3 + ca65 -o ending.o ending.s -l ending.lst + +##### + +clean: + rm -f *~ *.o *.lst ENDING + diff --git a/games/ootw/ootw_audio/ootw_outro.pt3 b/games/ootw/ending/audio/ootw_outro.pt3 similarity index 100% rename from games/ootw/ootw_audio/ootw_outro.pt3 rename to games/ootw/ending/audio/ootw_outro.pt3 diff --git a/games/ootw/ending.s b/games/ootw/ending/ending.s similarity index 95% rename from games/ootw/ending.s rename to games/ootw/ending/ending.s index ae45a882..e87aa8ab 100644 --- a/games/ootw/ending.s +++ b/games/ootw/ending/ending.s @@ -5,8 +5,8 @@ ; by Vince "Deater" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ending: @@ -839,29 +839,29 @@ long_wait: -.include "text_print.s" -.include "gr_pageflip.s" -.include "gr_unrle.s" -.include "gr_fast_clear.s" -.include "gr_copy.s" -.include "gr_offsets.s" -.include "gr_overlay.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_fast_clear.s" +.include "../gr_copy.s" +.include "../gr_offsets.s" +.include "../gr_overlay.s" -.include "pt3_lib_core.s" -.include "pt3_lib_init.s" -.include "interrupt_handler.s" -.include "pt3_lib_mockingboard_detect.s" -.include "pt3_lib_mockingboard_setup.s" +.include "../pt3_player/pt3_lib_core.s" +.include "../pt3_player/pt3_lib_init.s" +.include "../pt3_player/interrupt_handler.s" +.include "../pt3_player/pt3_lib_mockingboard_detect.s" +.include "../pt3_player/pt3_lib_mockingboard_setup.s" ; backgrounds ;.include "ootw_graphics/l15final/ootw_c15_final.inc" -.include "ootw_graphics/l16end/ootw_c16_end.inc" +.include "graphics/ending/ootw_c16_end.inc" PT3_LOC = song ; must be page aligned .align 256 song: -.incbin "ootw_audio/ootw_outro.pt3" +.incbin "audio/ootw_outro.pt3" diff --git a/games/ootw/ending/graphics/l16_end/Makefile b/games/ootw/ending/graphics/ending/Makefile similarity index 100% rename from games/ootw/ending/graphics/l16_end/Makefile rename to games/ootw/ending/graphics/ending/Makefile diff --git a/games/ootw/ending/graphics/l16_end/flying01.png b/games/ootw/ending/graphics/ending/flying01.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/flying01.png rename to games/ootw/ending/graphics/ending/flying01.png diff --git a/games/ootw/ending/graphics/l16_end/flying03.png b/games/ootw/ending/graphics/ending/flying03.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/flying03.png rename to games/ootw/ending/graphics/ending/flying03.png diff --git a/games/ootw/ending/graphics/l16_end/flying05.png b/games/ootw/ending/graphics/ending/flying05.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/flying05.png rename to games/ootw/ending/graphics/ending/flying05.png diff --git a/games/ootw/ending/graphics/l16_end/flying07.png b/games/ootw/ending/graphics/ending/flying07.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/flying07.png rename to games/ootw/ending/graphics/ending/flying07.png diff --git a/games/ootw/ending/graphics/l16_end/flying09.png b/games/ootw/ending/graphics/ending/flying09.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/flying09.png rename to games/ootw/ending/graphics/ending/flying09.png diff --git a/games/ootw/ending/graphics/l16_end/flying11.png b/games/ootw/ending/graphics/ending/flying11.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/flying11.png rename to games/ootw/ending/graphics/ending/flying11.png diff --git a/games/ootw/ending/graphics/l16_end/left_unfurl1.png b/games/ootw/ending/graphics/ending/left_unfurl1.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/left_unfurl1.png rename to games/ootw/ending/graphics/ending/left_unfurl1.png diff --git a/games/ootw/ending/graphics/l16_end/left_unfurl2.png b/games/ootw/ending/graphics/ending/left_unfurl2.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/left_unfurl2.png rename to games/ootw/ending/graphics/ending/left_unfurl2.png diff --git a/games/ootw/ending/graphics/l16_end/onboard.png b/games/ootw/ending/graphics/ending/onboard.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/onboard.png rename to games/ootw/ending/graphics/ending/onboard.png diff --git a/games/ootw/ending/graphics/l16_end/ootw_c16_end.inc b/games/ootw/ending/graphics/ending/ootw_c16_end.inc similarity index 100% rename from games/ootw/ending/graphics/l16_end/ootw_c16_end.inc rename to games/ootw/ending/graphics/ending/ootw_c16_end.inc diff --git a/games/ootw/ending/graphics/l16_end/right_unfurl1.png b/games/ootw/ending/graphics/ending/right_unfurl1.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/right_unfurl1.png rename to games/ootw/ending/graphics/ending/right_unfurl1.png diff --git a/games/ootw/ending/graphics/l16_end/right_unfurl2.png b/games/ootw/ending/graphics/ending/right_unfurl2.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/right_unfurl2.png rename to games/ootw/ending/graphics/ending/right_unfurl2.png diff --git a/games/ootw/ending/graphics/l16_end/rooftop00.png b/games/ootw/ending/graphics/ending/rooftop00.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/rooftop00.png rename to games/ootw/ending/graphics/ending/rooftop00.png diff --git a/games/ootw/ending/graphics/l16_end/rooftop01.png b/games/ootw/ending/graphics/ending/rooftop01.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/rooftop01.png rename to games/ootw/ending/graphics/ending/rooftop01.png diff --git a/games/ootw/ending/graphics/l16_end/rooftop02.png b/games/ootw/ending/graphics/ending/rooftop02.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/rooftop02.png rename to games/ootw/ending/graphics/ending/rooftop02.png diff --git a/games/ootw/ending/graphics/l16_end/rooftop03.png b/games/ootw/ending/graphics/ending/rooftop03.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/rooftop03.png rename to games/ootw/ending/graphics/ending/rooftop03.png diff --git a/games/ootw/ending/graphics/l16_end/sky_bg.png b/games/ootw/ending/graphics/ending/sky_bg.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/sky_bg.png rename to games/ootw/ending/graphics/ending/sky_bg.png diff --git a/games/ootw/ending/graphics/l16_end/the_end01.png b/games/ootw/ending/graphics/ending/the_end01.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end01.png rename to games/ootw/ending/graphics/ending/the_end01.png diff --git a/games/ootw/ending/graphics/l16_end/the_end02.png b/games/ootw/ending/graphics/ending/the_end02.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end02.png rename to games/ootw/ending/graphics/ending/the_end02.png diff --git a/games/ootw/ending/graphics/l16_end/the_end03.png b/games/ootw/ending/graphics/ending/the_end03.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end03.png rename to games/ootw/ending/graphics/ending/the_end03.png diff --git a/games/ootw/ending/graphics/l16_end/the_end04.png b/games/ootw/ending/graphics/ending/the_end04.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end04.png rename to games/ootw/ending/graphics/ending/the_end04.png diff --git a/games/ootw/ending/graphics/l16_end/the_end05.png b/games/ootw/ending/graphics/ending/the_end05.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end05.png rename to games/ootw/ending/graphics/ending/the_end05.png diff --git a/games/ootw/ending/graphics/l16_end/the_end06.png b/games/ootw/ending/graphics/ending/the_end06.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end06.png rename to games/ootw/ending/graphics/ending/the_end06.png diff --git a/games/ootw/ending/graphics/l16_end/the_end07.png b/games/ootw/ending/graphics/ending/the_end07.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end07.png rename to games/ootw/ending/graphics/ending/the_end07.png diff --git a/games/ootw/ending/graphics/l16_end/the_end08.png b/games/ootw/ending/graphics/ending/the_end08.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end08.png rename to games/ootw/ending/graphics/ending/the_end08.png diff --git a/games/ootw/ending/graphics/l16_end/the_end09.png b/games/ootw/ending/graphics/ending/the_end09.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end09.png rename to games/ootw/ending/graphics/ending/the_end09.png diff --git a/games/ootw/ending/graphics/l16_end/the_end10.png b/games/ootw/ending/graphics/ending/the_end10.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/the_end10.png rename to games/ootw/ending/graphics/ending/the_end10.png diff --git a/games/ootw/ending/graphics/l16_end/wing_bg.png b/games/ootw/ending/graphics/ending/wing_bg.png similarity index 100% rename from games/ootw/ending/graphics/l16_end/wing_bg.png rename to games/ootw/ending/graphics/ending/wing_bg.png diff --git a/games/ootw/ootw_c10/Makefile b/games/ootw/ootw_c10/Makefile new file mode 100644 index 00000000..3d1e33f8 --- /dev/null +++ b/games/ootw/ootw_c10/Makefile @@ -0,0 +1,40 @@ +include ../../../Makefile.inc + +COMMON = .. +LINKER_SCRIPTS = ../../../linker_scripts +SPRITES = ../sprites + +all: OOTW_C10 + +#### + +OOTW_C10: ootw_c10.o + ld65 -o OOTW_C10 ootw_c10.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c10.o: ootw_c10.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 \ + $(COMMON)/gr_run_sequence.s \ + $(COMMON)/physicist.s \ + $(COMMON)/collision.s \ + $(COMMON)/door.s \ + $(COMMON)/laser.s \ + $(COMMON)/gun.s \ + $(COMMON)/blast.s \ + $(COMMON)/shield.s \ + $(SPRITES)/physicist.inc \ + ../ootw_c9/graphics/l9_swim/ootw_c9_swim.inc + ca65 -o ootw_c10.o ootw_c10.s -l ootw_c10.lst + +##### + +clean: + rm -f *~ *.o *.lst OOTW_C10 + diff --git a/games/ootw/ootw_c10/ootw_c10.s b/games/ootw/ootw_c10/ootw_c10.s index 357cea93..fc000a66 100644 --- a/games/ootw/ootw_c10/ootw_c10.s +++ b/games/ootw/ootw_c10/ootw_c10.s @@ -4,8 +4,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ;============================ @@ -490,36 +490,32 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: GRND",0 -.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_hlin.s" -.include "keyboard.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l9swim/ootw_c9_swim.inc" +.include "../ootw_c9/graphics/l9_swim/ootw_c9_swim.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_c11/Makefile b/games/ootw/ootw_c11/Makefile new file mode 100644 index 00000000..6f724daf --- /dev/null +++ b/games/ootw/ootw_c11/Makefile @@ -0,0 +1,40 @@ +include ../../../Makefile.inc + +COMMON = .. +LINKER_SCRIPTS = ../../../linker_scripts +SPRITES = ../sprites + +all: OOTW_C11 + +#### + +OOTW_C11: ootw_c11.o + ld65 -o OOTW_C11 ootw_c11.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c11.o: ootw_c11.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 \ + $(COMMON)/gr_run_sequence.s \ + $(COMMON)/physicist.s \ + $(COMMON)/collision.s \ + $(COMMON)/door.s \ + $(COMMON)/laser.s \ + $(COMMON)/gun.s \ + $(COMMON)/blast.s \ + $(COMMON)/shield.s \ + $(SPRITES)/physicist.inc \ + graphics/l11_above/ootw_c11_room.inc + ca65 -o ootw_c11.o ootw_c11.s -l ootw_c11.lst + +##### + +clean: + rm -f *~ *.o *.lst OOTW_C11 + diff --git a/games/ootw/ootw_c11/ootw_c11.s b/games/ootw/ootw_c11/ootw_c11.s index 37136f6a..e25f16d0 100644 --- a/games/ootw/ootw_c11/ootw_c11.s +++ b/games/ootw/ootw_c11/ootw_c11.s @@ -4,8 +4,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ;============================ @@ -490,36 +490,32 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: ABVE",0 -.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_hlin.s" -.include "keyboard.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l11above/ootw_c11_room.inc" +.include "graphics/l11_above/ootw_c11_room.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_c12/Makefile b/games/ootw/ootw_c12/Makefile new file mode 100644 index 00000000..ca64d344 --- /dev/null +++ b/games/ootw/ootw_c12/Makefile @@ -0,0 +1,40 @@ +include ../../../Makefile.inc + +COMMON = .. +LINKER_SCRIPTS = ../../../linker_scripts +SPRITES = ../sprites + +all: OOTW_C12 + +#### + +OOTW_C12: ootw_c12.o + ld65 -o OOTW_C12 ootw_c12.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c12.o: ootw_c12.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 \ + $(COMMON)/gr_run_sequence.s \ + $(COMMON)/physicist.s \ + $(COMMON)/collision.s \ + $(COMMON)/door.s \ + $(COMMON)/laser.s \ + $(COMMON)/gun.s \ + $(COMMON)/blast.s \ + $(COMMON)/shield.s \ + $(SPRITES)/physicist.inc \ + graphics/l12_room/ootw_c12_room.inc + ca65 -o ootw_c12.o ootw_c12.s -l ootw_c12.lst + +##### + +clean: + rm -f *~ *.o *.lst OOTW_C12 + diff --git a/games/ootw/ootw_c12/ootw_c12.s b/games/ootw/ootw_c12/ootw_c12.s index 2c005bab..ba4f05bd 100644 --- a/games/ootw/ootw_c12/ootw_c12.s +++ b/games/ootw/ootw_c12/ootw_c12.s @@ -4,8 +4,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ;============================ @@ -490,36 +490,32 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: THRW",0 -.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_hlin.s" -.include "keyboard.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l12room/ootw_c12_room.inc" +.include "graphics/l12_room/ootw_c12_room.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_c13/Makefile b/games/ootw/ootw_c13/Makefile new file mode 100644 index 00000000..24a50b7e --- /dev/null +++ b/games/ootw/ootw_c13/Makefile @@ -0,0 +1,40 @@ +include ../../../Makefile.inc + +COMMON = .. +LINKER_SCRIPTS = ../../../linker_scripts +SPRITES = ../sprites + +all: OOTW_C13 + +#### + +OOTW_C13: ootw_c13.o + ld65 -o OOTW_C13 ootw_c13.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c13.o: ootw_c13.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 \ + $(COMMON)/gr_run_sequence.s \ + $(COMMON)/physicist.s \ + $(COMMON)/collision.s \ + $(COMMON)/door.s \ + $(COMMON)/laser.s \ + $(COMMON)/gun.s \ + $(COMMON)/blast.s \ + $(COMMON)/shield.s \ + $(SPRITES)/physicist.inc \ + graphics/l13_room/ootw_c13_room.inc + ca65 -o ootw_c13.o ootw_c13.s -l ootw_c13.lst + +##### + +clean: + rm -f *~ *.o *.lst OOTW_C13 + diff --git a/games/ootw/ootw_c13/ootw_c13.s b/games/ootw/ootw_c13/ootw_c13.s index 8d35f310..f8116c4e 100644 --- a/games/ootw/ootw_c13/ootw_c13.s +++ b/games/ootw/ootw_c13/ootw_c13.s @@ -4,8 +4,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ;============================ @@ -490,36 +490,32 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: ARMS",0 -.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_hlin.s" -.include "keyboard.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l13room/ootw_c13_room.inc" +.include "graphics/l13_room/ootw_c13_room.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_c14/Makefile b/games/ootw/ootw_c14/Makefile new file mode 100644 index 00000000..f86613cd --- /dev/null +++ b/games/ootw/ootw_c14/Makefile @@ -0,0 +1,40 @@ +include ../../../Makefile.inc + +COMMON = .. +LINKER_SCRIPTS = ../../../linker_scripts +SPRITES = ../sprites + +all: OOTW_C14 + +#### + +OOTW_C14: ootw_c14.o + ld65 -o OOTW_C14 ootw_c14.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c14.o: ootw_c14.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 \ + $(COMMON)/gr_run_sequence.s \ + $(COMMON)/physicist.s \ + $(COMMON)/collision.s \ + $(COMMON)/door.s \ + $(COMMON)/laser.s \ + $(COMMON)/gun.s \ + $(COMMON)/blast.s \ + $(COMMON)/shield.s \ + $(SPRITES)/physicist.inc \ + graphics/l14_arena/ootw_c14_arena.inc + ca65 -o ootw_c14.o ootw_c14.s -l ootw_c14.lst + +##### + +clean: + rm -f *~ *.o *.lst OOTW_C14 + diff --git a/games/ootw/ootw_c14/ootw_c14.s b/games/ootw/ootw_c14/ootw_c14.s index de7ca9f2..436acb71 100644 --- a/games/ootw/ootw_c14/ootw_c14.s +++ b/games/ootw/ootw_c14/ootw_c14.s @@ -4,8 +4,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ;============================ @@ -490,36 +490,32 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: TANK",0 -.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_hlin.s" -.include "keyboard.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l14arena/ootw_c14_arena.inc" +.include "graphics/l14_arena/ootw_c14_arena.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_c15/Makefile b/games/ootw/ootw_c15/Makefile new file mode 100644 index 00000000..61d80e9e --- /dev/null +++ b/games/ootw/ootw_c15/Makefile @@ -0,0 +1,46 @@ +include ../../../Makefile.inc + +COMMON = .. +LINKER_SCRIPTS = ../../../linker_scripts +SPRITES = ../sprites + +all: OOTW_C15 + +#### + +OOTW_C15: ootw_c15.o + ld65 -o OOTW_C15 ootw_c15.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c15.o: ootw_c15.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)/gr_trapezoid.s \ + $(COMMON)/keyboard.s \ + $(COMMON)/gr_run_sequence.s \ + $(COMMON)/physicist.s \ + $(COMMON)/collision.s \ + $(COMMON)/door.s \ + $(COMMON)/laser.s \ + $(COMMON)/gun.s \ + $(COMMON)/blast.s \ + $(COMMON)/shield.s \ + $(SPRITES)/physicist.inc \ + graphics/l15_final/ootw_c15_bath.inc \ + graphics/l15_final/ootw_c15_walk.inc \ + graphics/l15_final/ootw_c15_final.inc \ + graphics/l15_final/ootw_c15_walkway.inc \ + graphics/l15_final/ootw_c15_bridge.inc \ + graphics/l15_final/ootw_c15_fall.inc + ca65 -o ootw_c15.o ootw_c15.s -l ootw_c15.lst + +##### + +clean: + rm -f *~ *.o *.lst OOTW_C15 + diff --git a/games/ootw/ootw_c15/ootw_c15.s b/games/ootw/ootw_c15/ootw_c15.s index c4a93db8..2624a6a4 100644 --- a/games/ootw/ootw_c15/ootw_c15.s +++ b/games/ootw/ootw_c15/ootw_c15.s @@ -3,8 +3,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ; TODO: ; die if not move and get shot by column (first screen) @@ -1055,50 +1055,46 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: ANKD",0 -.include "text_print.s" -.include "gr_pageflip.s" -.include "gr_unrle.s" -.include "gr_vlin.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_hlin.s" -.include "keyboard.s" -.include "gr_overlay.s" -.include "gr_run_sequence.s" -.include "random16.s" -.include "gr_trapezoid.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_vlin.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" +.include "../gr_overlay.s" +.include "../gr_run_sequence.s" +.include "../random16.s" +.include "../gr_trapezoid.s" -.include "physicist.s" -.include "alien.s" -.include "friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l15final/ootw_c15_bath.inc" -.include "ootw_graphics/l15final/ootw_c15_final.inc" +.include "graphics/l15_final/ootw_c15_bath.inc" +.include "graphics/l15_final/ootw_c15_final.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" -.include "ootw_graphics/sprites/friend.inc" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" +.include "../sprites/friend.inc" ; animations -.include "ootw_graphics/l15final/ootw_c15_walk.inc" -.include "ootw_graphics/l15final/ootw_c15_walkway.inc" -.include "ootw_graphics/l15final/ootw_c15_bridge.inc" -.include "ootw_graphics/l15final/ootw_c15_fall.inc" +.include "graphics/l15_final/ootw_c15_walk.inc" +.include "graphics/l15_final/ootw_c15_walkway.inc" +.include "graphics/l15_final/ootw_c15_bridge.inc" +.include "graphics/l15_final/ootw_c15_fall.inc" ;======================= diff --git a/games/ootw/ootw_c6/Makefile b/games/ootw/ootw_c6/Makefile new file mode 100644 index 00000000..cc5e618e --- /dev/null +++ b/games/ootw/ootw_c6/Makefile @@ -0,0 +1,40 @@ +include ../../../Makefile.inc + +COMMON = .. +LINKER_SCRIPTS = ../../../linker_scripts +SPRITES = ../sprites + +all: OOTW_C6 + +#### + +OOTW_C6: ootw_c6.o + ld65 -o OOTW_C6 ootw_c6.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c6.o: ootw_c6.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 \ + $(COMMON)/gr_run_sequence.s \ + $(COMMON)/physicist.s \ + $(COMMON)/collision.s \ + $(COMMON)/door.s \ + $(COMMON)/laser.s \ + $(COMMON)/gun.s \ + $(COMMON)/blast.s \ + $(COMMON)/shield.s \ + $(SPRITES)/physicist.inc \ + graphics/l6_cave/ootw_c6_cave.inc + ca65 -o ootw_c6.o ootw_c6.s -l ootw_c6.lst + +##### + +clean: + rm -f *~ *.o *.lst OOTW_C6 + diff --git a/games/ootw/ootw_c6/ootw_c6.s b/games/ootw/ootw_c6/ootw_c6.s index a6561c5e..f93bda1d 100644 --- a/games/ootw/ootw_c6/ootw_c6.s +++ b/games/ootw/ootw_c6/ootw_c6.s @@ -4,8 +4,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ;============================ @@ -490,36 +490,32 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: CEIL",0 -.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_hlin.s" -.include "keyboard.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l6cave/ootw_c6_cave.inc" +.include "graphics/l6_cave/ootw_c6_cave.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_c7/ootw_c7.s b/games/ootw/ootw_c7/ootw_c7.s index ec91c72c..337fc311 100644 --- a/games/ootw/ootw_c7/ootw_c7.s +++ b/games/ootw/ootw_c7/ootw_c7.s @@ -4,8 +4,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ;============================ @@ -490,36 +490,32 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: RUNC",0 -.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_hlin.s" -.include "keyboard.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l7cave/ootw_c7_cave.inc" +.include "graphics/l7_cave/ootw_c7_cave.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_c8/Makefile b/games/ootw/ootw_c8/Makefile new file mode 100644 index 00000000..b007e72a --- /dev/null +++ b/games/ootw/ootw_c8/Makefile @@ -0,0 +1,40 @@ +include ../../../Makefile.inc + +COMMON = .. +LINKER_SCRIPTS = ../../../linker_scripts +SPRITES = ../sprites + +all: OOTW_C8 + +#### + +OOTW_C8: ootw_c8.o + ld65 -o OOTW_C8 ootw_c8.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c8.o: ootw_c8.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 \ + $(COMMON)/gr_run_sequence.s \ + $(COMMON)/physicist.s \ + $(COMMON)/collision.s \ + $(COMMON)/door.s \ + $(COMMON)/laser.s \ + $(COMMON)/gun.s \ + $(COMMON)/blast.s \ + $(COMMON)/shield.s \ + $(SPRITES)/physicist.inc \ + graphics/l8_crawl/ootw_c8_crawl.inc + ca65 -o ootw_c8.o ootw_c8.s -l ootw_c8.lst + +##### + +clean: + rm -f *~ *.o *.lst OOTW_C8 + diff --git a/games/ootw/ootw_c8/ootw_c8.s b/games/ootw/ootw_c8/ootw_c8.s index 0f076fd2..1715cd6b 100644 --- a/games/ootw/ootw_c8/ootw_c8.s +++ b/games/ootw/ootw_c8/ootw_c8.s @@ -4,8 +4,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ;============================ @@ -490,36 +490,32 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: ROLL",0 -.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_hlin.s" -.include "keyboard.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l8crawl/ootw_c8_crawl.inc" +.include "graphics/l8_crawl/ootw_c8_crawl.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_c9/Makefile b/games/ootw/ootw_c9/Makefile new file mode 100644 index 00000000..054a1a70 --- /dev/null +++ b/games/ootw/ootw_c9/Makefile @@ -0,0 +1,40 @@ +include ../../../Makefile.inc + +COMMON = .. +LINKER_SCRIPTS = ../../../linker_scripts +SPRITES = ../sprites + +all: OOTW_C9 + +#### + +OOTW_C9: ootw_c9.o + ld65 -o OOTW_C9 ootw_c9.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c9.o: ootw_c9.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 \ + $(COMMON)/gr_run_sequence.s \ + $(COMMON)/physicist.s \ + $(COMMON)/collision.s \ + $(COMMON)/door.s \ + $(COMMON)/laser.s \ + $(COMMON)/gun.s \ + $(COMMON)/blast.s \ + $(COMMON)/shield.s \ + $(SPRITES)/physicist.inc \ + graphics/l9_swim/ootw_c9_swim.inc + ca65 -o ootw_c9.o ootw_c9.s -l ootw_c9.lst + +##### + +clean: + rm -f *~ *.o *.lst OOTW_C9 + diff --git a/games/ootw/ootw_c9/ootw_c9.s b/games/ootw/ootw_c9/ootw_c9.s index 4614cb42..d69774ad 100644 --- a/games/ootw/ootw_c9/ootw_c9.s +++ b/games/ootw/ootw_c9/ootw_c9.s @@ -4,8 +4,8 @@ ; by Vince "DEATER" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ;============================ @@ -490,36 +490,31 @@ end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: SWIM",0 -.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_hlin.s" -.include "keyboard.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_copy.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_crop.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l9swim/ootw_c9_swim.inc" +.include "graphics/l9_swim/ootw_c9_swim.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" - +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/interrupt_handler.s b/games/ootw/pt3_player/interrupt_handler.s similarity index 98% rename from games/ootw/interrupt_handler.s rename to games/ootw/pt3_player/interrupt_handler.s index e80581ad..2a766283 100644 --- a/games/ootw/interrupt_handler.s +++ b/games/ootw/pt3_player/interrupt_handler.s @@ -19,6 +19,7 @@ interrupt_handler: php ; save status flags + cld ; clear decimal mode pha ; save A ; 3 ; A is saved in $45 by firmware txa diff --git a/games/ootw/pt3_lib_core.s b/games/ootw/pt3_player/pt3_lib_core.s similarity index 100% rename from games/ootw/pt3_lib_core.s rename to games/ootw/pt3_player/pt3_lib_core.s diff --git a/games/ootw/pt3_lib_init.s b/games/ootw/pt3_player/pt3_lib_init.s similarity index 100% rename from games/ootw/pt3_lib_init.s rename to games/ootw/pt3_player/pt3_lib_init.s diff --git a/games/ootw/pt3_lib_irq_handler.s b/games/ootw/pt3_player/pt3_lib_irq_handler.s similarity index 97% rename from games/ootw/pt3_lib_irq_handler.s rename to games/ootw/pt3_player/pt3_lib_irq_handler.s index 851a22bf..0de5309a 100644 --- a/games/ootw/pt3_lib_irq_handler.s +++ b/games/ootw/pt3_player/pt3_lib_irq_handler.s @@ -34,7 +34,8 @@ pt3_loop_smc: sta current_subframe_smc+1 sta DONE_SONG ; undo the next song - beq done_pt3_irq_handler ; branch always +; beq done_pt3_irq_handler ; branch always + beq pt3_play_music ; branch always move_to_next: ; same as "press right" diff --git a/games/ootw/pt3_lib_mockingboard_detect.s b/games/ootw/pt3_player/pt3_lib_mockingboard_detect.s similarity index 100% rename from games/ootw/pt3_lib_mockingboard_detect.s rename to games/ootw/pt3_player/pt3_lib_mockingboard_detect.s diff --git a/games/ootw/pt3_lib_mockingboard_setup.s b/games/ootw/pt3_player/pt3_lib_mockingboard_setup.s similarity index 100% rename from games/ootw/pt3_lib_mockingboard_setup.s rename to games/ootw/pt3_player/pt3_lib_mockingboard_setup.s