From 6a89e4a4a23e970c0a4c1ec9fc72e40b108c33e5 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 23 Mar 2021 16:25:51 -0400 Subject: [PATCH] ootw: title: move to own dir --- games/ootw/Makefile | 69 ++++---------------------- games/ootw/{ => tests}/compress_test.s | 0 games/ootw/title/Makefile | 19 +++++++ games/ootw/{ => title}/loader.s | 0 games/ootw/{ => title}/title.s | 8 +-- 5 files changed, 32 insertions(+), 64 deletions(-) rename games/ootw/{ => tests}/compress_test.s (100%) create mode 100644 games/ootw/title/Makefile rename games/ootw/{ => title}/loader.s (100%) rename games/ootw/{ => title}/title.s (98%) diff --git a/games/ootw/Makefile b/games/ootw/Makefile index 53412601..5a91eaa5 100644 --- a/games/ootw/Makefile +++ b/games/ootw/Makefile @@ -1,20 +1,18 @@ include ../../Makefile.inc DOS33 = ../../utils/dos33fs-utils/dos33 -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 \ +ootw.dsk: HELLO ./title/TITLE \ ./intro/INTRO ./ootw_c1/OOTW_C1 ./ootw_c2/OOTW_C2 \ ./ootw_c3/OOTW_C3 ./ootw_c4/OOTW_C4 ./ootw_c5/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 0xd00 ./title/TITLE $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./intro/INTRO INTRO $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c1/OOTW_C1 OOTW_C1 $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c2/OOTW_C2 OOTW_C2 @@ -22,24 +20,24 @@ ootw.dsk: HELLO TITLE \ $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c4/OOTW_C4 OOTW_C4 $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c5/OOTW_C5 OOTW_C5 -ootw_side2.dsk: HELLO TITLE \ +ootw_side2.dsk: HELLO ./title/TITLE \ ./ootw_c6/OOTW_C6 ./ootw_c7/OOTW_C7 ./ootw_c8/OOTW_C8 \ ./ootw_c9/OOTW_C9 ./ootw_c10/OOTW_C10 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 0xd00 ./title/TITLE $(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c6/OOTW_C6 OOTW_C6 $(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c7/OOTW_C7 OOTW_C7 $(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 ./ootw_c8/OOTW_C8 OOTW_C8 $(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/ENDING \ +ootw_side3.dsk: HELLO ./title/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 0xd00 ./title/TITLE $(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 @@ -47,16 +45,6 @@ ootw_side3.dsk: HELLO TITLE ./ending/ENDING \ $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ootw_c15/OOTW_C15 $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ./ending/ENDING - -#### - -AUDIO_TEST: audio.o - ld65 -o AUDIO_TEST audio.o -C ../../linker_scripts/apple2_1700.inc - -audio.o: audio.s - ca65 -o audio.o audio.s -l audio.lst - - #### intro/INTRO: @@ -110,31 +98,8 @@ ootw_c15/OOTW_C15: ending/ENDING: cd ending && make -#### - -LOADER: loader.o - ld65 -o LOADER loader.o -C ../../linker_scripts/apple2_1400.inc - -loader.o: loader.s - ca65 -o loader.o loader.s -l loader.lst - -#### - -LOADER2: loader2.o - ld65 -o LOADER2 loader2.o -C ../../linker_scripts/apple2_1400.inc - -loader2.o: loader2.s - ca65 -o loader2.o loader2.s -l loader2.lst - -#### - -TITLE: title.o - ld65 -o TITLE title.o -C ../../linker_scripts/apple2_d00.inc - -title.o: title.s loader.s - ca65 -o title.o title.s -l title.lst - - +title/TITLE: + cd title && make #### @@ -148,20 +113,6 @@ HELLO: hello.bas HELLO2: hello2.bas $(TOKENIZE) < hello2.bas > HELLO2 - -##### - -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 - -COMPRESS-TEST: compress_test.o - ld65 -o COMPRESS-TEST compress_test.o -C ../../linker_scripts/apple2_2000.inc - -compress_test.o: compress_test.s lz4_decode.s compress_test.inc - ca65 -o compress_test.o compress_test.s -l compress_test.lst - - ##### zip: ootw.dsk ootw_side2.dsk side3.dsk @@ -170,6 +121,4 @@ zip: ootw.dsk ootw_side2.dsk side3.dsk ##### clean: - rm -f *~ *.o *.lst *.lz4 HELLO TITLE INTRO LOADER \ - COMPRESS-TEST AUDIO_TEST - + rm -f *~ *.o *.lst HELLO diff --git a/games/ootw/compress_test.s b/games/ootw/tests/compress_test.s similarity index 100% rename from games/ootw/compress_test.s rename to games/ootw/tests/compress_test.s diff --git a/games/ootw/title/Makefile b/games/ootw/title/Makefile new file mode 100644 index 00000000..a371cad1 --- /dev/null +++ b/games/ootw/title/Makefile @@ -0,0 +1,19 @@ +include ../../../Makefile.inc + +LINKER_SCRIPTS = ../../../linker_scripts + +all: TITLE + +#### + +TITLE: title.o + ld65 -o TITLE title.o -C $(LINKER_SCRIPTS)/apple2_d00.inc + +title.o: title.s loader.s + ca65 -o title.o title.s -l title.lst + +##### + +clean: + rm -f *~ *.o *.lst TITLE + diff --git a/games/ootw/loader.s b/games/ootw/title/loader.s similarity index 100% rename from games/ootw/loader.s rename to games/ootw/title/loader.s diff --git a/games/ootw/title.s b/games/ootw/title/title.s similarity index 98% rename from games/ootw/title.s rename to games/ootw/title/title.s index 62babfd5..37e318f0 100644 --- a/games/ootw/title.s +++ b/games/ootw/title/title.s @@ -1,7 +1,7 @@ ; Title Screen / Menu for OOTW -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" title: lda #0 @@ -90,8 +90,8 @@ print_help_and_go: ready_to_load: jmp $1400 ; LOADER starts here -.include "text_print.s" -.include "gr_offsets.s" +.include "../text_print.s" +.include "../gr_offsets.s" draw_menu: lda #