From 4bebba110fb9a7350feed754f3ce04a09aef3a0e Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 23 Mar 2021 10:16:51 -0400 Subject: [PATCH] ootw: move c2 to own dir --- games/ootw/Makefile | 39 ++------- .../graphics/l2_cage}/Makefile | 0 .../graphics/l2_cage}/debris1.png | Bin .../graphics/l2_cage}/debris2.png | Bin .../graphics/l2_cage}/debris3.png | Bin .../graphics/l2_cage}/ootw_c2_cage.inc | 0 .../graphics/l2_cage}/ootw_c2_cage_fell.png | Bin .../graphics/l2_cage}/ootw_c2_nocage.png | Bin .../graphics/l2_city}/Makefile | 0 .../graphics/l2_city}/city_movie.inc | 0 .../graphics/l2_city}/ncity01.png | Bin .../graphics/l2_city}/ncity02.png | Bin .../graphics/l2_city}/ncity03.png | Bin .../graphics/l2_city}/ncity04.png | Bin .../graphics/l2_city}/ncity05.png | Bin .../graphics/l2_city}/ncity06.png | Bin .../graphics/l2_city}/ncity07.png | Bin .../graphics/l2_city}/ncity08.png | Bin .../graphics/l2_city}/ncity09.png | Bin .../graphics/l2_city}/ncity10.png | Bin .../graphics/l2_city}/ncity11.png | Bin .../graphics/l2_city}/ncity12.png | Bin .../graphics/l2_city}/ncity13.png | Bin .../graphics/l2_city}/ncity14.png | Bin .../graphics/l2_intro}/Makefile | 0 .../graphics/l2_intro}/cage_01.png | Bin .../graphics/l2_intro}/cage_02.png | Bin .../graphics/l2_intro}/cage_03.png | Bin .../graphics/l2_intro}/cage_04.png | Bin .../graphics/l2_intro}/eyes_01.png | Bin .../graphics/l2_intro}/eyes_02.png | Bin .../graphics/l2_intro}/eyes_03.png | Bin .../graphics/l2_intro}/eyes_04.png | Bin .../graphics/l2_intro}/eyes_05.png | Bin .../graphics/l2_intro}/eyes_bg.png | Bin .../graphics/l2_intro}/friend02.png | Bin .../graphics/l2_intro}/friend03.png | Bin .../graphics/l2_intro}/friend04.png | Bin .../graphics/l2_intro}/friend05.png | Bin .../graphics/l2_intro}/friend06.png | Bin .../graphics/l2_intro}/ootw_l2intro.inc | 0 .../graphics/l2_jail}/Makefile | 0 .../graphics/l2_jail}/dome.png | Bin .../graphics/l2_jail}/elevator_b3.png | Bin .../graphics/l2_jail}/elevator_center.png | Bin .../graphics/l2_jail}/jail2_bg.png | Bin .../graphics/l2_jail}/jail3_bg.png | Bin .../graphics/l2_jail}/jail4_bg.png | Bin .../graphics/l2_jail}/ootw_c2_jail.inc | 0 .../graphics/l2_jail}/room_b2.png | Bin .../graphics/l2_jail}/room_b3.png | Bin .../graphics/l2_jail}/room_b4.png | Bin .../graphics/l2_laser}/Makefile | 0 .../graphics/l2_laser}/blank.png | Bin .../graphics/l2_laser}/laser_bg.png | Bin .../graphics/l2_laser}/laserg01.png | Bin .../graphics/l2_laser}/laserg02.png | Bin .../graphics/l2_laser}/laserg03.png | Bin .../graphics/l2_laser}/laserg04.png | Bin .../graphics/l2_laser}/laserg05.png | Bin .../graphics/l2_laser}/laserg06.png | Bin .../graphics/l2_laser}/laserg07.png | Bin .../graphics/l2_laser}/laserg08.png | Bin .../graphics/l2_laser}/ootw_c2_laser.inc | 0 games/ootw/{ => ootw_c2}/ootw_c2.s | 79 +++++++++--------- games/ootw/{ => ootw_c2}/ootw_c2_cage.s | 0 games/ootw/{ => ootw_c2}/ootw_c2_elevator.s | 0 games/ootw/{ => ootw_c2}/ootw_c2_intro.s | 0 games/ootw/{ => ootw_c2}/ootw_c2_jail.s | 0 games/ootw/{ => ootw_c2}/ootw_c2_miners.s | 0 70 files changed, 50 insertions(+), 68 deletions(-) rename games/ootw/{ootw_graphics/l2cage => ootw_c2/graphics/l2_cage}/Makefile (100%) rename games/ootw/{ootw_graphics/l2cage => ootw_c2/graphics/l2_cage}/debris1.png (100%) rename games/ootw/{ootw_graphics/l2cage => ootw_c2/graphics/l2_cage}/debris2.png (100%) rename games/ootw/{ootw_graphics/l2cage => ootw_c2/graphics/l2_cage}/debris3.png (100%) rename games/ootw/{ootw_graphics/l2cage => ootw_c2/graphics/l2_cage}/ootw_c2_cage.inc (100%) rename games/ootw/{ootw_graphics/l2cage => ootw_c2/graphics/l2_cage}/ootw_c2_cage_fell.png (100%) rename games/ootw/{ootw_graphics/l2cage => ootw_c2/graphics/l2_cage}/ootw_c2_nocage.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/Makefile (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/city_movie.inc (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity01.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity02.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity03.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity04.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity05.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity06.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity07.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity08.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity09.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity10.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity11.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity12.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity13.png (100%) rename games/ootw/{ootw_graphics/l2city => ootw_c2/graphics/l2_city}/ncity14.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/Makefile (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/cage_01.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/cage_02.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/cage_03.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/cage_04.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/eyes_01.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/eyes_02.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/eyes_03.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/eyes_04.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/eyes_05.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/eyes_bg.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/friend02.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/friend03.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/friend04.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/friend05.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/friend06.png (100%) rename games/ootw/{ootw_graphics/l2intro => ootw_c2/graphics/l2_intro}/ootw_l2intro.inc (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/Makefile (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/dome.png (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/elevator_b3.png (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/elevator_center.png (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/jail2_bg.png (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/jail3_bg.png (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/jail4_bg.png (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/ootw_c2_jail.inc (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/room_b2.png (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/room_b3.png (100%) rename games/ootw/{ootw_graphics/l2jail => ootw_c2/graphics/l2_jail}/room_b4.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/Makefile (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/blank.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/laser_bg.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/laserg01.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/laserg02.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/laserg03.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/laserg04.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/laserg05.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/laserg06.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/laserg07.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/laserg08.png (100%) rename games/ootw/{ootw_graphics/l2laser => ootw_c2/graphics/l2_laser}/ootw_c2_laser.inc (100%) rename games/ootw/{ => ootw_c2}/ootw_c2.s (57%) rename games/ootw/{ => ootw_c2}/ootw_c2_cage.s (100%) rename games/ootw/{ => ootw_c2}/ootw_c2_elevator.s (100%) rename games/ootw/{ => ootw_c2}/ootw_c2_intro.s (100%) rename games/ootw/{ => ootw_c2}/ootw_c2_jail.s (100%) rename games/ootw/{ => ootw_c2}/ootw_c2_miners.s (100%) diff --git a/games/ootw/Makefile b/games/ootw/Makefile index 3c0ca995..07c195c1 100644 --- a/games/ootw/Makefile +++ b/games/ootw/Makefile @@ -8,13 +8,15 @@ TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft all: ootw.dsk ootw_side2.dsk ootw_side3.dsk -ootw.dsk: HELLO TITLE ./intro/INTRO ./ootw_c1/OOTW_C1 OOTW_C2 OOTW_C3 OOTW_C4 OOTW_C5 +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 $(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 + $(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_C5 @@ -44,31 +46,6 @@ ootw_side3.dsk: HELLO TITLE ENDING \ $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 OOTW_C15 $(DOS33) -y ootw_side3.dsk BSAVE -a 0x1700 ENDING - - -#### - -OOTW_C2: ootw_c2.o - ld65 -o OOTW_C2 ootw_c2.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c2.o: ootw_c2.s \ - gr_copy.s gr_copy_offset.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 audio.s \ - alien_laser.s \ - physicist.s alien.s friend.s \ - collision.s door.s laser.s shield.s blast.s gun.s \ - ootw_c2_miners.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/sprites/alien.inc \ - ootw_graphics/sprites/friend.inc \ - ootw_c2_cage.s ootw_c2_jail.s ootw_c2_elevator.s ootw_c2_intro.s \ - ootw_graphics/l2cage/ootw_c2_cage.inc \ - ootw_graphics/l2jail/ootw_c2_jail.inc \ - ootw_graphics/l2intro/ootw_l2intro.inc \ - ootw_graphics/l2laser/ootw_c2_laser.inc - ca65 -o ootw_c2.o ootw_c2.s -l ootw_c2.lst - #### OOTW_C3: ootw_c3.o @@ -280,6 +257,9 @@ intro/INTRO: ootw_c1/OOTW_C1: cd ootw_c1 && make +ootw_c2/OOTW_C2: + cd ootw_c2 && make + #### @@ -355,6 +335,5 @@ zip: ootw.dsk ootw_side2.dsk side3.dsk clean: rm -f *~ *.o *.lst *.lz4 HELLO TITLE \ OOTW_C1 OOTW_C2 OOTW_C3 OOTW_C4 INTRO LOADER \ - COMPRESS-TEST AUDIO_TEST \ - intro_data_01 intro_data_04 intro_data_06 \ - intro_data_08 intro_data_09 + COMPRESS-TEST AUDIO_TEST + diff --git a/games/ootw/ootw_graphics/l2cage/Makefile b/games/ootw/ootw_c2/graphics/l2_cage/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l2cage/Makefile rename to games/ootw/ootw_c2/graphics/l2_cage/Makefile diff --git a/games/ootw/ootw_graphics/l2cage/debris1.png b/games/ootw/ootw_c2/graphics/l2_cage/debris1.png similarity index 100% rename from games/ootw/ootw_graphics/l2cage/debris1.png rename to games/ootw/ootw_c2/graphics/l2_cage/debris1.png diff --git a/games/ootw/ootw_graphics/l2cage/debris2.png b/games/ootw/ootw_c2/graphics/l2_cage/debris2.png similarity index 100% rename from games/ootw/ootw_graphics/l2cage/debris2.png rename to games/ootw/ootw_c2/graphics/l2_cage/debris2.png diff --git a/games/ootw/ootw_graphics/l2cage/debris3.png b/games/ootw/ootw_c2/graphics/l2_cage/debris3.png similarity index 100% rename from games/ootw/ootw_graphics/l2cage/debris3.png rename to games/ootw/ootw_c2/graphics/l2_cage/debris3.png diff --git a/games/ootw/ootw_graphics/l2cage/ootw_c2_cage.inc b/games/ootw/ootw_c2/graphics/l2_cage/ootw_c2_cage.inc similarity index 100% rename from games/ootw/ootw_graphics/l2cage/ootw_c2_cage.inc rename to games/ootw/ootw_c2/graphics/l2_cage/ootw_c2_cage.inc diff --git a/games/ootw/ootw_graphics/l2cage/ootw_c2_cage_fell.png b/games/ootw/ootw_c2/graphics/l2_cage/ootw_c2_cage_fell.png similarity index 100% rename from games/ootw/ootw_graphics/l2cage/ootw_c2_cage_fell.png rename to games/ootw/ootw_c2/graphics/l2_cage/ootw_c2_cage_fell.png diff --git a/games/ootw/ootw_graphics/l2cage/ootw_c2_nocage.png b/games/ootw/ootw_c2/graphics/l2_cage/ootw_c2_nocage.png similarity index 100% rename from games/ootw/ootw_graphics/l2cage/ootw_c2_nocage.png rename to games/ootw/ootw_c2/graphics/l2_cage/ootw_c2_nocage.png diff --git a/games/ootw/ootw_graphics/l2city/Makefile b/games/ootw/ootw_c2/graphics/l2_city/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l2city/Makefile rename to games/ootw/ootw_c2/graphics/l2_city/Makefile diff --git a/games/ootw/ootw_graphics/l2city/city_movie.inc b/games/ootw/ootw_c2/graphics/l2_city/city_movie.inc similarity index 100% rename from games/ootw/ootw_graphics/l2city/city_movie.inc rename to games/ootw/ootw_c2/graphics/l2_city/city_movie.inc diff --git a/games/ootw/ootw_graphics/l2city/ncity01.png b/games/ootw/ootw_c2/graphics/l2_city/ncity01.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity01.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity01.png diff --git a/games/ootw/ootw_graphics/l2city/ncity02.png b/games/ootw/ootw_c2/graphics/l2_city/ncity02.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity02.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity02.png diff --git a/games/ootw/ootw_graphics/l2city/ncity03.png b/games/ootw/ootw_c2/graphics/l2_city/ncity03.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity03.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity03.png diff --git a/games/ootw/ootw_graphics/l2city/ncity04.png b/games/ootw/ootw_c2/graphics/l2_city/ncity04.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity04.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity04.png diff --git a/games/ootw/ootw_graphics/l2city/ncity05.png b/games/ootw/ootw_c2/graphics/l2_city/ncity05.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity05.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity05.png diff --git a/games/ootw/ootw_graphics/l2city/ncity06.png b/games/ootw/ootw_c2/graphics/l2_city/ncity06.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity06.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity06.png diff --git a/games/ootw/ootw_graphics/l2city/ncity07.png b/games/ootw/ootw_c2/graphics/l2_city/ncity07.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity07.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity07.png diff --git a/games/ootw/ootw_graphics/l2city/ncity08.png b/games/ootw/ootw_c2/graphics/l2_city/ncity08.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity08.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity08.png diff --git a/games/ootw/ootw_graphics/l2city/ncity09.png b/games/ootw/ootw_c2/graphics/l2_city/ncity09.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity09.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity09.png diff --git a/games/ootw/ootw_graphics/l2city/ncity10.png b/games/ootw/ootw_c2/graphics/l2_city/ncity10.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity10.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity10.png diff --git a/games/ootw/ootw_graphics/l2city/ncity11.png b/games/ootw/ootw_c2/graphics/l2_city/ncity11.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity11.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity11.png diff --git a/games/ootw/ootw_graphics/l2city/ncity12.png b/games/ootw/ootw_c2/graphics/l2_city/ncity12.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity12.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity12.png diff --git a/games/ootw/ootw_graphics/l2city/ncity13.png b/games/ootw/ootw_c2/graphics/l2_city/ncity13.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity13.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity13.png diff --git a/games/ootw/ootw_graphics/l2city/ncity14.png b/games/ootw/ootw_c2/graphics/l2_city/ncity14.png similarity index 100% rename from games/ootw/ootw_graphics/l2city/ncity14.png rename to games/ootw/ootw_c2/graphics/l2_city/ncity14.png diff --git a/games/ootw/ootw_graphics/l2intro/Makefile b/games/ootw/ootw_c2/graphics/l2_intro/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l2intro/Makefile rename to games/ootw/ootw_c2/graphics/l2_intro/Makefile diff --git a/games/ootw/ootw_graphics/l2intro/cage_01.png b/games/ootw/ootw_c2/graphics/l2_intro/cage_01.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/cage_01.png rename to games/ootw/ootw_c2/graphics/l2_intro/cage_01.png diff --git a/games/ootw/ootw_graphics/l2intro/cage_02.png b/games/ootw/ootw_c2/graphics/l2_intro/cage_02.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/cage_02.png rename to games/ootw/ootw_c2/graphics/l2_intro/cage_02.png diff --git a/games/ootw/ootw_graphics/l2intro/cage_03.png b/games/ootw/ootw_c2/graphics/l2_intro/cage_03.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/cage_03.png rename to games/ootw/ootw_c2/graphics/l2_intro/cage_03.png diff --git a/games/ootw/ootw_graphics/l2intro/cage_04.png b/games/ootw/ootw_c2/graphics/l2_intro/cage_04.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/cage_04.png rename to games/ootw/ootw_c2/graphics/l2_intro/cage_04.png diff --git a/games/ootw/ootw_graphics/l2intro/eyes_01.png b/games/ootw/ootw_c2/graphics/l2_intro/eyes_01.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/eyes_01.png rename to games/ootw/ootw_c2/graphics/l2_intro/eyes_01.png diff --git a/games/ootw/ootw_graphics/l2intro/eyes_02.png b/games/ootw/ootw_c2/graphics/l2_intro/eyes_02.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/eyes_02.png rename to games/ootw/ootw_c2/graphics/l2_intro/eyes_02.png diff --git a/games/ootw/ootw_graphics/l2intro/eyes_03.png b/games/ootw/ootw_c2/graphics/l2_intro/eyes_03.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/eyes_03.png rename to games/ootw/ootw_c2/graphics/l2_intro/eyes_03.png diff --git a/games/ootw/ootw_graphics/l2intro/eyes_04.png b/games/ootw/ootw_c2/graphics/l2_intro/eyes_04.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/eyes_04.png rename to games/ootw/ootw_c2/graphics/l2_intro/eyes_04.png diff --git a/games/ootw/ootw_graphics/l2intro/eyes_05.png b/games/ootw/ootw_c2/graphics/l2_intro/eyes_05.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/eyes_05.png rename to games/ootw/ootw_c2/graphics/l2_intro/eyes_05.png diff --git a/games/ootw/ootw_graphics/l2intro/eyes_bg.png b/games/ootw/ootw_c2/graphics/l2_intro/eyes_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/eyes_bg.png rename to games/ootw/ootw_c2/graphics/l2_intro/eyes_bg.png diff --git a/games/ootw/ootw_graphics/l2intro/friend02.png b/games/ootw/ootw_c2/graphics/l2_intro/friend02.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/friend02.png rename to games/ootw/ootw_c2/graphics/l2_intro/friend02.png diff --git a/games/ootw/ootw_graphics/l2intro/friend03.png b/games/ootw/ootw_c2/graphics/l2_intro/friend03.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/friend03.png rename to games/ootw/ootw_c2/graphics/l2_intro/friend03.png diff --git a/games/ootw/ootw_graphics/l2intro/friend04.png b/games/ootw/ootw_c2/graphics/l2_intro/friend04.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/friend04.png rename to games/ootw/ootw_c2/graphics/l2_intro/friend04.png diff --git a/games/ootw/ootw_graphics/l2intro/friend05.png b/games/ootw/ootw_c2/graphics/l2_intro/friend05.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/friend05.png rename to games/ootw/ootw_c2/graphics/l2_intro/friend05.png diff --git a/games/ootw/ootw_graphics/l2intro/friend06.png b/games/ootw/ootw_c2/graphics/l2_intro/friend06.png similarity index 100% rename from games/ootw/ootw_graphics/l2intro/friend06.png rename to games/ootw/ootw_c2/graphics/l2_intro/friend06.png diff --git a/games/ootw/ootw_graphics/l2intro/ootw_l2intro.inc b/games/ootw/ootw_c2/graphics/l2_intro/ootw_l2intro.inc similarity index 100% rename from games/ootw/ootw_graphics/l2intro/ootw_l2intro.inc rename to games/ootw/ootw_c2/graphics/l2_intro/ootw_l2intro.inc diff --git a/games/ootw/ootw_graphics/l2jail/Makefile b/games/ootw/ootw_c2/graphics/l2_jail/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l2jail/Makefile rename to games/ootw/ootw_c2/graphics/l2_jail/Makefile diff --git a/games/ootw/ootw_graphics/l2jail/dome.png b/games/ootw/ootw_c2/graphics/l2_jail/dome.png similarity index 100% rename from games/ootw/ootw_graphics/l2jail/dome.png rename to games/ootw/ootw_c2/graphics/l2_jail/dome.png diff --git a/games/ootw/ootw_graphics/l2jail/elevator_b3.png b/games/ootw/ootw_c2/graphics/l2_jail/elevator_b3.png similarity index 100% rename from games/ootw/ootw_graphics/l2jail/elevator_b3.png rename to games/ootw/ootw_c2/graphics/l2_jail/elevator_b3.png diff --git a/games/ootw/ootw_graphics/l2jail/elevator_center.png b/games/ootw/ootw_c2/graphics/l2_jail/elevator_center.png similarity index 100% rename from games/ootw/ootw_graphics/l2jail/elevator_center.png rename to games/ootw/ootw_c2/graphics/l2_jail/elevator_center.png diff --git a/games/ootw/ootw_graphics/l2jail/jail2_bg.png b/games/ootw/ootw_c2/graphics/l2_jail/jail2_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l2jail/jail2_bg.png rename to games/ootw/ootw_c2/graphics/l2_jail/jail2_bg.png diff --git a/games/ootw/ootw_graphics/l2jail/jail3_bg.png b/games/ootw/ootw_c2/graphics/l2_jail/jail3_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l2jail/jail3_bg.png rename to games/ootw/ootw_c2/graphics/l2_jail/jail3_bg.png diff --git a/games/ootw/ootw_graphics/l2jail/jail4_bg.png b/games/ootw/ootw_c2/graphics/l2_jail/jail4_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l2jail/jail4_bg.png rename to games/ootw/ootw_c2/graphics/l2_jail/jail4_bg.png diff --git a/games/ootw/ootw_graphics/l2jail/ootw_c2_jail.inc b/games/ootw/ootw_c2/graphics/l2_jail/ootw_c2_jail.inc similarity index 100% rename from games/ootw/ootw_graphics/l2jail/ootw_c2_jail.inc rename to games/ootw/ootw_c2/graphics/l2_jail/ootw_c2_jail.inc diff --git a/games/ootw/ootw_graphics/l2jail/room_b2.png b/games/ootw/ootw_c2/graphics/l2_jail/room_b2.png similarity index 100% rename from games/ootw/ootw_graphics/l2jail/room_b2.png rename to games/ootw/ootw_c2/graphics/l2_jail/room_b2.png diff --git a/games/ootw/ootw_graphics/l2jail/room_b3.png b/games/ootw/ootw_c2/graphics/l2_jail/room_b3.png similarity index 100% rename from games/ootw/ootw_graphics/l2jail/room_b3.png rename to games/ootw/ootw_c2/graphics/l2_jail/room_b3.png diff --git a/games/ootw/ootw_graphics/l2jail/room_b4.png b/games/ootw/ootw_c2/graphics/l2_jail/room_b4.png similarity index 100% rename from games/ootw/ootw_graphics/l2jail/room_b4.png rename to games/ootw/ootw_c2/graphics/l2_jail/room_b4.png diff --git a/games/ootw/ootw_graphics/l2laser/Makefile b/games/ootw/ootw_c2/graphics/l2_laser/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l2laser/Makefile rename to games/ootw/ootw_c2/graphics/l2_laser/Makefile diff --git a/games/ootw/ootw_graphics/l2laser/blank.png b/games/ootw/ootw_c2/graphics/l2_laser/blank.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/blank.png rename to games/ootw/ootw_c2/graphics/l2_laser/blank.png diff --git a/games/ootw/ootw_graphics/l2laser/laser_bg.png b/games/ootw/ootw_c2/graphics/l2_laser/laser_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/laser_bg.png rename to games/ootw/ootw_c2/graphics/l2_laser/laser_bg.png diff --git a/games/ootw/ootw_graphics/l2laser/laserg01.png b/games/ootw/ootw_c2/graphics/l2_laser/laserg01.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/laserg01.png rename to games/ootw/ootw_c2/graphics/l2_laser/laserg01.png diff --git a/games/ootw/ootw_graphics/l2laser/laserg02.png b/games/ootw/ootw_c2/graphics/l2_laser/laserg02.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/laserg02.png rename to games/ootw/ootw_c2/graphics/l2_laser/laserg02.png diff --git a/games/ootw/ootw_graphics/l2laser/laserg03.png b/games/ootw/ootw_c2/graphics/l2_laser/laserg03.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/laserg03.png rename to games/ootw/ootw_c2/graphics/l2_laser/laserg03.png diff --git a/games/ootw/ootw_graphics/l2laser/laserg04.png b/games/ootw/ootw_c2/graphics/l2_laser/laserg04.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/laserg04.png rename to games/ootw/ootw_c2/graphics/l2_laser/laserg04.png diff --git a/games/ootw/ootw_graphics/l2laser/laserg05.png b/games/ootw/ootw_c2/graphics/l2_laser/laserg05.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/laserg05.png rename to games/ootw/ootw_c2/graphics/l2_laser/laserg05.png diff --git a/games/ootw/ootw_graphics/l2laser/laserg06.png b/games/ootw/ootw_c2/graphics/l2_laser/laserg06.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/laserg06.png rename to games/ootw/ootw_c2/graphics/l2_laser/laserg06.png diff --git a/games/ootw/ootw_graphics/l2laser/laserg07.png b/games/ootw/ootw_c2/graphics/l2_laser/laserg07.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/laserg07.png rename to games/ootw/ootw_c2/graphics/l2_laser/laserg07.png diff --git a/games/ootw/ootw_graphics/l2laser/laserg08.png b/games/ootw/ootw_c2/graphics/l2_laser/laserg08.png similarity index 100% rename from games/ootw/ootw_graphics/l2laser/laserg08.png rename to games/ootw/ootw_c2/graphics/l2_laser/laserg08.png diff --git a/games/ootw/ootw_graphics/l2laser/ootw_c2_laser.inc b/games/ootw/ootw_c2/graphics/l2_laser/ootw_c2_laser.inc similarity index 100% rename from games/ootw/ootw_graphics/l2laser/ootw_c2_laser.inc rename to games/ootw/ootw_c2/graphics/l2_laser/ootw_c2_laser.inc diff --git a/games/ootw/ootw_c2.s b/games/ootw/ootw_c2/ootw_c2.s similarity index 57% rename from games/ootw/ootw_c2.s rename to games/ootw/ootw_c2/ootw_c2.s index aa1ef6cb..1ca6f5a1 100644 --- a/games/ootw/ootw_c2.s +++ b/games/ootw/ootw_c2/ootw_c2.s @@ -1,9 +1,12 @@ ; Ootw for Apple II Lores -- Checkpoint2 +; despite all my rage... + + ; by Vince "Deater" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" @@ -107,52 +110,52 @@ end_message: .include "ootw_c2_jail.s" .include "ootw_c2_elevator.s" .include "ootw_c2_intro.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 "gr_vlin.s" -.include "gr_hlin.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_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 "../gr_vlin.s" +.include "../gr_hlin.s" +;.include "../random16.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../friend.s" -.include "gun.s" -.include "blast.s" -.include "laser.s" -.include "alien_laser.s" -.include "shield.s" -.include "door.s" -.include "collision.s" +.include "../gun.s" +.include "../blast.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../shield.s" +.include "../door.s" +.include "../collision.s" ; background miners .include "ootw_c2_miners.s" ; room backgrounds -.include "ootw_graphics/l2cage/ootw_c2_cage.inc" -.include "ootw_graphics/l2jail/ootw_c2_jail.inc" +.include "graphics/l2_cage/ootw_c2_cage.inc" +.include "graphics/l2_jail/ootw_c2_jail.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" -.include "ootw_graphics/sprites/friend.inc" +.include "../ootw_graphics/sprites/physicist.inc" +.include "../ootw_graphics/sprites/alien.inc" +.include "../ootw_graphics/sprites/friend.inc" ; intro -.include "ootw_graphics/l2intro/ootw_l2intro.inc" +.include "graphics/l2_intro/ootw_l2intro.inc" ; city movie -.include "ootw_graphics/l2city/city_movie.inc" +.include "graphics/l2_city/city_movie.inc" ; laser movie -.include "ootw_graphics/l2laser/ootw_c2_laser.inc" +.include "graphics/l2_laser/ootw_c2_laser.inc" -.include "audio.s" +.include "../audio.s" diff --git a/games/ootw/ootw_c2_cage.s b/games/ootw/ootw_c2/ootw_c2_cage.s similarity index 100% rename from games/ootw/ootw_c2_cage.s rename to games/ootw/ootw_c2/ootw_c2_cage.s diff --git a/games/ootw/ootw_c2_elevator.s b/games/ootw/ootw_c2/ootw_c2_elevator.s similarity index 100% rename from games/ootw/ootw_c2_elevator.s rename to games/ootw/ootw_c2/ootw_c2_elevator.s diff --git a/games/ootw/ootw_c2_intro.s b/games/ootw/ootw_c2/ootw_c2_intro.s similarity index 100% rename from games/ootw/ootw_c2_intro.s rename to games/ootw/ootw_c2/ootw_c2_intro.s diff --git a/games/ootw/ootw_c2_jail.s b/games/ootw/ootw_c2/ootw_c2_jail.s similarity index 100% rename from games/ootw/ootw_c2_jail.s rename to games/ootw/ootw_c2/ootw_c2_jail.s diff --git a/games/ootw/ootw_c2_miners.s b/games/ootw/ootw_c2/ootw_c2_miners.s similarity index 100% rename from games/ootw/ootw_c2_miners.s rename to games/ootw/ootw_c2/ootw_c2_miners.s