From b4d80a0c23517aec68e91e33ef62a233105517ca Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 22 Mar 2021 23:45:40 -0400 Subject: [PATCH] ootw: move level1 to own directory --- games/ootw/Makefile | 39 ++--------- games/ootw/intro/intro_03_elevator.s | 2 +- games/ootw/{ => ootw_c1}/earthquake.s | 0 .../graphics}/l1caves/Makefile | 0 .../graphics}/l1caves/another_cave.png | Bin .../graphics}/l1caves/another_cave2.png | Bin .../graphics}/l1caves/another_cave3.png | Bin .../graphics}/l1caves/ootw_cavern.inc | 0 .../graphics}/l1caves/ootw_cavern2.inc | 0 .../graphics}/l1caves/ootw_cavern3.inc | 0 .../graphics}/l1end/Makefile | 0 .../another_cave3_cut-20190308-170625.piskel | 0 .../graphics}/l1end/another_cave3_cut.png | Bin .../graphics}/l1end/black.png | Bin .../graphics}/l1end/l1end01.png | Bin .../graphics}/l1end/l1end02.png | Bin .../graphics}/l1end/l1end03.png | Bin .../graphics}/l1end/l1end04.png | Bin .../graphics}/l1end/l1end05.png | Bin .../graphics}/l1end/l1end06.png | Bin .../graphics}/l1end/l1end07.png | Bin .../graphics}/l1end/l1end08.png | Bin .../graphics}/l1end/l1end09.png | Bin .../graphics}/l1end/l1end10.png | Bin .../graphics}/l1end/l1end11.png | Bin .../graphics}/l1end/l1end12.png | Bin .../graphics}/l1end/l1end13.png | Bin .../graphics}/l1end/l1end14.png | Bin .../graphics}/l1end/l1end15.png | Bin .../graphics}/l1end/l1end16.png | Bin .../graphics}/l1end/l1end17.png | Bin .../graphics}/l1end/l1end18.png | Bin .../graphics}/l1end/l1end19.png | Bin .../graphics}/l1end/l1end20.png | Bin .../graphics}/l1end/l1end21.png | Bin .../graphics}/l1end/l1end22.png | Bin .../graphics}/l1end/l1end23.png | Bin .../graphics}/l1end/l1end24.png | Bin .../graphics}/l1end/l1end25.png | Bin .../graphics}/l1end/l1end26.png | Bin .../graphics}/l1end/l1end27.png | Bin .../graphics}/l1end/l1end28.png | Bin .../graphics}/l1end/l1end29.png | Bin .../graphics}/l1end/l1end30.png | Bin .../graphics}/l1end/l1end31.png | Bin .../graphics}/l1end/l1end32.png | Bin .../graphics}/l1end/l1end33.png | Bin .../graphics}/l1end/l1end36.png | Bin .../graphics}/l1end/l1end37.png | Bin .../graphics}/l1end/l1end38.png | Bin .../graphics}/l1end/l1end39.png | Bin .../graphics}/l1end/l1end40.png | Bin .../graphics}/l1end/l1end41.png | Bin .../graphics}/l1end/l1end42.png | Bin .../graphics}/l1end/l1end43.png | Bin .../graphics}/l1end/l1end44.png | Bin .../graphics}/l1end/l1end45.png | Bin .../graphics}/l1end/l1end46.png | Bin .../graphics}/l1end/l1end47.png | Bin .../graphics}/l1end/l1end48.png | Bin .../graphics}/l1end/l1end49.png | Bin .../graphics}/l1end/l1end50.png | Bin .../graphics}/l1end/l1end51.png | Bin .../graphics}/l1end/ootw_deadbeast.png | Bin .../graphics}/l1end/ootw_gunguy.png | Bin .../graphics}/l1end/ootw_l1end.inc | 0 .../graphics}/l1end/ootw_peace.png | Bin .../graphics}/l1end_scenes/Makefile | 0 .../graphics}/l1end_scenes/beast_bg.png | Bin .../graphics}/l1end_scenes/beast_slash07.png | Bin .../graphics}/l1end_scenes/beast_slash08.png | Bin .../graphics}/l1end_scenes/beast_slash09.png | Bin .../graphics}/l1end_scenes/beast_slash10.png | Bin .../graphics}/l1end_scenes/beast_slash11.png | Bin .../graphics}/l1end_scenes/beast_slash12.png | Bin .../graphics}/l1end_scenes/beast_slash13.png | Bin .../graphics}/l1end_scenes/beast_slash14.png | Bin .../graphics}/l1end_scenes/beast_slash15.png | Bin .../graphics}/l1end_scenes/beast_slash16.png | Bin .../graphics}/l1end_scenes/beast_slash17.png | Bin .../graphics}/l1end_scenes/beast_slash18.png | Bin .../graphics}/l1end_scenes/beast_slash19.png | Bin .../graphics}/l1end_scenes/beast_slash20.png | Bin .../graphics}/l1end_scenes/ootw_beast_end.inc | 0 .../l1end_scenes/ootw_beast_intro.inc | 0 .../graphics}/l1end_scenes/ootw_slug_end.inc | 0 .../graphics}/l1pool/Makefile | 0 .../graphics}/l1pool/another_pool.png | Bin .../graphics}/l1pool/ootw_pool.inc | 0 .../graphics}/l1rope/Makefile | 0 .../graphics}/l1rope/another_brokerope.png | Bin .../graphics}/l1rope/another_norope.png | Bin .../another_rope-20190316-152508.piskel | 0 .../graphics}/l1rope/another_rope.png | Bin .../graphics}/l1rope/another_swing01.png | Bin .../graphics}/l1rope/another_swing02.png | Bin .../graphics}/l1rope/another_swing03.png | Bin .../graphics}/l1rope/another_swing04.png | Bin .../graphics}/l1rope/another_swing05.png | Bin .../graphics}/l1rope/another_swing06.png | Bin .../graphics}/l1rope/another_swing08.png | Bin .../graphics}/l1rope/another_swing10.png | Bin .../graphics}/l1rope/another_swing11.png | Bin .../graphics}/l1rope/another_swing12.png | Bin .../graphics}/l1rope/another_swing13.png | Bin .../graphics}/l1rope/another_swing14.png | Bin .../graphics}/l1rope/another_swing15.png | Bin .../graphics}/l1rope/another_swing16.png | Bin .../graphics}/l1rope/another_swing17.png | Bin .../graphics}/l1rope/another_swing18.png | Bin .../graphics}/l1rope/another_swing19.png | Bin .../graphics}/l1rope/another_swing20.png | Bin .../graphics}/l1rope/another_swing21.png | Bin .../graphics}/l1rope/another_swing22.png | Bin .../graphics}/l1rope/another_swing23.png | Bin .../graphics}/l1rope/another_swing24.png | Bin .../graphics}/l1rope/another_swing25.png | Bin .../graphics}/l1rope/another_swing_all.png | Bin .../graphics}/l1rope/falling.png | Bin .../graphics}/l1rope/ootw_rope.inc | 0 .../graphics}/l1rope/ootw_swing.inc | 0 .../graphics}/l1underwater/Makefile | 0 .../graphics}/l1underwater/another_uboot.png | Bin .../graphics}/l1underwater/ootw_uboot_bg.png | Bin .../l1underwater/ootw_uboot_flash1.png | Bin .../l1underwater/ootw_uboot_flash2.png | Bin .../l1underwater/ootw_underwater.inc | 0 games/ootw/{ => ootw_c1}/ootw_c1.s | 66 +++++++++--------- games/ootw/{ => ootw_c1}/ootw_c1_arrival.s | 0 games/ootw/{ => ootw_c1}/ootw_c1_beast.s | 0 games/ootw/{ => ootw_c1}/ootw_c1_cavern.s | 0 games/ootw/{ => ootw_c1}/ootw_c1_mesa.s | 0 games/ootw/{ => ootw_c1}/ootw_c1_pool.s | 0 games/ootw/{ => ootw_c1}/ootw_c1_rope.s | 0 games/ootw/{ => ootw_c1}/ootw_c1_sluggy.s | 0 135 files changed, 40 insertions(+), 67 deletions(-) rename games/ootw/{ => ootw_c1}/earthquake.s (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1caves/Makefile (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1caves/another_cave.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1caves/another_cave2.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1caves/another_cave3.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1caves/ootw_cavern.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1caves/ootw_cavern2.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1caves/ootw_cavern3.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/Makefile (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/another_cave3_cut-20190308-170625.piskel (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/another_cave3_cut.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/black.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end01.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end02.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end03.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end04.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end05.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end06.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end07.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end08.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end09.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end10.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end11.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end12.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end13.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end14.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end15.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end16.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end17.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end18.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end19.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end20.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end21.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end22.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end23.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end24.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end25.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end26.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end27.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end28.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end29.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end30.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end31.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end32.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end33.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end36.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end37.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end38.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end39.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end40.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end41.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end42.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end43.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end44.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end45.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end46.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end47.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end48.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end49.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end50.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/l1end51.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/ootw_deadbeast.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/ootw_gunguy.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/ootw_l1end.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end/ootw_peace.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/Makefile (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_bg.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash07.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash08.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash09.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash10.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash11.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash12.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash13.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash14.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash15.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash16.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash17.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash18.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash19.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/beast_slash20.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/ootw_beast_end.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/ootw_beast_intro.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1end_scenes/ootw_slug_end.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1pool/Makefile (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1pool/another_pool.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1pool/ootw_pool.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/Makefile (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_brokerope.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_norope.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_rope-20190316-152508.piskel (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_rope.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing01.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing02.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing03.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing04.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing05.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing06.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing08.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing10.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing11.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing12.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing13.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing14.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing15.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing16.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing17.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing18.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing19.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing20.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing21.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing22.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing23.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing24.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing25.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/another_swing_all.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/falling.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/ootw_rope.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1rope/ootw_swing.inc (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1underwater/Makefile (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1underwater/another_uboot.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1underwater/ootw_uboot_bg.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1underwater/ootw_uboot_flash1.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1underwater/ootw_uboot_flash2.png (100%) rename games/ootw/{ootw_graphics => ootw_c1/graphics}/l1underwater/ootw_underwater.inc (100%) rename games/ootw/{ => ootw_c1}/ootw_c1.s (62%) rename games/ootw/{ => ootw_c1}/ootw_c1_arrival.s (100%) rename games/ootw/{ => ootw_c1}/ootw_c1_beast.s (100%) rename games/ootw/{ => ootw_c1}/ootw_c1_cavern.s (100%) rename games/ootw/{ => ootw_c1}/ootw_c1_mesa.s (100%) rename games/ootw/{ => ootw_c1}/ootw_c1_pool.s (100%) rename games/ootw/{ => ootw_c1}/ootw_c1_rope.s (100%) rename games/ootw/{ => ootw_c1}/ootw_c1_sluggy.s (100%) diff --git a/games/ootw/Makefile b/games/ootw/Makefile index 09f5f1c0..3c0ca995 100644 --- a/games/ootw/Makefile +++ b/games/ootw/Makefile @@ -8,12 +8,12 @@ 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_C2 OOTW_C3 OOTW_C4 OOTW_C5 +ootw.dsk: HELLO TITLE ./intro/INTRO ./ootw_c1/OOTW_C1 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 + $(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_C3 $(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C4 @@ -46,37 +46,6 @@ ootw_side3.dsk: HELLO TITLE ENDING \ -#### - -OOTW_C1: ootw_c1.o - ld65 -o OOTW_C1 ootw_c1.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c1.o: ootw_c1.s \ - gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s \ - gr_putsprite.s gr_putsprite_flipped.s gr_putsprite_crop.s \ - gr_hlin.s gr_make_quake.s gr_overlay.s zp.inc keyboard.s \ - collision.s \ - ootw_c1_sluggy.s ootw_c1_beast.s \ - ootw_c1_arrival.s ootw_c1_rope.s earthquake.s ootw_c1_mesa.s \ - ootw_c1_pool.s ootw_c1_cavern.s physicist.s random16.s \ - ootw_graphics/l1pool/ootw_pool.inc \ - ootw_graphics/l1underwater/ootw_underwater.inc \ - ootw_graphics/l1caves/ootw_cavern.inc \ - ootw_graphics/l1caves/ootw_cavern2.inc \ - ootw_graphics/l1caves/ootw_cavern3.inc \ - ootw_graphics/l1rope/ootw_rope.inc \ - ootw_graphics/l1rope/ootw_swing.inc \ - ootw_graphics/l1end/ootw_l1end.inc \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/sprites/physicist_l1_swim.inc \ - ootw_graphics/sprites/slugs.inc \ - ootw_graphics/sprites/l1_background.inc \ - ootw_graphics/sprites/beast.inc \ - ootw_graphics/l1end_scenes/ootw_beast_end.inc \ - ootw_graphics/l1end_scenes/ootw_beast_intro.inc \ - ootw_graphics/l1end_scenes/ootw_slug_end.inc - ca65 -o ootw_c1.o ootw_c1.s -l ootw_c1.lst - #### OOTW_C2: ootw_c2.o @@ -308,6 +277,10 @@ audio.o: audio.s intro/INTRO: cd intro && make +ootw_c1/OOTW_C1: + cd ootw_c1 && make + + #### LOADER: loader.o diff --git a/games/ootw/intro/intro_03_elevator.s b/games/ootw/intro/intro_03_elevator.s index a1d20f42..15b18bdb 100644 --- a/games/ootw/intro/intro_03_elevator.s +++ b/games/ootw/intro/intro_03_elevator.s @@ -436,7 +436,7 @@ elevator_inner_loop: jsr page_flip ldx #80 - jmp long_wait ; returns for us + jmp long_wait ; return for us diff --git a/games/ootw/earthquake.s b/games/ootw/ootw_c1/earthquake.s similarity index 100% rename from games/ootw/earthquake.s rename to games/ootw/ootw_c1/earthquake.s diff --git a/games/ootw/ootw_graphics/l1caves/Makefile b/games/ootw/ootw_c1/graphics/l1caves/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l1caves/Makefile rename to games/ootw/ootw_c1/graphics/l1caves/Makefile diff --git a/games/ootw/ootw_graphics/l1caves/another_cave.png b/games/ootw/ootw_c1/graphics/l1caves/another_cave.png similarity index 100% rename from games/ootw/ootw_graphics/l1caves/another_cave.png rename to games/ootw/ootw_c1/graphics/l1caves/another_cave.png diff --git a/games/ootw/ootw_graphics/l1caves/another_cave2.png b/games/ootw/ootw_c1/graphics/l1caves/another_cave2.png similarity index 100% rename from games/ootw/ootw_graphics/l1caves/another_cave2.png rename to games/ootw/ootw_c1/graphics/l1caves/another_cave2.png diff --git a/games/ootw/ootw_graphics/l1caves/another_cave3.png b/games/ootw/ootw_c1/graphics/l1caves/another_cave3.png similarity index 100% rename from games/ootw/ootw_graphics/l1caves/another_cave3.png rename to games/ootw/ootw_c1/graphics/l1caves/another_cave3.png diff --git a/games/ootw/ootw_graphics/l1caves/ootw_cavern.inc b/games/ootw/ootw_c1/graphics/l1caves/ootw_cavern.inc similarity index 100% rename from games/ootw/ootw_graphics/l1caves/ootw_cavern.inc rename to games/ootw/ootw_c1/graphics/l1caves/ootw_cavern.inc diff --git a/games/ootw/ootw_graphics/l1caves/ootw_cavern2.inc b/games/ootw/ootw_c1/graphics/l1caves/ootw_cavern2.inc similarity index 100% rename from games/ootw/ootw_graphics/l1caves/ootw_cavern2.inc rename to games/ootw/ootw_c1/graphics/l1caves/ootw_cavern2.inc diff --git a/games/ootw/ootw_graphics/l1caves/ootw_cavern3.inc b/games/ootw/ootw_c1/graphics/l1caves/ootw_cavern3.inc similarity index 100% rename from games/ootw/ootw_graphics/l1caves/ootw_cavern3.inc rename to games/ootw/ootw_c1/graphics/l1caves/ootw_cavern3.inc diff --git a/games/ootw/ootw_graphics/l1end/Makefile b/games/ootw/ootw_c1/graphics/l1end/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l1end/Makefile rename to games/ootw/ootw_c1/graphics/l1end/Makefile diff --git a/games/ootw/ootw_graphics/l1end/another_cave3_cut-20190308-170625.piskel b/games/ootw/ootw_c1/graphics/l1end/another_cave3_cut-20190308-170625.piskel similarity index 100% rename from games/ootw/ootw_graphics/l1end/another_cave3_cut-20190308-170625.piskel rename to games/ootw/ootw_c1/graphics/l1end/another_cave3_cut-20190308-170625.piskel diff --git a/games/ootw/ootw_graphics/l1end/another_cave3_cut.png b/games/ootw/ootw_c1/graphics/l1end/another_cave3_cut.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/another_cave3_cut.png rename to games/ootw/ootw_c1/graphics/l1end/another_cave3_cut.png diff --git a/games/ootw/ootw_graphics/l1end/black.png b/games/ootw/ootw_c1/graphics/l1end/black.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/black.png rename to games/ootw/ootw_c1/graphics/l1end/black.png diff --git a/games/ootw/ootw_graphics/l1end/l1end01.png b/games/ootw/ootw_c1/graphics/l1end/l1end01.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end01.png rename to games/ootw/ootw_c1/graphics/l1end/l1end01.png diff --git a/games/ootw/ootw_graphics/l1end/l1end02.png b/games/ootw/ootw_c1/graphics/l1end/l1end02.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end02.png rename to games/ootw/ootw_c1/graphics/l1end/l1end02.png diff --git a/games/ootw/ootw_graphics/l1end/l1end03.png b/games/ootw/ootw_c1/graphics/l1end/l1end03.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end03.png rename to games/ootw/ootw_c1/graphics/l1end/l1end03.png diff --git a/games/ootw/ootw_graphics/l1end/l1end04.png b/games/ootw/ootw_c1/graphics/l1end/l1end04.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end04.png rename to games/ootw/ootw_c1/graphics/l1end/l1end04.png diff --git a/games/ootw/ootw_graphics/l1end/l1end05.png b/games/ootw/ootw_c1/graphics/l1end/l1end05.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end05.png rename to games/ootw/ootw_c1/graphics/l1end/l1end05.png diff --git a/games/ootw/ootw_graphics/l1end/l1end06.png b/games/ootw/ootw_c1/graphics/l1end/l1end06.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end06.png rename to games/ootw/ootw_c1/graphics/l1end/l1end06.png diff --git a/games/ootw/ootw_graphics/l1end/l1end07.png b/games/ootw/ootw_c1/graphics/l1end/l1end07.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end07.png rename to games/ootw/ootw_c1/graphics/l1end/l1end07.png diff --git a/games/ootw/ootw_graphics/l1end/l1end08.png b/games/ootw/ootw_c1/graphics/l1end/l1end08.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end08.png rename to games/ootw/ootw_c1/graphics/l1end/l1end08.png diff --git a/games/ootw/ootw_graphics/l1end/l1end09.png b/games/ootw/ootw_c1/graphics/l1end/l1end09.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end09.png rename to games/ootw/ootw_c1/graphics/l1end/l1end09.png diff --git a/games/ootw/ootw_graphics/l1end/l1end10.png b/games/ootw/ootw_c1/graphics/l1end/l1end10.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end10.png rename to games/ootw/ootw_c1/graphics/l1end/l1end10.png diff --git a/games/ootw/ootw_graphics/l1end/l1end11.png b/games/ootw/ootw_c1/graphics/l1end/l1end11.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end11.png rename to games/ootw/ootw_c1/graphics/l1end/l1end11.png diff --git a/games/ootw/ootw_graphics/l1end/l1end12.png b/games/ootw/ootw_c1/graphics/l1end/l1end12.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end12.png rename to games/ootw/ootw_c1/graphics/l1end/l1end12.png diff --git a/games/ootw/ootw_graphics/l1end/l1end13.png b/games/ootw/ootw_c1/graphics/l1end/l1end13.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end13.png rename to games/ootw/ootw_c1/graphics/l1end/l1end13.png diff --git a/games/ootw/ootw_graphics/l1end/l1end14.png b/games/ootw/ootw_c1/graphics/l1end/l1end14.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end14.png rename to games/ootw/ootw_c1/graphics/l1end/l1end14.png diff --git a/games/ootw/ootw_graphics/l1end/l1end15.png b/games/ootw/ootw_c1/graphics/l1end/l1end15.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end15.png rename to games/ootw/ootw_c1/graphics/l1end/l1end15.png diff --git a/games/ootw/ootw_graphics/l1end/l1end16.png b/games/ootw/ootw_c1/graphics/l1end/l1end16.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end16.png rename to games/ootw/ootw_c1/graphics/l1end/l1end16.png diff --git a/games/ootw/ootw_graphics/l1end/l1end17.png b/games/ootw/ootw_c1/graphics/l1end/l1end17.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end17.png rename to games/ootw/ootw_c1/graphics/l1end/l1end17.png diff --git a/games/ootw/ootw_graphics/l1end/l1end18.png b/games/ootw/ootw_c1/graphics/l1end/l1end18.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end18.png rename to games/ootw/ootw_c1/graphics/l1end/l1end18.png diff --git a/games/ootw/ootw_graphics/l1end/l1end19.png b/games/ootw/ootw_c1/graphics/l1end/l1end19.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end19.png rename to games/ootw/ootw_c1/graphics/l1end/l1end19.png diff --git a/games/ootw/ootw_graphics/l1end/l1end20.png b/games/ootw/ootw_c1/graphics/l1end/l1end20.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end20.png rename to games/ootw/ootw_c1/graphics/l1end/l1end20.png diff --git a/games/ootw/ootw_graphics/l1end/l1end21.png b/games/ootw/ootw_c1/graphics/l1end/l1end21.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end21.png rename to games/ootw/ootw_c1/graphics/l1end/l1end21.png diff --git a/games/ootw/ootw_graphics/l1end/l1end22.png b/games/ootw/ootw_c1/graphics/l1end/l1end22.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end22.png rename to games/ootw/ootw_c1/graphics/l1end/l1end22.png diff --git a/games/ootw/ootw_graphics/l1end/l1end23.png b/games/ootw/ootw_c1/graphics/l1end/l1end23.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end23.png rename to games/ootw/ootw_c1/graphics/l1end/l1end23.png diff --git a/games/ootw/ootw_graphics/l1end/l1end24.png b/games/ootw/ootw_c1/graphics/l1end/l1end24.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end24.png rename to games/ootw/ootw_c1/graphics/l1end/l1end24.png diff --git a/games/ootw/ootw_graphics/l1end/l1end25.png b/games/ootw/ootw_c1/graphics/l1end/l1end25.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end25.png rename to games/ootw/ootw_c1/graphics/l1end/l1end25.png diff --git a/games/ootw/ootw_graphics/l1end/l1end26.png b/games/ootw/ootw_c1/graphics/l1end/l1end26.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end26.png rename to games/ootw/ootw_c1/graphics/l1end/l1end26.png diff --git a/games/ootw/ootw_graphics/l1end/l1end27.png b/games/ootw/ootw_c1/graphics/l1end/l1end27.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end27.png rename to games/ootw/ootw_c1/graphics/l1end/l1end27.png diff --git a/games/ootw/ootw_graphics/l1end/l1end28.png b/games/ootw/ootw_c1/graphics/l1end/l1end28.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end28.png rename to games/ootw/ootw_c1/graphics/l1end/l1end28.png diff --git a/games/ootw/ootw_graphics/l1end/l1end29.png b/games/ootw/ootw_c1/graphics/l1end/l1end29.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end29.png rename to games/ootw/ootw_c1/graphics/l1end/l1end29.png diff --git a/games/ootw/ootw_graphics/l1end/l1end30.png b/games/ootw/ootw_c1/graphics/l1end/l1end30.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end30.png rename to games/ootw/ootw_c1/graphics/l1end/l1end30.png diff --git a/games/ootw/ootw_graphics/l1end/l1end31.png b/games/ootw/ootw_c1/graphics/l1end/l1end31.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end31.png rename to games/ootw/ootw_c1/graphics/l1end/l1end31.png diff --git a/games/ootw/ootw_graphics/l1end/l1end32.png b/games/ootw/ootw_c1/graphics/l1end/l1end32.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end32.png rename to games/ootw/ootw_c1/graphics/l1end/l1end32.png diff --git a/games/ootw/ootw_graphics/l1end/l1end33.png b/games/ootw/ootw_c1/graphics/l1end/l1end33.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end33.png rename to games/ootw/ootw_c1/graphics/l1end/l1end33.png diff --git a/games/ootw/ootw_graphics/l1end/l1end36.png b/games/ootw/ootw_c1/graphics/l1end/l1end36.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end36.png rename to games/ootw/ootw_c1/graphics/l1end/l1end36.png diff --git a/games/ootw/ootw_graphics/l1end/l1end37.png b/games/ootw/ootw_c1/graphics/l1end/l1end37.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end37.png rename to games/ootw/ootw_c1/graphics/l1end/l1end37.png diff --git a/games/ootw/ootw_graphics/l1end/l1end38.png b/games/ootw/ootw_c1/graphics/l1end/l1end38.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end38.png rename to games/ootw/ootw_c1/graphics/l1end/l1end38.png diff --git a/games/ootw/ootw_graphics/l1end/l1end39.png b/games/ootw/ootw_c1/graphics/l1end/l1end39.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end39.png rename to games/ootw/ootw_c1/graphics/l1end/l1end39.png diff --git a/games/ootw/ootw_graphics/l1end/l1end40.png b/games/ootw/ootw_c1/graphics/l1end/l1end40.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end40.png rename to games/ootw/ootw_c1/graphics/l1end/l1end40.png diff --git a/games/ootw/ootw_graphics/l1end/l1end41.png b/games/ootw/ootw_c1/graphics/l1end/l1end41.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end41.png rename to games/ootw/ootw_c1/graphics/l1end/l1end41.png diff --git a/games/ootw/ootw_graphics/l1end/l1end42.png b/games/ootw/ootw_c1/graphics/l1end/l1end42.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end42.png rename to games/ootw/ootw_c1/graphics/l1end/l1end42.png diff --git a/games/ootw/ootw_graphics/l1end/l1end43.png b/games/ootw/ootw_c1/graphics/l1end/l1end43.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end43.png rename to games/ootw/ootw_c1/graphics/l1end/l1end43.png diff --git a/games/ootw/ootw_graphics/l1end/l1end44.png b/games/ootw/ootw_c1/graphics/l1end/l1end44.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end44.png rename to games/ootw/ootw_c1/graphics/l1end/l1end44.png diff --git a/games/ootw/ootw_graphics/l1end/l1end45.png b/games/ootw/ootw_c1/graphics/l1end/l1end45.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end45.png rename to games/ootw/ootw_c1/graphics/l1end/l1end45.png diff --git a/games/ootw/ootw_graphics/l1end/l1end46.png b/games/ootw/ootw_c1/graphics/l1end/l1end46.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end46.png rename to games/ootw/ootw_c1/graphics/l1end/l1end46.png diff --git a/games/ootw/ootw_graphics/l1end/l1end47.png b/games/ootw/ootw_c1/graphics/l1end/l1end47.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end47.png rename to games/ootw/ootw_c1/graphics/l1end/l1end47.png diff --git a/games/ootw/ootw_graphics/l1end/l1end48.png b/games/ootw/ootw_c1/graphics/l1end/l1end48.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end48.png rename to games/ootw/ootw_c1/graphics/l1end/l1end48.png diff --git a/games/ootw/ootw_graphics/l1end/l1end49.png b/games/ootw/ootw_c1/graphics/l1end/l1end49.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end49.png rename to games/ootw/ootw_c1/graphics/l1end/l1end49.png diff --git a/games/ootw/ootw_graphics/l1end/l1end50.png b/games/ootw/ootw_c1/graphics/l1end/l1end50.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end50.png rename to games/ootw/ootw_c1/graphics/l1end/l1end50.png diff --git a/games/ootw/ootw_graphics/l1end/l1end51.png b/games/ootw/ootw_c1/graphics/l1end/l1end51.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/l1end51.png rename to games/ootw/ootw_c1/graphics/l1end/l1end51.png diff --git a/games/ootw/ootw_graphics/l1end/ootw_deadbeast.png b/games/ootw/ootw_c1/graphics/l1end/ootw_deadbeast.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/ootw_deadbeast.png rename to games/ootw/ootw_c1/graphics/l1end/ootw_deadbeast.png diff --git a/games/ootw/ootw_graphics/l1end/ootw_gunguy.png b/games/ootw/ootw_c1/graphics/l1end/ootw_gunguy.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/ootw_gunguy.png rename to games/ootw/ootw_c1/graphics/l1end/ootw_gunguy.png diff --git a/games/ootw/ootw_graphics/l1end/ootw_l1end.inc b/games/ootw/ootw_c1/graphics/l1end/ootw_l1end.inc similarity index 100% rename from games/ootw/ootw_graphics/l1end/ootw_l1end.inc rename to games/ootw/ootw_c1/graphics/l1end/ootw_l1end.inc diff --git a/games/ootw/ootw_graphics/l1end/ootw_peace.png b/games/ootw/ootw_c1/graphics/l1end/ootw_peace.png similarity index 100% rename from games/ootw/ootw_graphics/l1end/ootw_peace.png rename to games/ootw/ootw_c1/graphics/l1end/ootw_peace.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/Makefile b/games/ootw/ootw_c1/graphics/l1end_scenes/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/Makefile rename to games/ootw/ootw_c1/graphics/l1end_scenes/Makefile diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_bg.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_bg.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_bg.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash07.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash07.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash07.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash07.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash08.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash08.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash08.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash08.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash09.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash09.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash09.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash09.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash10.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash10.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash10.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash10.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash11.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash11.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash11.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash11.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash12.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash12.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash12.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash12.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash13.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash13.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash13.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash13.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash14.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash14.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash14.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash14.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash15.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash15.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash15.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash15.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash16.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash16.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash16.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash16.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash17.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash17.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash17.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash17.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash18.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash18.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash18.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash18.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash19.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash19.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash19.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash19.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/beast_slash20.png b/games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash20.png similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/beast_slash20.png rename to games/ootw/ootw_c1/graphics/l1end_scenes/beast_slash20.png diff --git a/games/ootw/ootw_graphics/l1end_scenes/ootw_beast_end.inc b/games/ootw/ootw_c1/graphics/l1end_scenes/ootw_beast_end.inc similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/ootw_beast_end.inc rename to games/ootw/ootw_c1/graphics/l1end_scenes/ootw_beast_end.inc diff --git a/games/ootw/ootw_graphics/l1end_scenes/ootw_beast_intro.inc b/games/ootw/ootw_c1/graphics/l1end_scenes/ootw_beast_intro.inc similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/ootw_beast_intro.inc rename to games/ootw/ootw_c1/graphics/l1end_scenes/ootw_beast_intro.inc diff --git a/games/ootw/ootw_graphics/l1end_scenes/ootw_slug_end.inc b/games/ootw/ootw_c1/graphics/l1end_scenes/ootw_slug_end.inc similarity index 100% rename from games/ootw/ootw_graphics/l1end_scenes/ootw_slug_end.inc rename to games/ootw/ootw_c1/graphics/l1end_scenes/ootw_slug_end.inc diff --git a/games/ootw/ootw_graphics/l1pool/Makefile b/games/ootw/ootw_c1/graphics/l1pool/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l1pool/Makefile rename to games/ootw/ootw_c1/graphics/l1pool/Makefile diff --git a/games/ootw/ootw_graphics/l1pool/another_pool.png b/games/ootw/ootw_c1/graphics/l1pool/another_pool.png similarity index 100% rename from games/ootw/ootw_graphics/l1pool/another_pool.png rename to games/ootw/ootw_c1/graphics/l1pool/another_pool.png diff --git a/games/ootw/ootw_graphics/l1pool/ootw_pool.inc b/games/ootw/ootw_c1/graphics/l1pool/ootw_pool.inc similarity index 100% rename from games/ootw/ootw_graphics/l1pool/ootw_pool.inc rename to games/ootw/ootw_c1/graphics/l1pool/ootw_pool.inc diff --git a/games/ootw/ootw_graphics/l1rope/Makefile b/games/ootw/ootw_c1/graphics/l1rope/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l1rope/Makefile rename to games/ootw/ootw_c1/graphics/l1rope/Makefile diff --git a/games/ootw/ootw_graphics/l1rope/another_brokerope.png b/games/ootw/ootw_c1/graphics/l1rope/another_brokerope.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_brokerope.png rename to games/ootw/ootw_c1/graphics/l1rope/another_brokerope.png diff --git a/games/ootw/ootw_graphics/l1rope/another_norope.png b/games/ootw/ootw_c1/graphics/l1rope/another_norope.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_norope.png rename to games/ootw/ootw_c1/graphics/l1rope/another_norope.png diff --git a/games/ootw/ootw_graphics/l1rope/another_rope-20190316-152508.piskel b/games/ootw/ootw_c1/graphics/l1rope/another_rope-20190316-152508.piskel similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_rope-20190316-152508.piskel rename to games/ootw/ootw_c1/graphics/l1rope/another_rope-20190316-152508.piskel diff --git a/games/ootw/ootw_graphics/l1rope/another_rope.png b/games/ootw/ootw_c1/graphics/l1rope/another_rope.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_rope.png rename to games/ootw/ootw_c1/graphics/l1rope/another_rope.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing01.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing01.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing01.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing01.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing02.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing02.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing02.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing02.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing03.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing03.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing03.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing03.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing04.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing04.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing04.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing04.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing05.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing05.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing05.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing05.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing06.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing06.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing06.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing06.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing08.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing08.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing08.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing08.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing10.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing10.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing10.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing10.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing11.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing11.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing11.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing11.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing12.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing12.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing12.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing12.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing13.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing13.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing13.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing13.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing14.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing14.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing14.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing14.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing15.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing15.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing15.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing15.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing16.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing16.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing16.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing16.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing17.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing17.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing17.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing17.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing18.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing18.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing18.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing18.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing19.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing19.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing19.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing19.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing20.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing20.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing20.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing20.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing21.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing21.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing21.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing21.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing22.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing22.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing22.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing22.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing23.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing23.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing23.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing23.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing24.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing24.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing24.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing24.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing25.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing25.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing25.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing25.png diff --git a/games/ootw/ootw_graphics/l1rope/another_swing_all.png b/games/ootw/ootw_c1/graphics/l1rope/another_swing_all.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/another_swing_all.png rename to games/ootw/ootw_c1/graphics/l1rope/another_swing_all.png diff --git a/games/ootw/ootw_graphics/l1rope/falling.png b/games/ootw/ootw_c1/graphics/l1rope/falling.png similarity index 100% rename from games/ootw/ootw_graphics/l1rope/falling.png rename to games/ootw/ootw_c1/graphics/l1rope/falling.png diff --git a/games/ootw/ootw_graphics/l1rope/ootw_rope.inc b/games/ootw/ootw_c1/graphics/l1rope/ootw_rope.inc similarity index 100% rename from games/ootw/ootw_graphics/l1rope/ootw_rope.inc rename to games/ootw/ootw_c1/graphics/l1rope/ootw_rope.inc diff --git a/games/ootw/ootw_graphics/l1rope/ootw_swing.inc b/games/ootw/ootw_c1/graphics/l1rope/ootw_swing.inc similarity index 100% rename from games/ootw/ootw_graphics/l1rope/ootw_swing.inc rename to games/ootw/ootw_c1/graphics/l1rope/ootw_swing.inc diff --git a/games/ootw/ootw_graphics/l1underwater/Makefile b/games/ootw/ootw_c1/graphics/l1underwater/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l1underwater/Makefile rename to games/ootw/ootw_c1/graphics/l1underwater/Makefile diff --git a/games/ootw/ootw_graphics/l1underwater/another_uboot.png b/games/ootw/ootw_c1/graphics/l1underwater/another_uboot.png similarity index 100% rename from games/ootw/ootw_graphics/l1underwater/another_uboot.png rename to games/ootw/ootw_c1/graphics/l1underwater/another_uboot.png diff --git a/games/ootw/ootw_graphics/l1underwater/ootw_uboot_bg.png b/games/ootw/ootw_c1/graphics/l1underwater/ootw_uboot_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l1underwater/ootw_uboot_bg.png rename to games/ootw/ootw_c1/graphics/l1underwater/ootw_uboot_bg.png diff --git a/games/ootw/ootw_graphics/l1underwater/ootw_uboot_flash1.png b/games/ootw/ootw_c1/graphics/l1underwater/ootw_uboot_flash1.png similarity index 100% rename from games/ootw/ootw_graphics/l1underwater/ootw_uboot_flash1.png rename to games/ootw/ootw_c1/graphics/l1underwater/ootw_uboot_flash1.png diff --git a/games/ootw/ootw_graphics/l1underwater/ootw_uboot_flash2.png b/games/ootw/ootw_c1/graphics/l1underwater/ootw_uboot_flash2.png similarity index 100% rename from games/ootw/ootw_graphics/l1underwater/ootw_uboot_flash2.png rename to games/ootw/ootw_c1/graphics/l1underwater/ootw_uboot_flash2.png diff --git a/games/ootw/ootw_graphics/l1underwater/ootw_underwater.inc b/games/ootw/ootw_c1/graphics/l1underwater/ootw_underwater.inc similarity index 100% rename from games/ootw/ootw_graphics/l1underwater/ootw_underwater.inc rename to games/ootw/ootw_c1/graphics/l1underwater/ootw_underwater.inc diff --git a/games/ootw/ootw_c1.s b/games/ootw/ootw_c1/ootw_c1.s similarity index 62% rename from games/ootw/ootw_c1.s rename to games/ootw/ootw_c1/ootw_c1.s index 8bd9f419..94a57505 100644 --- a/games/ootw/ootw_c1.s +++ b/games/ootw/ootw_c1/ootw_c1.s @@ -2,8 +2,8 @@ ; by Vince "Deater" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" @@ -134,41 +134,41 @@ end_message: .include "ootw_c1_mesa.s" ; movement -.include "physicist.s" +.include "../physicist.s" .include "ootw_c1_sluggy.s" .include "ootw_c1_beast.s" .include "earthquake.s" -.include "text_print.s" -.include "gr_pageflip.s" -.include "gr_unrle.s" -.include "gr_fast_clear.s" -.include "gr_copy.s" -.include "gr_make_quake.s" -.include "gr_putsprite.s" -.include "gr_putsprite_flipped.s" -.include "gr_offsets.s" -.include "gr_hlin.s" -.include "random16.s" -.include "keyboard.s" -.include "gr_overlay.s" -.include "gr_putsprite_crop.s" +.include "../text_print.s" +.include "../gr_pageflip.s" +.include "../gr_unrle.s" +.include "../gr_fast_clear.s" +.include "../gr_copy.s" +.include "../gr_make_quake.s" +.include "../gr_putsprite.s" +.include "../gr_putsprite_flipped.s" +.include "../gr_offsets.s" +.include "../gr_hlin.s" +.include "../random16.s" +.include "../keyboard.s" +.include "../gr_overlay.s" +.include "../gr_putsprite_crop.s" ; room backgrounds -.include "ootw_graphics/l1pool/ootw_pool.inc" -.include "ootw_graphics/l1caves/ootw_cavern.inc" -.include "ootw_graphics/l1caves/ootw_cavern2.inc" -.include "ootw_graphics/l1caves/ootw_cavern3.inc" -.include "ootw_graphics/l1rope/ootw_rope.inc" -.include "ootw_graphics/l1rope/ootw_swing.inc" -.include "ootw_graphics/l1underwater/ootw_underwater.inc" +.include "graphics/l1pool/ootw_pool.inc" +.include "graphics/l1caves/ootw_cavern.inc" +.include "graphics/l1caves/ootw_cavern2.inc" +.include "graphics/l1caves/ootw_cavern3.inc" +.include "graphics/l1rope/ootw_rope.inc" +.include "graphics/l1rope/ootw_swing.inc" +.include "graphics/l1underwater/ootw_underwater.inc" ; sprites -.include "ootw_graphics/sprites/l1_background.inc" -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/physicist_l1_swim.inc" -.include "ootw_graphics/sprites/slugs.inc" -.include "ootw_graphics/sprites/beast.inc" +.include "../ootw_graphics/sprites/l1_background.inc" +.include "../ootw_graphics/sprites/physicist.inc" +.include "../ootw_graphics/sprites/physicist_l1_swim.inc" +.include "../ootw_graphics/sprites/slugs.inc" +.include "../ootw_graphics/sprites/beast.inc" ; cutscene data -.include "ootw_graphics/l1end/ootw_l1end.inc" -.include "ootw_graphics/l1end_scenes/ootw_beast_end.inc" -.include "ootw_graphics/l1end_scenes/ootw_slug_end.inc" -.include "ootw_graphics/l1end_scenes/ootw_beast_intro.inc" +.include "graphics/l1end/ootw_l1end.inc" +.include "graphics/l1end_scenes/ootw_beast_end.inc" +.include "graphics/l1end_scenes/ootw_slug_end.inc" +.include "graphics/l1end_scenes/ootw_beast_intro.inc" diff --git a/games/ootw/ootw_c1_arrival.s b/games/ootw/ootw_c1/ootw_c1_arrival.s similarity index 100% rename from games/ootw/ootw_c1_arrival.s rename to games/ootw/ootw_c1/ootw_c1_arrival.s diff --git a/games/ootw/ootw_c1_beast.s b/games/ootw/ootw_c1/ootw_c1_beast.s similarity index 100% rename from games/ootw/ootw_c1_beast.s rename to games/ootw/ootw_c1/ootw_c1_beast.s diff --git a/games/ootw/ootw_c1_cavern.s b/games/ootw/ootw_c1/ootw_c1_cavern.s similarity index 100% rename from games/ootw/ootw_c1_cavern.s rename to games/ootw/ootw_c1/ootw_c1_cavern.s diff --git a/games/ootw/ootw_c1_mesa.s b/games/ootw/ootw_c1/ootw_c1_mesa.s similarity index 100% rename from games/ootw/ootw_c1_mesa.s rename to games/ootw/ootw_c1/ootw_c1_mesa.s diff --git a/games/ootw/ootw_c1_pool.s b/games/ootw/ootw_c1/ootw_c1_pool.s similarity index 100% rename from games/ootw/ootw_c1_pool.s rename to games/ootw/ootw_c1/ootw_c1_pool.s diff --git a/games/ootw/ootw_c1_rope.s b/games/ootw/ootw_c1/ootw_c1_rope.s similarity index 100% rename from games/ootw/ootw_c1_rope.s rename to games/ootw/ootw_c1/ootw_c1_rope.s diff --git a/games/ootw/ootw_c1_sluggy.s b/games/ootw/ootw_c1/ootw_c1_sluggy.s similarity index 100% rename from games/ootw/ootw_c1_sluggy.s rename to games/ootw/ootw_c1/ootw_c1_sluggy.s