From 48fc5d56204a0dcd8d2e5892f0e7dc362bd8920e Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 23 Mar 2021 11:01:36 -0400 Subject: [PATCH] ootw: moving things around again --- games/ootw/Makefile | 78 +++++++++++------- .../graphics/l16_end}/Makefile | 0 .../graphics/l16_end}/flying01.png | Bin .../graphics/l16_end}/flying03.png | Bin .../graphics/l16_end}/flying05.png | Bin .../graphics/l16_end}/flying07.png | Bin .../graphics/l16_end}/flying09.png | Bin .../graphics/l16_end}/flying11.png | Bin .../graphics/l16_end}/left_unfurl1.png | Bin .../graphics/l16_end}/left_unfurl2.png | Bin .../graphics/l16_end}/onboard.png | Bin .../graphics/l16_end}/ootw_c16_end.inc | 0 .../graphics/l16_end}/right_unfurl1.png | Bin .../graphics/l16_end}/right_unfurl2.png | Bin .../graphics/l16_end}/rooftop00.png | Bin .../graphics/l16_end}/rooftop01.png | Bin .../graphics/l16_end}/rooftop02.png | Bin .../graphics/l16_end}/rooftop03.png | Bin .../graphics/l16_end}/sky_bg.png | Bin .../graphics/l16_end}/the_end01.png | Bin .../graphics/l16_end}/the_end02.png | Bin .../graphics/l16_end}/the_end03.png | Bin .../graphics/l16_end}/the_end04.png | Bin .../graphics/l16_end}/the_end05.png | Bin .../graphics/l16_end}/the_end06.png | Bin .../graphics/l16_end}/the_end07.png | Bin .../graphics/l16_end}/the_end08.png | Bin .../graphics/l16_end}/the_end09.png | Bin .../graphics/l16_end}/the_end10.png | Bin .../graphics/l16_end}/wing_bg.png | Bin games/ootw/ootw_c1/Makefile | 55 ++++++++++++ games/ootw/ootw_c1/ootw_c1.s | 10 +-- games/ootw/{ => ootw_c10}/ootw_c10.s | 0 .../graphics/l11_above}/Makefile | 0 .../graphics/l11_above}/above.png | Bin .../graphics/l11_above}/ootw_c11_room.inc | 0 games/ootw/{ => ootw_c11}/ootw_c11.s | 0 .../graphics/l12_room}/Makefile | 0 .../graphics/l12_room}/house.png | Bin .../graphics/l12_room}/ootw_c12_room.inc | 0 games/ootw/{ => ootw_c12}/ootw_c12.s | 0 .../graphics/l13_room}/Makefile | 0 .../graphics/l13_room}/entry.png | Bin .../graphics/l13_room}/ootw_c13_room.inc | 0 games/ootw/{ => ootw_c13}/ootw_c13.s | 0 .../graphics/l14_arena}/Makefile | 0 .../graphics/l14_arena}/arena.png | Bin .../graphics/l14_arena}/ootw_c14_arena.inc | 0 games/ootw/{ => ootw_c14}/ootw_c14.s | 0 .../graphics/l15_final}/Makefile | 0 .../graphics/l15_final}/above_pit.png | Bin .../graphics/l15_final}/bath.png | Bin .../graphics/l15_final}/bath_00.png | Bin .../graphics/l15_final}/bath_01.png | Bin .../graphics/l15_final}/bath_02.png | Bin .../graphics/l15_final}/bath_03.png | Bin .../graphics/l15_final}/bath_04.png | Bin .../graphics/l15_final}/bath_05.png | Bin .../graphics/l15_final}/bath_06.png | Bin .../graphics/l15_final}/bath_07.png | Bin .../graphics/l15_final}/bath_08.png | Bin .../graphics/l15_final}/bath_09.png | Bin .../graphics/l15_final}/bath_10.png | Bin .../graphics/l15_final}/bath_11.png | Bin .../graphics/l15_final}/bath_12.png | Bin .../graphics/l15_final}/bath_13.png | Bin .../graphics/l15_final}/bath_14.png | Bin .../graphics/l15_final}/bath_15.png | Bin .../graphics/l15_final}/bath_16.png | Bin .../graphics/l15_final}/bath_17.png | Bin .../graphics/l15_final}/bath_18.png | Bin .../graphics/l15_final}/bath_19.png | Bin .../graphics/l15_final}/bath_20.png | Bin .../graphics/l15_final}/bath_21.png | Bin .../graphics/l15_final}/bath_22.png | Bin .../graphics/l15_final}/bath_23.png | Bin .../graphics/l15_final}/bath_24.png | Bin .../graphics/l15_final}/bath_25.png | Bin .../graphics/l15_final}/bath_26.png | Bin .../graphics/l15_final}/bath_27.png | Bin .../graphics/l15_final}/bath_28.png | Bin .../graphics/l15_final}/bath_29.png | Bin .../graphics/l15_final}/bath_30.png | Bin .../graphics/l15_final}/bath_31.png | Bin .../graphics/l15_final}/bath_32.png | Bin .../graphics/l15_final}/bath_33.png | Bin .../graphics/l15_final}/bath_34.png | Bin .../graphics/l15_final}/bath_35.png | Bin .../graphics/l15_final}/bath_end.png | Bin .../graphics/l15_final}/battle.png | Bin .../graphics/l15_final}/bigshot_01.png | Bin .../graphics/l15_final}/bigshot_02.png | Bin .../graphics/l15_final}/bigshot_03.png | Bin .../graphics/l15_final}/bigshot_04.png | Bin .../graphics/l15_final}/crash1.png | Bin .../graphics/l15_final}/crash2.png | Bin .../graphics/l15_final}/crash3.png | Bin .../graphics/l15_final}/crash4.png | Bin .../graphics/l15_final}/crash5.png | Bin .../graphics/l15_final}/crash6.png | Bin .../graphics/l15_final}/crash7.png | Bin .../graphics/l15_final}/fall01.png | Bin .../graphics/l15_final}/fall02.png | Bin .../graphics/l15_final}/fall03.png | Bin .../graphics/l15_final}/fall04.png | Bin .../graphics/l15_final}/fall05.png | Bin .../graphics/l15_final}/fall06.png | Bin .../graphics/l15_final}/fall07.png | Bin .../graphics/l15_final}/fall08.png | Bin .../graphics/l15_final}/fall09.png | Bin .../graphics/l15_final}/fall10.png | Bin .../graphics/l15_final}/fall11.png | Bin .../graphics/l15_final}/fall12.png | Bin .../graphics/l15_final}/fall13.png | Bin .../graphics/l15_final}/fall14.png | Bin .../graphics/l15_final}/fall15.png | Bin .../graphics/l15_final}/fall16.png | Bin .../graphics/l15_final}/fall17.png | Bin .../graphics/l15_final}/fall18.png | Bin .../graphics/l15_final}/fall19.png | Bin .../graphics/l15_final}/fall20.png | Bin .../graphics/l15_final}/fall21.png | Bin .../graphics/l15_final}/fall22.png | Bin .../graphics/l15_final}/fall23.png | Bin .../graphics/l15_final}/fall_bg.png | Bin .../graphics/l15_final}/final.png | Bin .../graphics/l15_final}/grabbed.png | Bin .../graphics/l15_final}/lshot1.png | Bin .../graphics/l15_final}/lshot2.png | Bin .../graphics/l15_final}/lshot3.png | Bin .../graphics/l15_final}/lshot4.png | Bin .../graphics/l15_final}/lshot5.png | Bin .../graphics/l15_final}/lshot6.png | Bin .../graphics/l15_final}/ootw_c15_bath.inc | 0 .../graphics/l15_final}/ootw_c15_bridge.inc | 0 .../graphics/l15_final}/ootw_c15_fall.inc | 0 .../graphics/l15_final}/ootw_c15_final.inc | 0 .../graphics/l15_final}/ootw_c15_walk.inc | 0 .../graphics/l15_final}/ootw_c15_walkway.inc | 0 .../graphics/l15_final}/walk_00.png | Bin .../graphics/l15_final}/walk_01.png | Bin .../graphics/l15_final}/walk_02.png | Bin .../graphics/l15_final}/walk_03.png | Bin .../graphics/l15_final}/walk_04.png | Bin .../graphics/l15_final}/walk_05.png | Bin .../graphics/l15_final}/walk_06.png | Bin .../graphics/l15_final}/walk_07.png | Bin .../graphics/l15_final}/walk_08.png | Bin .../graphics/l15_final}/walk_09.png | Bin .../graphics/l15_final}/walk_10.png | Bin .../graphics/l15_final}/walkway1.png | Bin .../graphics/l15_final}/walkway2.png | Bin .../graphics/l15_final}/walkway2_after.png | Bin .../graphics/l15_final}/walkway3.png | Bin games/ootw/{ => ootw_c15}/ootw_c15.s | 0 games/ootw/ootw_c2/ootw_c2.s | 6 +- games/ootw/ootw_c3/Makefile | 2 +- games/ootw/ootw_c3/ootw_c3.s | 2 +- games/ootw/ootw_c4/Makefile | 2 +- games/ootw/ootw_c4/ootw_c4.s | 6 +- .../graphics/l5_cave}/Makefile | 0 .../graphics/l5_cave}/entrance_cave.png | Bin .../graphics/l5_cave}/ootw_c5_cave.inc | 0 games/ootw/{ => ootw_c5}/ootw_c5.s | 61 +++++++------- games/ootw/{ => ootw_c5}/ootw_c5_cave.s | 0 .../graphics/l6_cave}/Makefile | 0 .../graphics/l6_cave}/cave.png | Bin .../graphics/l6_cave}/ootw_c6_cave.inc | 0 games/ootw/{ => ootw_c6}/ootw_c6.s | 0 .../graphics/l7_cave}/Makefile | 0 .../graphics/l7_cave}/cave.png | Bin .../graphics/l7_cave}/ootw_c7_cave.inc | 0 games/ootw/{ => ootw_c7}/ootw_c7.s | 0 .../graphics/l8_crawl}/Makefile | 0 .../graphics/l8_crawl}/entry.png | Bin .../graphics/l8_crawl}/ootw_c8_crawl.inc | 0 games/ootw/{ => ootw_c8}/ootw_c8.s | 0 .../graphics/l9_swim}/Makefile | 0 .../graphics/l9_swim}/ootw_c9_swim.inc | 0 .../graphics/l9_swim}/pool.png | Bin games/ootw/{ => ootw_c9}/ootw_c9.s | 0 .../{ootw_graphics => }/sprites/alien.inc | 0 .../sprites/another_sprites.png | Bin .../{ootw_graphics => }/sprites/beast.inc | 0 .../{ootw_graphics => }/sprites/friend.inc | 0 .../sprites/l1_background.inc | 0 .../{ootw_graphics => }/sprites/physicist.inc | 0 .../sprites/physicist_l1_swim.inc | 0 .../sprites/physicist_rolling.inc | 0 .../alien_shooting-20190718-170845.piskel | 0 .../alien_takeoff-20190715-160513.piskel | 0 .../alien_turning-20190718-150134.piskel | 0 .../alien_walking-20190718-145743.piskel | 0 .../alien_walking_gun-20190718-160427.piskel | 0 .../alien_yelling-20190718-165913.piskel | 0 .../piskel/beast-20190126-142310.piskel | 0 .../friend_walking-20190719-162844.piskel | 0 .../ootw_jumping-20190315-162115.piskel | 0 .../ootw_running-20190309-163912.piskel | 0 .../ootw_walking-20190309-154332.piskel | 0 .../ootw_walking-20190310-011534.piskel | 0 .../{ootw_graphics => }/sprites/slugs.inc | 0 .../gr-utils}/Apple II Lores.gpl | 0 203 files changed, 144 insertions(+), 78 deletions(-) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/Makefile (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/flying01.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/flying03.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/flying05.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/flying07.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/flying09.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/flying11.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/left_unfurl1.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/left_unfurl2.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/onboard.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/ootw_c16_end.inc (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/right_unfurl1.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/right_unfurl2.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/rooftop00.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/rooftop01.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/rooftop02.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/rooftop03.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/sky_bg.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end01.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end02.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end03.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end04.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end05.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end06.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end07.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end08.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end09.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/the_end10.png (100%) rename games/ootw/{ootw_graphics/l16end => ending/graphics/l16_end}/wing_bg.png (100%) create mode 100644 games/ootw/ootw_c1/Makefile rename games/ootw/{ => ootw_c10}/ootw_c10.s (100%) rename games/ootw/{ootw_graphics/l11above => ootw_c11/graphics/l11_above}/Makefile (100%) rename games/ootw/{ootw_graphics/l11above => ootw_c11/graphics/l11_above}/above.png (100%) rename games/ootw/{ootw_graphics/l11above => ootw_c11/graphics/l11_above}/ootw_c11_room.inc (100%) rename games/ootw/{ => ootw_c11}/ootw_c11.s (100%) rename games/ootw/{ootw_graphics/l12room => ootw_c12/graphics/l12_room}/Makefile (100%) rename games/ootw/{ootw_graphics/l12room => ootw_c12/graphics/l12_room}/house.png (100%) rename games/ootw/{ootw_graphics/l12room => ootw_c12/graphics/l12_room}/ootw_c12_room.inc (100%) rename games/ootw/{ => ootw_c12}/ootw_c12.s (100%) rename games/ootw/{ootw_graphics/l13room => ootw_c13/graphics/l13_room}/Makefile (100%) rename games/ootw/{ootw_graphics/l13room => ootw_c13/graphics/l13_room}/entry.png (100%) rename games/ootw/{ootw_graphics/l13room => ootw_c13/graphics/l13_room}/ootw_c13_room.inc (100%) rename games/ootw/{ => ootw_c13}/ootw_c13.s (100%) rename games/ootw/{ootw_graphics/l14arena => ootw_c14/graphics/l14_arena}/Makefile (100%) rename games/ootw/{ootw_graphics/l14arena => ootw_c14/graphics/l14_arena}/arena.png (100%) rename games/ootw/{ootw_graphics/l14arena => ootw_c14/graphics/l14_arena}/ootw_c14_arena.inc (100%) rename games/ootw/{ => ootw_c14}/ootw_c14.s (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/Makefile (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/above_pit.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_00.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_01.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_02.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_03.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_04.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_05.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_06.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_07.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_08.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_09.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_10.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_11.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_12.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_13.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_14.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_15.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_16.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_17.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_18.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_19.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_20.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_21.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_22.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_23.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_24.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_25.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_26.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_27.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_28.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_29.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_30.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_31.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_32.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_33.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_34.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_35.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bath_end.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/battle.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bigshot_01.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bigshot_02.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bigshot_03.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/bigshot_04.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/crash1.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/crash2.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/crash3.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/crash4.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/crash5.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/crash6.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/crash7.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall01.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall02.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall03.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall04.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall05.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall06.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall07.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall08.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall09.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall10.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall11.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall12.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall13.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall14.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall15.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall16.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall17.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall18.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall19.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall20.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall21.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall22.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall23.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/fall_bg.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/final.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/grabbed.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/lshot1.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/lshot2.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/lshot3.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/lshot4.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/lshot5.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/lshot6.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/ootw_c15_bath.inc (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/ootw_c15_bridge.inc (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/ootw_c15_fall.inc (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/ootw_c15_final.inc (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/ootw_c15_walk.inc (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/ootw_c15_walkway.inc (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_00.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_01.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_02.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_03.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_04.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_05.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_06.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_07.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_08.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_09.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walk_10.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walkway1.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walkway2.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walkway2_after.png (100%) rename games/ootw/{ootw_graphics/l15final => ootw_c15/graphics/l15_final}/walkway3.png (100%) rename games/ootw/{ => ootw_c15}/ootw_c15.s (100%) rename games/ootw/{ootw_graphics/l5cave => ootw_c5/graphics/l5_cave}/Makefile (100%) rename games/ootw/{ootw_graphics/l5cave => ootw_c5/graphics/l5_cave}/entrance_cave.png (100%) rename games/ootw/{ootw_graphics/l5cave => ootw_c5/graphics/l5_cave}/ootw_c5_cave.inc (100%) rename games/ootw/{ => ootw_c5}/ootw_c5.s (57%) rename games/ootw/{ => ootw_c5}/ootw_c5_cave.s (100%) rename games/ootw/{ootw_graphics/l6cave => ootw_c6/graphics/l6_cave}/Makefile (100%) rename games/ootw/{ootw_graphics/l6cave => ootw_c6/graphics/l6_cave}/cave.png (100%) rename games/ootw/{ootw_graphics/l6cave => ootw_c6/graphics/l6_cave}/ootw_c6_cave.inc (100%) rename games/ootw/{ => ootw_c6}/ootw_c6.s (100%) rename games/ootw/{ootw_graphics/l7cave => ootw_c7/graphics/l7_cave}/Makefile (100%) rename games/ootw/{ootw_graphics/l7cave => ootw_c7/graphics/l7_cave}/cave.png (100%) rename games/ootw/{ootw_graphics/l7cave => ootw_c7/graphics/l7_cave}/ootw_c7_cave.inc (100%) rename games/ootw/{ => ootw_c7}/ootw_c7.s (100%) rename games/ootw/{ootw_graphics/l8crawl => ootw_c8/graphics/l8_crawl}/Makefile (100%) rename games/ootw/{ootw_graphics/l8crawl => ootw_c8/graphics/l8_crawl}/entry.png (100%) rename games/ootw/{ootw_graphics/l8crawl => ootw_c8/graphics/l8_crawl}/ootw_c8_crawl.inc (100%) rename games/ootw/{ => ootw_c8}/ootw_c8.s (100%) rename games/ootw/{ootw_graphics/l9swim => ootw_c9/graphics/l9_swim}/Makefile (100%) rename games/ootw/{ootw_graphics/l9swim => ootw_c9/graphics/l9_swim}/ootw_c9_swim.inc (100%) rename games/ootw/{ootw_graphics/l9swim => ootw_c9/graphics/l9_swim}/pool.png (100%) rename games/ootw/{ => ootw_c9}/ootw_c9.s (100%) rename games/ootw/{ootw_graphics => }/sprites/alien.inc (100%) rename games/ootw/{ootw_graphics => }/sprites/another_sprites.png (100%) rename games/ootw/{ootw_graphics => }/sprites/beast.inc (100%) rename games/ootw/{ootw_graphics => }/sprites/friend.inc (100%) rename games/ootw/{ootw_graphics => }/sprites/l1_background.inc (100%) rename games/ootw/{ootw_graphics => }/sprites/physicist.inc (100%) rename games/ootw/{ootw_graphics => }/sprites/physicist_l1_swim.inc (100%) rename games/ootw/{ootw_graphics => }/sprites/physicist_rolling.inc (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/alien_shooting-20190718-170845.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/alien_takeoff-20190715-160513.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/alien_turning-20190718-150134.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/alien_walking-20190718-145743.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/alien_walking_gun-20190718-160427.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/alien_yelling-20190718-165913.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/beast-20190126-142310.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/friend_walking-20190719-162844.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/ootw_jumping-20190315-162115.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/ootw_running-20190309-163912.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/ootw_walking-20190309-154332.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/piskel/ootw_walking-20190310-011534.piskel (100%) rename games/ootw/{ootw_graphics => }/sprites/slugs.inc (100%) rename {games/ootw/ootw_graphics => utils/gr-utils}/Apple II Lores.gpl (100%) diff --git a/games/ootw/Makefile b/games/ootw/Makefile index 812b52b7..3093a51f 100644 --- a/games/ootw/Makefile +++ b/games/ootw/Makefile @@ -11,29 +11,28 @@ all: ootw.dsk ootw_side2.dsk ootw_side3.dsk ootw.dsk: HELLO TITLE \ ./intro/INTRO ./ootw_c1/OOTW_C1 ./ootw_c2/OOTW_C2 \ - ./ootw_c3/OOTW_C3 ./ootw_c4/OOTW_C4 OOTW_C5 + ./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 0x1700 ./intro/INTRO INTRO - $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c1/OOTW_C1 - $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c2/OOTW_C2 - $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c3/OOTW_C3 - $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c4/OOTW_C4 - $(DOS33) -y ootw.dsk BSAVE -a 0x1700 OOTW_C5 -# $(DOS33) -y ootw.dsk BSAVE -a 0x1700 AUDIO_TEST -# $(DOS33) -y ootw.dsk BSAVE -a 0x2000 COMPRESS-TEST + $(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 + $(DOS33) -y ootw.dsk BSAVE -a 0x1700 ./ootw_c3/OOTW_C3 OOTW_C3 + $(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_C6 OOTW_C7 OOTW_C8 OOTW_C9 OOTW_C10 + ./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 0x1700 OOTW_C6 - $(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 OOTW_C7 - $(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 OOTW_C8 - $(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 OOTW_C9 - $(DOS33) -y ootw_side2.dsk BSAVE -a 0x1700 OOTW_C10 + $(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 \ OOTW_C11 OOTW_C12 OOTW_C13 OOTW_C14 OOTW_C15 @@ -49,20 +48,6 @@ ootw_side3.dsk: HELLO TITLE ENDING \ #### -OOTW_C5: ootw_c5.o - ld65 -o OOTW_C5 ootw_c5.o -C ../../linker_scripts/apple2_1700.inc - -ootw_c5.o: ootw_c5.s \ - gr_copy.s gr_copy_offset.s gr_fast_clear.s gr_pageflip.s gr_unrle.s \ - gr_putsprite.s gr_putsprite_flipped.s gr_putsprite_crop.s \ - keyboard.s gr_run_sequence.s physicist.s ootw_c5_cave.s \ - collision.s door.s laser.s gun.s blast.s shield.s \ - ootw_graphics/sprites/physicist.inc \ - ootw_graphics/l5cave/ootw_c5_cave.inc - ca65 -o ootw_c5.o ootw_c5.s -l ootw_c5.lst - -### - OOTW_C6: ootw_c6.o ld65 -o OOTW_C6 ootw_c6.o -C ../../linker_scripts/apple2_1700.inc @@ -236,6 +221,40 @@ ootw_c3/OOTW_C3: ootw_c4/OOTW_C4: cd ootw_c4 && make +ootw_c5/OOTW_C5: + cd ootw_c5 && make + +ootw_c6/OOTW_C6: + cd ootw_c6 && make + +ootw_c7/OOTW_C7: + cd ootw_c7 && make + +ootw_c8/OOTW_C8: + cd ootw_c8 && make + +ootw_c9/OOTW_C9: + cd ootw_c9 && make + +ootw_c10/OOTW_C10: + cd ootw_c10 && make + +ootw_c11/OOTW_C11: + cd ootw_c11 && make + +ootw_c12/OOTW_C12: + cd ootw_c12 & make + +ootw_c13/OOTW_C13: + cd ootw_c13 && make + +ootw_c14/OOTW_C14: + cd ootw_c14 && make + +ootw_c15/OOTW_C15: + cd ootw_c15 && make + + #### LOADER: loader.o @@ -308,7 +327,6 @@ 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 \ + rm -f *~ *.o *.lst *.lz4 HELLO TITLE INTRO LOADER \ COMPRESS-TEST AUDIO_TEST diff --git a/games/ootw/ootw_graphics/l16end/Makefile b/games/ootw/ending/graphics/l16_end/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l16end/Makefile rename to games/ootw/ending/graphics/l16_end/Makefile diff --git a/games/ootw/ootw_graphics/l16end/flying01.png b/games/ootw/ending/graphics/l16_end/flying01.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/flying01.png rename to games/ootw/ending/graphics/l16_end/flying01.png diff --git a/games/ootw/ootw_graphics/l16end/flying03.png b/games/ootw/ending/graphics/l16_end/flying03.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/flying03.png rename to games/ootw/ending/graphics/l16_end/flying03.png diff --git a/games/ootw/ootw_graphics/l16end/flying05.png b/games/ootw/ending/graphics/l16_end/flying05.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/flying05.png rename to games/ootw/ending/graphics/l16_end/flying05.png diff --git a/games/ootw/ootw_graphics/l16end/flying07.png b/games/ootw/ending/graphics/l16_end/flying07.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/flying07.png rename to games/ootw/ending/graphics/l16_end/flying07.png diff --git a/games/ootw/ootw_graphics/l16end/flying09.png b/games/ootw/ending/graphics/l16_end/flying09.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/flying09.png rename to games/ootw/ending/graphics/l16_end/flying09.png diff --git a/games/ootw/ootw_graphics/l16end/flying11.png b/games/ootw/ending/graphics/l16_end/flying11.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/flying11.png rename to games/ootw/ending/graphics/l16_end/flying11.png diff --git a/games/ootw/ootw_graphics/l16end/left_unfurl1.png b/games/ootw/ending/graphics/l16_end/left_unfurl1.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/left_unfurl1.png rename to games/ootw/ending/graphics/l16_end/left_unfurl1.png diff --git a/games/ootw/ootw_graphics/l16end/left_unfurl2.png b/games/ootw/ending/graphics/l16_end/left_unfurl2.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/left_unfurl2.png rename to games/ootw/ending/graphics/l16_end/left_unfurl2.png diff --git a/games/ootw/ootw_graphics/l16end/onboard.png b/games/ootw/ending/graphics/l16_end/onboard.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/onboard.png rename to games/ootw/ending/graphics/l16_end/onboard.png diff --git a/games/ootw/ootw_graphics/l16end/ootw_c16_end.inc b/games/ootw/ending/graphics/l16_end/ootw_c16_end.inc similarity index 100% rename from games/ootw/ootw_graphics/l16end/ootw_c16_end.inc rename to games/ootw/ending/graphics/l16_end/ootw_c16_end.inc diff --git a/games/ootw/ootw_graphics/l16end/right_unfurl1.png b/games/ootw/ending/graphics/l16_end/right_unfurl1.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/right_unfurl1.png rename to games/ootw/ending/graphics/l16_end/right_unfurl1.png diff --git a/games/ootw/ootw_graphics/l16end/right_unfurl2.png b/games/ootw/ending/graphics/l16_end/right_unfurl2.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/right_unfurl2.png rename to games/ootw/ending/graphics/l16_end/right_unfurl2.png diff --git a/games/ootw/ootw_graphics/l16end/rooftop00.png b/games/ootw/ending/graphics/l16_end/rooftop00.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/rooftop00.png rename to games/ootw/ending/graphics/l16_end/rooftop00.png diff --git a/games/ootw/ootw_graphics/l16end/rooftop01.png b/games/ootw/ending/graphics/l16_end/rooftop01.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/rooftop01.png rename to games/ootw/ending/graphics/l16_end/rooftop01.png diff --git a/games/ootw/ootw_graphics/l16end/rooftop02.png b/games/ootw/ending/graphics/l16_end/rooftop02.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/rooftop02.png rename to games/ootw/ending/graphics/l16_end/rooftop02.png diff --git a/games/ootw/ootw_graphics/l16end/rooftop03.png b/games/ootw/ending/graphics/l16_end/rooftop03.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/rooftop03.png rename to games/ootw/ending/graphics/l16_end/rooftop03.png diff --git a/games/ootw/ootw_graphics/l16end/sky_bg.png b/games/ootw/ending/graphics/l16_end/sky_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/sky_bg.png rename to games/ootw/ending/graphics/l16_end/sky_bg.png diff --git a/games/ootw/ootw_graphics/l16end/the_end01.png b/games/ootw/ending/graphics/l16_end/the_end01.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end01.png rename to games/ootw/ending/graphics/l16_end/the_end01.png diff --git a/games/ootw/ootw_graphics/l16end/the_end02.png b/games/ootw/ending/graphics/l16_end/the_end02.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end02.png rename to games/ootw/ending/graphics/l16_end/the_end02.png diff --git a/games/ootw/ootw_graphics/l16end/the_end03.png b/games/ootw/ending/graphics/l16_end/the_end03.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end03.png rename to games/ootw/ending/graphics/l16_end/the_end03.png diff --git a/games/ootw/ootw_graphics/l16end/the_end04.png b/games/ootw/ending/graphics/l16_end/the_end04.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end04.png rename to games/ootw/ending/graphics/l16_end/the_end04.png diff --git a/games/ootw/ootw_graphics/l16end/the_end05.png b/games/ootw/ending/graphics/l16_end/the_end05.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end05.png rename to games/ootw/ending/graphics/l16_end/the_end05.png diff --git a/games/ootw/ootw_graphics/l16end/the_end06.png b/games/ootw/ending/graphics/l16_end/the_end06.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end06.png rename to games/ootw/ending/graphics/l16_end/the_end06.png diff --git a/games/ootw/ootw_graphics/l16end/the_end07.png b/games/ootw/ending/graphics/l16_end/the_end07.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end07.png rename to games/ootw/ending/graphics/l16_end/the_end07.png diff --git a/games/ootw/ootw_graphics/l16end/the_end08.png b/games/ootw/ending/graphics/l16_end/the_end08.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end08.png rename to games/ootw/ending/graphics/l16_end/the_end08.png diff --git a/games/ootw/ootw_graphics/l16end/the_end09.png b/games/ootw/ending/graphics/l16_end/the_end09.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end09.png rename to games/ootw/ending/graphics/l16_end/the_end09.png diff --git a/games/ootw/ootw_graphics/l16end/the_end10.png b/games/ootw/ending/graphics/l16_end/the_end10.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/the_end10.png rename to games/ootw/ending/graphics/l16_end/the_end10.png diff --git a/games/ootw/ootw_graphics/l16end/wing_bg.png b/games/ootw/ending/graphics/l16_end/wing_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l16end/wing_bg.png rename to games/ootw/ending/graphics/l16_end/wing_bg.png diff --git a/games/ootw/ootw_c1/Makefile b/games/ootw/ootw_c1/Makefile new file mode 100644 index 00000000..2835f8aa --- /dev/null +++ b/games/ootw/ootw_c1/Makefile @@ -0,0 +1,55 @@ +include ../../../Makefile.inc + +COMMON = .. +SPRITES = ../sprites +LINKER_SCRIPTS = ../../../linker_scripts + +all: OOTW_C1 + +#### + +OOTW_C1: ootw_c1.o + ld65 -o OOTW_C1 ootw_c1.o -C $(LINKER_SCRIPTS)/apple2_1700.inc + +ootw_c1.o: ootw_c1.s \ + $(COMMON)/gr_copy.s \ + $(COMMON)/gr_fast_clear.s \ + $(COMMON)/gr_pageflip.s \ + $(COMMON)/gr_unrle.s \ + $(COMMON)/gr_putsprite.s \ + $(COMMON)/gr_putsprite_flipped.s \ + $(COMMON)/gr_putsprite_crop.s \ + $(COMMON)/gr_hlin.s \ + $(COMMON)/gr_make_quake.s \ + $(COMMON)/gr_overlay.s \ + $(COMMON)/zp.inc \ + $(COMMON)/keyboard.s \ + $(COMMON)/collision.s \ + $(COMMON)/physicist.s \ + $(COMMON)/random16.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 \ + graphics/l1_pool/ootw_pool.inc \ + graphics/l1_underwater/ootw_underwater.inc \ + graphics/l1_caves/ootw_cavern.inc \ + graphics/l1_caves/ootw_cavern2.inc \ + graphics/l1_caves/ootw_cavern3.inc \ + graphics/l1_rope/ootw_rope.inc \ + graphics/l1_rope/ootw_swing.inc \ + graphics/l1_end/ootw_l1end.inc \ + $(SPRITES)/physicist.inc \ + $(SPRITES)/physicist_l1_swim.inc \ + $(SPRITES)/slugs.inc \ + $(SPRITES)/l1_background.inc \ + $(SPRITES)/beast.inc \ + graphics/l1_beast_end/ootw_beast_end.inc \ + graphics/l1_beast_intro/ootw_beast_intro.inc \ + graphics/l1_slug_end/ootw_slug_end.inc + ca65 -o ootw_c1.o ootw_c1.s -l ootw_c1.lst + + +##### + +clean: + rm -f *~ *.o *.lst *.lz4 OOTW_C1 diff --git a/games/ootw/ootw_c1/ootw_c1.s b/games/ootw/ootw_c1/ootw_c1.s index 0f0aa9ac..31ee45aa 100644 --- a/games/ootw/ootw_c1/ootw_c1.s +++ b/games/ootw/ootw_c1/ootw_c1.s @@ -162,11 +162,11 @@ end_message: .include "graphics/l1_rope/ootw_swing.inc" .include "graphics/l1_underwater/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 "../sprites/l1_background.inc" +.include "../sprites/physicist.inc" +.include "../sprites/physicist_l1_swim.inc" +.include "../sprites/slugs.inc" +.include "../sprites/beast.inc" ; cutscene data .include "graphics/l1_end/ootw_l1end.inc" .include "graphics/l1_beast_end/ootw_beast_end.inc" diff --git a/games/ootw/ootw_c10.s b/games/ootw/ootw_c10/ootw_c10.s similarity index 100% rename from games/ootw/ootw_c10.s rename to games/ootw/ootw_c10/ootw_c10.s diff --git a/games/ootw/ootw_graphics/l11above/Makefile b/games/ootw/ootw_c11/graphics/l11_above/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l11above/Makefile rename to games/ootw/ootw_c11/graphics/l11_above/Makefile diff --git a/games/ootw/ootw_graphics/l11above/above.png b/games/ootw/ootw_c11/graphics/l11_above/above.png similarity index 100% rename from games/ootw/ootw_graphics/l11above/above.png rename to games/ootw/ootw_c11/graphics/l11_above/above.png diff --git a/games/ootw/ootw_graphics/l11above/ootw_c11_room.inc b/games/ootw/ootw_c11/graphics/l11_above/ootw_c11_room.inc similarity index 100% rename from games/ootw/ootw_graphics/l11above/ootw_c11_room.inc rename to games/ootw/ootw_c11/graphics/l11_above/ootw_c11_room.inc diff --git a/games/ootw/ootw_c11.s b/games/ootw/ootw_c11/ootw_c11.s similarity index 100% rename from games/ootw/ootw_c11.s rename to games/ootw/ootw_c11/ootw_c11.s diff --git a/games/ootw/ootw_graphics/l12room/Makefile b/games/ootw/ootw_c12/graphics/l12_room/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l12room/Makefile rename to games/ootw/ootw_c12/graphics/l12_room/Makefile diff --git a/games/ootw/ootw_graphics/l12room/house.png b/games/ootw/ootw_c12/graphics/l12_room/house.png similarity index 100% rename from games/ootw/ootw_graphics/l12room/house.png rename to games/ootw/ootw_c12/graphics/l12_room/house.png diff --git a/games/ootw/ootw_graphics/l12room/ootw_c12_room.inc b/games/ootw/ootw_c12/graphics/l12_room/ootw_c12_room.inc similarity index 100% rename from games/ootw/ootw_graphics/l12room/ootw_c12_room.inc rename to games/ootw/ootw_c12/graphics/l12_room/ootw_c12_room.inc diff --git a/games/ootw/ootw_c12.s b/games/ootw/ootw_c12/ootw_c12.s similarity index 100% rename from games/ootw/ootw_c12.s rename to games/ootw/ootw_c12/ootw_c12.s diff --git a/games/ootw/ootw_graphics/l13room/Makefile b/games/ootw/ootw_c13/graphics/l13_room/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l13room/Makefile rename to games/ootw/ootw_c13/graphics/l13_room/Makefile diff --git a/games/ootw/ootw_graphics/l13room/entry.png b/games/ootw/ootw_c13/graphics/l13_room/entry.png similarity index 100% rename from games/ootw/ootw_graphics/l13room/entry.png rename to games/ootw/ootw_c13/graphics/l13_room/entry.png diff --git a/games/ootw/ootw_graphics/l13room/ootw_c13_room.inc b/games/ootw/ootw_c13/graphics/l13_room/ootw_c13_room.inc similarity index 100% rename from games/ootw/ootw_graphics/l13room/ootw_c13_room.inc rename to games/ootw/ootw_c13/graphics/l13_room/ootw_c13_room.inc diff --git a/games/ootw/ootw_c13.s b/games/ootw/ootw_c13/ootw_c13.s similarity index 100% rename from games/ootw/ootw_c13.s rename to games/ootw/ootw_c13/ootw_c13.s diff --git a/games/ootw/ootw_graphics/l14arena/Makefile b/games/ootw/ootw_c14/graphics/l14_arena/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l14arena/Makefile rename to games/ootw/ootw_c14/graphics/l14_arena/Makefile diff --git a/games/ootw/ootw_graphics/l14arena/arena.png b/games/ootw/ootw_c14/graphics/l14_arena/arena.png similarity index 100% rename from games/ootw/ootw_graphics/l14arena/arena.png rename to games/ootw/ootw_c14/graphics/l14_arena/arena.png diff --git a/games/ootw/ootw_graphics/l14arena/ootw_c14_arena.inc b/games/ootw/ootw_c14/graphics/l14_arena/ootw_c14_arena.inc similarity index 100% rename from games/ootw/ootw_graphics/l14arena/ootw_c14_arena.inc rename to games/ootw/ootw_c14/graphics/l14_arena/ootw_c14_arena.inc diff --git a/games/ootw/ootw_c14.s b/games/ootw/ootw_c14/ootw_c14.s similarity index 100% rename from games/ootw/ootw_c14.s rename to games/ootw/ootw_c14/ootw_c14.s diff --git a/games/ootw/ootw_graphics/l15final/Makefile b/games/ootw/ootw_c15/graphics/l15_final/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l15final/Makefile rename to games/ootw/ootw_c15/graphics/l15_final/Makefile diff --git a/games/ootw/ootw_graphics/l15final/above_pit.png b/games/ootw/ootw_c15/graphics/l15_final/above_pit.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/above_pit.png rename to games/ootw/ootw_c15/graphics/l15_final/above_pit.png diff --git a/games/ootw/ootw_graphics/l15final/bath.png b/games/ootw/ootw_c15/graphics/l15_final/bath.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath.png rename to games/ootw/ootw_c15/graphics/l15_final/bath.png diff --git a/games/ootw/ootw_graphics/l15final/bath_00.png b/games/ootw/ootw_c15/graphics/l15_final/bath_00.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_00.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_00.png diff --git a/games/ootw/ootw_graphics/l15final/bath_01.png b/games/ootw/ootw_c15/graphics/l15_final/bath_01.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_01.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_01.png diff --git a/games/ootw/ootw_graphics/l15final/bath_02.png b/games/ootw/ootw_c15/graphics/l15_final/bath_02.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_02.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_02.png diff --git a/games/ootw/ootw_graphics/l15final/bath_03.png b/games/ootw/ootw_c15/graphics/l15_final/bath_03.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_03.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_03.png diff --git a/games/ootw/ootw_graphics/l15final/bath_04.png b/games/ootw/ootw_c15/graphics/l15_final/bath_04.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_04.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_04.png diff --git a/games/ootw/ootw_graphics/l15final/bath_05.png b/games/ootw/ootw_c15/graphics/l15_final/bath_05.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_05.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_05.png diff --git a/games/ootw/ootw_graphics/l15final/bath_06.png b/games/ootw/ootw_c15/graphics/l15_final/bath_06.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_06.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_06.png diff --git a/games/ootw/ootw_graphics/l15final/bath_07.png b/games/ootw/ootw_c15/graphics/l15_final/bath_07.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_07.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_07.png diff --git a/games/ootw/ootw_graphics/l15final/bath_08.png b/games/ootw/ootw_c15/graphics/l15_final/bath_08.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_08.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_08.png diff --git a/games/ootw/ootw_graphics/l15final/bath_09.png b/games/ootw/ootw_c15/graphics/l15_final/bath_09.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_09.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_09.png diff --git a/games/ootw/ootw_graphics/l15final/bath_10.png b/games/ootw/ootw_c15/graphics/l15_final/bath_10.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_10.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_10.png diff --git a/games/ootw/ootw_graphics/l15final/bath_11.png b/games/ootw/ootw_c15/graphics/l15_final/bath_11.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_11.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_11.png diff --git a/games/ootw/ootw_graphics/l15final/bath_12.png b/games/ootw/ootw_c15/graphics/l15_final/bath_12.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_12.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_12.png diff --git a/games/ootw/ootw_graphics/l15final/bath_13.png b/games/ootw/ootw_c15/graphics/l15_final/bath_13.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_13.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_13.png diff --git a/games/ootw/ootw_graphics/l15final/bath_14.png b/games/ootw/ootw_c15/graphics/l15_final/bath_14.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_14.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_14.png diff --git a/games/ootw/ootw_graphics/l15final/bath_15.png b/games/ootw/ootw_c15/graphics/l15_final/bath_15.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_15.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_15.png diff --git a/games/ootw/ootw_graphics/l15final/bath_16.png b/games/ootw/ootw_c15/graphics/l15_final/bath_16.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_16.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_16.png diff --git a/games/ootw/ootw_graphics/l15final/bath_17.png b/games/ootw/ootw_c15/graphics/l15_final/bath_17.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_17.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_17.png diff --git a/games/ootw/ootw_graphics/l15final/bath_18.png b/games/ootw/ootw_c15/graphics/l15_final/bath_18.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_18.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_18.png diff --git a/games/ootw/ootw_graphics/l15final/bath_19.png b/games/ootw/ootw_c15/graphics/l15_final/bath_19.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_19.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_19.png diff --git a/games/ootw/ootw_graphics/l15final/bath_20.png b/games/ootw/ootw_c15/graphics/l15_final/bath_20.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_20.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_20.png diff --git a/games/ootw/ootw_graphics/l15final/bath_21.png b/games/ootw/ootw_c15/graphics/l15_final/bath_21.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_21.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_21.png diff --git a/games/ootw/ootw_graphics/l15final/bath_22.png b/games/ootw/ootw_c15/graphics/l15_final/bath_22.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_22.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_22.png diff --git a/games/ootw/ootw_graphics/l15final/bath_23.png b/games/ootw/ootw_c15/graphics/l15_final/bath_23.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_23.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_23.png diff --git a/games/ootw/ootw_graphics/l15final/bath_24.png b/games/ootw/ootw_c15/graphics/l15_final/bath_24.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_24.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_24.png diff --git a/games/ootw/ootw_graphics/l15final/bath_25.png b/games/ootw/ootw_c15/graphics/l15_final/bath_25.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_25.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_25.png diff --git a/games/ootw/ootw_graphics/l15final/bath_26.png b/games/ootw/ootw_c15/graphics/l15_final/bath_26.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_26.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_26.png diff --git a/games/ootw/ootw_graphics/l15final/bath_27.png b/games/ootw/ootw_c15/graphics/l15_final/bath_27.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_27.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_27.png diff --git a/games/ootw/ootw_graphics/l15final/bath_28.png b/games/ootw/ootw_c15/graphics/l15_final/bath_28.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_28.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_28.png diff --git a/games/ootw/ootw_graphics/l15final/bath_29.png b/games/ootw/ootw_c15/graphics/l15_final/bath_29.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_29.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_29.png diff --git a/games/ootw/ootw_graphics/l15final/bath_30.png b/games/ootw/ootw_c15/graphics/l15_final/bath_30.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_30.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_30.png diff --git a/games/ootw/ootw_graphics/l15final/bath_31.png b/games/ootw/ootw_c15/graphics/l15_final/bath_31.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_31.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_31.png diff --git a/games/ootw/ootw_graphics/l15final/bath_32.png b/games/ootw/ootw_c15/graphics/l15_final/bath_32.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_32.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_32.png diff --git a/games/ootw/ootw_graphics/l15final/bath_33.png b/games/ootw/ootw_c15/graphics/l15_final/bath_33.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_33.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_33.png diff --git a/games/ootw/ootw_graphics/l15final/bath_34.png b/games/ootw/ootw_c15/graphics/l15_final/bath_34.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_34.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_34.png diff --git a/games/ootw/ootw_graphics/l15final/bath_35.png b/games/ootw/ootw_c15/graphics/l15_final/bath_35.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_35.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_35.png diff --git a/games/ootw/ootw_graphics/l15final/bath_end.png b/games/ootw/ootw_c15/graphics/l15_final/bath_end.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bath_end.png rename to games/ootw/ootw_c15/graphics/l15_final/bath_end.png diff --git a/games/ootw/ootw_graphics/l15final/battle.png b/games/ootw/ootw_c15/graphics/l15_final/battle.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/battle.png rename to games/ootw/ootw_c15/graphics/l15_final/battle.png diff --git a/games/ootw/ootw_graphics/l15final/bigshot_01.png b/games/ootw/ootw_c15/graphics/l15_final/bigshot_01.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bigshot_01.png rename to games/ootw/ootw_c15/graphics/l15_final/bigshot_01.png diff --git a/games/ootw/ootw_graphics/l15final/bigshot_02.png b/games/ootw/ootw_c15/graphics/l15_final/bigshot_02.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bigshot_02.png rename to games/ootw/ootw_c15/graphics/l15_final/bigshot_02.png diff --git a/games/ootw/ootw_graphics/l15final/bigshot_03.png b/games/ootw/ootw_c15/graphics/l15_final/bigshot_03.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bigshot_03.png rename to games/ootw/ootw_c15/graphics/l15_final/bigshot_03.png diff --git a/games/ootw/ootw_graphics/l15final/bigshot_04.png b/games/ootw/ootw_c15/graphics/l15_final/bigshot_04.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/bigshot_04.png rename to games/ootw/ootw_c15/graphics/l15_final/bigshot_04.png diff --git a/games/ootw/ootw_graphics/l15final/crash1.png b/games/ootw/ootw_c15/graphics/l15_final/crash1.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/crash1.png rename to games/ootw/ootw_c15/graphics/l15_final/crash1.png diff --git a/games/ootw/ootw_graphics/l15final/crash2.png b/games/ootw/ootw_c15/graphics/l15_final/crash2.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/crash2.png rename to games/ootw/ootw_c15/graphics/l15_final/crash2.png diff --git a/games/ootw/ootw_graphics/l15final/crash3.png b/games/ootw/ootw_c15/graphics/l15_final/crash3.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/crash3.png rename to games/ootw/ootw_c15/graphics/l15_final/crash3.png diff --git a/games/ootw/ootw_graphics/l15final/crash4.png b/games/ootw/ootw_c15/graphics/l15_final/crash4.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/crash4.png rename to games/ootw/ootw_c15/graphics/l15_final/crash4.png diff --git a/games/ootw/ootw_graphics/l15final/crash5.png b/games/ootw/ootw_c15/graphics/l15_final/crash5.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/crash5.png rename to games/ootw/ootw_c15/graphics/l15_final/crash5.png diff --git a/games/ootw/ootw_graphics/l15final/crash6.png b/games/ootw/ootw_c15/graphics/l15_final/crash6.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/crash6.png rename to games/ootw/ootw_c15/graphics/l15_final/crash6.png diff --git a/games/ootw/ootw_graphics/l15final/crash7.png b/games/ootw/ootw_c15/graphics/l15_final/crash7.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/crash7.png rename to games/ootw/ootw_c15/graphics/l15_final/crash7.png diff --git a/games/ootw/ootw_graphics/l15final/fall01.png b/games/ootw/ootw_c15/graphics/l15_final/fall01.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall01.png rename to games/ootw/ootw_c15/graphics/l15_final/fall01.png diff --git a/games/ootw/ootw_graphics/l15final/fall02.png b/games/ootw/ootw_c15/graphics/l15_final/fall02.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall02.png rename to games/ootw/ootw_c15/graphics/l15_final/fall02.png diff --git a/games/ootw/ootw_graphics/l15final/fall03.png b/games/ootw/ootw_c15/graphics/l15_final/fall03.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall03.png rename to games/ootw/ootw_c15/graphics/l15_final/fall03.png diff --git a/games/ootw/ootw_graphics/l15final/fall04.png b/games/ootw/ootw_c15/graphics/l15_final/fall04.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall04.png rename to games/ootw/ootw_c15/graphics/l15_final/fall04.png diff --git a/games/ootw/ootw_graphics/l15final/fall05.png b/games/ootw/ootw_c15/graphics/l15_final/fall05.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall05.png rename to games/ootw/ootw_c15/graphics/l15_final/fall05.png diff --git a/games/ootw/ootw_graphics/l15final/fall06.png b/games/ootw/ootw_c15/graphics/l15_final/fall06.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall06.png rename to games/ootw/ootw_c15/graphics/l15_final/fall06.png diff --git a/games/ootw/ootw_graphics/l15final/fall07.png b/games/ootw/ootw_c15/graphics/l15_final/fall07.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall07.png rename to games/ootw/ootw_c15/graphics/l15_final/fall07.png diff --git a/games/ootw/ootw_graphics/l15final/fall08.png b/games/ootw/ootw_c15/graphics/l15_final/fall08.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall08.png rename to games/ootw/ootw_c15/graphics/l15_final/fall08.png diff --git a/games/ootw/ootw_graphics/l15final/fall09.png b/games/ootw/ootw_c15/graphics/l15_final/fall09.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall09.png rename to games/ootw/ootw_c15/graphics/l15_final/fall09.png diff --git a/games/ootw/ootw_graphics/l15final/fall10.png b/games/ootw/ootw_c15/graphics/l15_final/fall10.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall10.png rename to games/ootw/ootw_c15/graphics/l15_final/fall10.png diff --git a/games/ootw/ootw_graphics/l15final/fall11.png b/games/ootw/ootw_c15/graphics/l15_final/fall11.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall11.png rename to games/ootw/ootw_c15/graphics/l15_final/fall11.png diff --git a/games/ootw/ootw_graphics/l15final/fall12.png b/games/ootw/ootw_c15/graphics/l15_final/fall12.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall12.png rename to games/ootw/ootw_c15/graphics/l15_final/fall12.png diff --git a/games/ootw/ootw_graphics/l15final/fall13.png b/games/ootw/ootw_c15/graphics/l15_final/fall13.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall13.png rename to games/ootw/ootw_c15/graphics/l15_final/fall13.png diff --git a/games/ootw/ootw_graphics/l15final/fall14.png b/games/ootw/ootw_c15/graphics/l15_final/fall14.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall14.png rename to games/ootw/ootw_c15/graphics/l15_final/fall14.png diff --git a/games/ootw/ootw_graphics/l15final/fall15.png b/games/ootw/ootw_c15/graphics/l15_final/fall15.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall15.png rename to games/ootw/ootw_c15/graphics/l15_final/fall15.png diff --git a/games/ootw/ootw_graphics/l15final/fall16.png b/games/ootw/ootw_c15/graphics/l15_final/fall16.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall16.png rename to games/ootw/ootw_c15/graphics/l15_final/fall16.png diff --git a/games/ootw/ootw_graphics/l15final/fall17.png b/games/ootw/ootw_c15/graphics/l15_final/fall17.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall17.png rename to games/ootw/ootw_c15/graphics/l15_final/fall17.png diff --git a/games/ootw/ootw_graphics/l15final/fall18.png b/games/ootw/ootw_c15/graphics/l15_final/fall18.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall18.png rename to games/ootw/ootw_c15/graphics/l15_final/fall18.png diff --git a/games/ootw/ootw_graphics/l15final/fall19.png b/games/ootw/ootw_c15/graphics/l15_final/fall19.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall19.png rename to games/ootw/ootw_c15/graphics/l15_final/fall19.png diff --git a/games/ootw/ootw_graphics/l15final/fall20.png b/games/ootw/ootw_c15/graphics/l15_final/fall20.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall20.png rename to games/ootw/ootw_c15/graphics/l15_final/fall20.png diff --git a/games/ootw/ootw_graphics/l15final/fall21.png b/games/ootw/ootw_c15/graphics/l15_final/fall21.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall21.png rename to games/ootw/ootw_c15/graphics/l15_final/fall21.png diff --git a/games/ootw/ootw_graphics/l15final/fall22.png b/games/ootw/ootw_c15/graphics/l15_final/fall22.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall22.png rename to games/ootw/ootw_c15/graphics/l15_final/fall22.png diff --git a/games/ootw/ootw_graphics/l15final/fall23.png b/games/ootw/ootw_c15/graphics/l15_final/fall23.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall23.png rename to games/ootw/ootw_c15/graphics/l15_final/fall23.png diff --git a/games/ootw/ootw_graphics/l15final/fall_bg.png b/games/ootw/ootw_c15/graphics/l15_final/fall_bg.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/fall_bg.png rename to games/ootw/ootw_c15/graphics/l15_final/fall_bg.png diff --git a/games/ootw/ootw_graphics/l15final/final.png b/games/ootw/ootw_c15/graphics/l15_final/final.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/final.png rename to games/ootw/ootw_c15/graphics/l15_final/final.png diff --git a/games/ootw/ootw_graphics/l15final/grabbed.png b/games/ootw/ootw_c15/graphics/l15_final/grabbed.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/grabbed.png rename to games/ootw/ootw_c15/graphics/l15_final/grabbed.png diff --git a/games/ootw/ootw_graphics/l15final/lshot1.png b/games/ootw/ootw_c15/graphics/l15_final/lshot1.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/lshot1.png rename to games/ootw/ootw_c15/graphics/l15_final/lshot1.png diff --git a/games/ootw/ootw_graphics/l15final/lshot2.png b/games/ootw/ootw_c15/graphics/l15_final/lshot2.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/lshot2.png rename to games/ootw/ootw_c15/graphics/l15_final/lshot2.png diff --git a/games/ootw/ootw_graphics/l15final/lshot3.png b/games/ootw/ootw_c15/graphics/l15_final/lshot3.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/lshot3.png rename to games/ootw/ootw_c15/graphics/l15_final/lshot3.png diff --git a/games/ootw/ootw_graphics/l15final/lshot4.png b/games/ootw/ootw_c15/graphics/l15_final/lshot4.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/lshot4.png rename to games/ootw/ootw_c15/graphics/l15_final/lshot4.png diff --git a/games/ootw/ootw_graphics/l15final/lshot5.png b/games/ootw/ootw_c15/graphics/l15_final/lshot5.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/lshot5.png rename to games/ootw/ootw_c15/graphics/l15_final/lshot5.png diff --git a/games/ootw/ootw_graphics/l15final/lshot6.png b/games/ootw/ootw_c15/graphics/l15_final/lshot6.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/lshot6.png rename to games/ootw/ootw_c15/graphics/l15_final/lshot6.png diff --git a/games/ootw/ootw_graphics/l15final/ootw_c15_bath.inc b/games/ootw/ootw_c15/graphics/l15_final/ootw_c15_bath.inc similarity index 100% rename from games/ootw/ootw_graphics/l15final/ootw_c15_bath.inc rename to games/ootw/ootw_c15/graphics/l15_final/ootw_c15_bath.inc diff --git a/games/ootw/ootw_graphics/l15final/ootw_c15_bridge.inc b/games/ootw/ootw_c15/graphics/l15_final/ootw_c15_bridge.inc similarity index 100% rename from games/ootw/ootw_graphics/l15final/ootw_c15_bridge.inc rename to games/ootw/ootw_c15/graphics/l15_final/ootw_c15_bridge.inc diff --git a/games/ootw/ootw_graphics/l15final/ootw_c15_fall.inc b/games/ootw/ootw_c15/graphics/l15_final/ootw_c15_fall.inc similarity index 100% rename from games/ootw/ootw_graphics/l15final/ootw_c15_fall.inc rename to games/ootw/ootw_c15/graphics/l15_final/ootw_c15_fall.inc diff --git a/games/ootw/ootw_graphics/l15final/ootw_c15_final.inc b/games/ootw/ootw_c15/graphics/l15_final/ootw_c15_final.inc similarity index 100% rename from games/ootw/ootw_graphics/l15final/ootw_c15_final.inc rename to games/ootw/ootw_c15/graphics/l15_final/ootw_c15_final.inc diff --git a/games/ootw/ootw_graphics/l15final/ootw_c15_walk.inc b/games/ootw/ootw_c15/graphics/l15_final/ootw_c15_walk.inc similarity index 100% rename from games/ootw/ootw_graphics/l15final/ootw_c15_walk.inc rename to games/ootw/ootw_c15/graphics/l15_final/ootw_c15_walk.inc diff --git a/games/ootw/ootw_graphics/l15final/ootw_c15_walkway.inc b/games/ootw/ootw_c15/graphics/l15_final/ootw_c15_walkway.inc similarity index 100% rename from games/ootw/ootw_graphics/l15final/ootw_c15_walkway.inc rename to games/ootw/ootw_c15/graphics/l15_final/ootw_c15_walkway.inc diff --git a/games/ootw/ootw_graphics/l15final/walk_00.png b/games/ootw/ootw_c15/graphics/l15_final/walk_00.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_00.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_00.png diff --git a/games/ootw/ootw_graphics/l15final/walk_01.png b/games/ootw/ootw_c15/graphics/l15_final/walk_01.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_01.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_01.png diff --git a/games/ootw/ootw_graphics/l15final/walk_02.png b/games/ootw/ootw_c15/graphics/l15_final/walk_02.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_02.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_02.png diff --git a/games/ootw/ootw_graphics/l15final/walk_03.png b/games/ootw/ootw_c15/graphics/l15_final/walk_03.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_03.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_03.png diff --git a/games/ootw/ootw_graphics/l15final/walk_04.png b/games/ootw/ootw_c15/graphics/l15_final/walk_04.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_04.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_04.png diff --git a/games/ootw/ootw_graphics/l15final/walk_05.png b/games/ootw/ootw_c15/graphics/l15_final/walk_05.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_05.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_05.png diff --git a/games/ootw/ootw_graphics/l15final/walk_06.png b/games/ootw/ootw_c15/graphics/l15_final/walk_06.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_06.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_06.png diff --git a/games/ootw/ootw_graphics/l15final/walk_07.png b/games/ootw/ootw_c15/graphics/l15_final/walk_07.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_07.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_07.png diff --git a/games/ootw/ootw_graphics/l15final/walk_08.png b/games/ootw/ootw_c15/graphics/l15_final/walk_08.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_08.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_08.png diff --git a/games/ootw/ootw_graphics/l15final/walk_09.png b/games/ootw/ootw_c15/graphics/l15_final/walk_09.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_09.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_09.png diff --git a/games/ootw/ootw_graphics/l15final/walk_10.png b/games/ootw/ootw_c15/graphics/l15_final/walk_10.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walk_10.png rename to games/ootw/ootw_c15/graphics/l15_final/walk_10.png diff --git a/games/ootw/ootw_graphics/l15final/walkway1.png b/games/ootw/ootw_c15/graphics/l15_final/walkway1.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walkway1.png rename to games/ootw/ootw_c15/graphics/l15_final/walkway1.png diff --git a/games/ootw/ootw_graphics/l15final/walkway2.png b/games/ootw/ootw_c15/graphics/l15_final/walkway2.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walkway2.png rename to games/ootw/ootw_c15/graphics/l15_final/walkway2.png diff --git a/games/ootw/ootw_graphics/l15final/walkway2_after.png b/games/ootw/ootw_c15/graphics/l15_final/walkway2_after.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walkway2_after.png rename to games/ootw/ootw_c15/graphics/l15_final/walkway2_after.png diff --git a/games/ootw/ootw_graphics/l15final/walkway3.png b/games/ootw/ootw_c15/graphics/l15_final/walkway3.png similarity index 100% rename from games/ootw/ootw_graphics/l15final/walkway3.png rename to games/ootw/ootw_c15/graphics/l15_final/walkway3.png diff --git a/games/ootw/ootw_c15.s b/games/ootw/ootw_c15/ootw_c15.s similarity index 100% rename from games/ootw/ootw_c15.s rename to games/ootw/ootw_c15/ootw_c15.s diff --git a/games/ootw/ootw_c2/ootw_c2.s b/games/ootw/ootw_c2/ootw_c2.s index 1ca6f5a1..7cde1b0b 100644 --- a/games/ootw/ootw_c2/ootw_c2.s +++ b/games/ootw/ootw_c2/ootw_c2.s @@ -147,9 +147,9 @@ end_message: .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 "../sprites/physicist.inc" +.include "../sprites/alien.inc" +.include "../sprites/friend.inc" ; intro .include "graphics/l2_intro/ootw_l2intro.inc" ; city movie diff --git a/games/ootw/ootw_c3/Makefile b/games/ootw/ootw_c3/Makefile index be88d883..f05b2e7e 100644 --- a/games/ootw/ootw_c3/Makefile +++ b/games/ootw/ootw_c3/Makefile @@ -1,7 +1,7 @@ include ../../../Makefile.inc COMMON = .. -SPRITES = ../ootw_graphics/sprites +SPRITES = ../sprites LINKER_SCRIPTS = ../../../linker_scripts all: OOTW_C3 diff --git a/games/ootw/ootw_c3/ootw_c3.s b/games/ootw/ootw_c3/ootw_c3.s index 80a46ccd..93d7d203 100644 --- a/games/ootw/ootw_c3/ootw_c3.s +++ b/games/ootw/ootw_c3/ootw_c3.s @@ -94,5 +94,5 @@ end_message: ; room backgrounds .include "graphics/l3_vent/ootw_c3_vent.inc" ; sprites -.include "../ootw_graphics/sprites/physicist_rolling.inc" +.include "../sprites/physicist_rolling.inc" diff --git a/games/ootw/ootw_c4/Makefile b/games/ootw/ootw_c4/Makefile index bfefc52a..88f3aede 100644 --- a/games/ootw/ootw_c4/Makefile +++ b/games/ootw/ootw_c4/Makefile @@ -2,7 +2,7 @@ include ../../../Makefile.inc COMMON = .. LINKER_SCRIPTS = ../../../linker_scripts -SPRITES = ../ootw_graphics/sprites +SPRITES = ../sprites all: OOTW_C4 diff --git a/games/ootw/ootw_c4/ootw_c4.s b/games/ootw/ootw_c4/ootw_c4.s index 6b3cc207..d0cf3907 100644 --- a/games/ootw/ootw_c4/ootw_c4.s +++ b/games/ootw/ootw_c4/ootw_c4.s @@ -116,7 +116,5 @@ end_message: ; room backgrounds .include "graphics/l4_city/ootw_c4_city.inc" ; sprites -.include "../ootw_graphics/sprites/physicist.inc" -.include "../ootw_graphics/sprites/alien.inc" - - +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_graphics/l5cave/Makefile b/games/ootw/ootw_c5/graphics/l5_cave/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l5cave/Makefile rename to games/ootw/ootw_c5/graphics/l5_cave/Makefile diff --git a/games/ootw/ootw_graphics/l5cave/entrance_cave.png b/games/ootw/ootw_c5/graphics/l5_cave/entrance_cave.png similarity index 100% rename from games/ootw/ootw_graphics/l5cave/entrance_cave.png rename to games/ootw/ootw_c5/graphics/l5_cave/entrance_cave.png diff --git a/games/ootw/ootw_graphics/l5cave/ootw_c5_cave.inc b/games/ootw/ootw_c5/graphics/l5_cave/ootw_c5_cave.inc similarity index 100% rename from games/ootw/ootw_graphics/l5cave/ootw_c5_cave.inc rename to games/ootw/ootw_c5/graphics/l5_cave/ootw_c5_cave.inc diff --git a/games/ootw/ootw_c5.s b/games/ootw/ootw_c5/ootw_c5.s similarity index 57% rename from games/ootw/ootw_c5.s rename to games/ootw/ootw_c5/ootw_c5.s index 04994256..10b684fd 100644 --- a/games/ootw/ootw_c5.s +++ b/games/ootw/ootw_c5/ootw_c5.s @@ -3,8 +3,8 @@ ; by Vince "Deater" Weaver -.include "zp.inc" -.include "hardware.inc" +.include "../zp.inc" +.include "../hardware.inc" ootw_c5: @@ -80,40 +80,35 @@ end_message: .byte 11,20,"ACCESS CODE: CAVE",0 .include "ootw_c5_cave.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_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_hlin.s" +.include "../keyboard.s" -.include "physicist.s" -.include "alien.s" -.include "dummy_friend.s" +.include "../physicist.s" +.include "../alien.s" +.include "../dummy_friend.s" -.include "gun.s" -.include "laser.s" -.include "alien_laser.s" -.include "blast.s" -.include "shield.s" +.include "../gun.s" +.include "../laser.s" +.include "../alien_laser.s" +.include "../blast.s" +.include "../shield.s" -.include "door.s" -.include "collision.s" +.include "../door.s" +.include "../collision.s" ; room backgrounds -.include "ootw_graphics/l5cave/ootw_c5_cave.inc" +.include "graphics/l5_cave/ootw_c5_cave.inc" ; sprites -.include "ootw_graphics/sprites/physicist.inc" -.include "ootw_graphics/sprites/alien.inc" - - - -; "NOW GO BACK TO ANOTHER EARTH" +.include "../sprites/physicist.inc" +.include "../sprites/alien.inc" diff --git a/games/ootw/ootw_c5_cave.s b/games/ootw/ootw_c5/ootw_c5_cave.s similarity index 100% rename from games/ootw/ootw_c5_cave.s rename to games/ootw/ootw_c5/ootw_c5_cave.s diff --git a/games/ootw/ootw_graphics/l6cave/Makefile b/games/ootw/ootw_c6/graphics/l6_cave/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l6cave/Makefile rename to games/ootw/ootw_c6/graphics/l6_cave/Makefile diff --git a/games/ootw/ootw_graphics/l6cave/cave.png b/games/ootw/ootw_c6/graphics/l6_cave/cave.png similarity index 100% rename from games/ootw/ootw_graphics/l6cave/cave.png rename to games/ootw/ootw_c6/graphics/l6_cave/cave.png diff --git a/games/ootw/ootw_graphics/l6cave/ootw_c6_cave.inc b/games/ootw/ootw_c6/graphics/l6_cave/ootw_c6_cave.inc similarity index 100% rename from games/ootw/ootw_graphics/l6cave/ootw_c6_cave.inc rename to games/ootw/ootw_c6/graphics/l6_cave/ootw_c6_cave.inc diff --git a/games/ootw/ootw_c6.s b/games/ootw/ootw_c6/ootw_c6.s similarity index 100% rename from games/ootw/ootw_c6.s rename to games/ootw/ootw_c6/ootw_c6.s diff --git a/games/ootw/ootw_graphics/l7cave/Makefile b/games/ootw/ootw_c7/graphics/l7_cave/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l7cave/Makefile rename to games/ootw/ootw_c7/graphics/l7_cave/Makefile diff --git a/games/ootw/ootw_graphics/l7cave/cave.png b/games/ootw/ootw_c7/graphics/l7_cave/cave.png similarity index 100% rename from games/ootw/ootw_graphics/l7cave/cave.png rename to games/ootw/ootw_c7/graphics/l7_cave/cave.png diff --git a/games/ootw/ootw_graphics/l7cave/ootw_c7_cave.inc b/games/ootw/ootw_c7/graphics/l7_cave/ootw_c7_cave.inc similarity index 100% rename from games/ootw/ootw_graphics/l7cave/ootw_c7_cave.inc rename to games/ootw/ootw_c7/graphics/l7_cave/ootw_c7_cave.inc diff --git a/games/ootw/ootw_c7.s b/games/ootw/ootw_c7/ootw_c7.s similarity index 100% rename from games/ootw/ootw_c7.s rename to games/ootw/ootw_c7/ootw_c7.s diff --git a/games/ootw/ootw_graphics/l8crawl/Makefile b/games/ootw/ootw_c8/graphics/l8_crawl/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l8crawl/Makefile rename to games/ootw/ootw_c8/graphics/l8_crawl/Makefile diff --git a/games/ootw/ootw_graphics/l8crawl/entry.png b/games/ootw/ootw_c8/graphics/l8_crawl/entry.png similarity index 100% rename from games/ootw/ootw_graphics/l8crawl/entry.png rename to games/ootw/ootw_c8/graphics/l8_crawl/entry.png diff --git a/games/ootw/ootw_graphics/l8crawl/ootw_c8_crawl.inc b/games/ootw/ootw_c8/graphics/l8_crawl/ootw_c8_crawl.inc similarity index 100% rename from games/ootw/ootw_graphics/l8crawl/ootw_c8_crawl.inc rename to games/ootw/ootw_c8/graphics/l8_crawl/ootw_c8_crawl.inc diff --git a/games/ootw/ootw_c8.s b/games/ootw/ootw_c8/ootw_c8.s similarity index 100% rename from games/ootw/ootw_c8.s rename to games/ootw/ootw_c8/ootw_c8.s diff --git a/games/ootw/ootw_graphics/l9swim/Makefile b/games/ootw/ootw_c9/graphics/l9_swim/Makefile similarity index 100% rename from games/ootw/ootw_graphics/l9swim/Makefile rename to games/ootw/ootw_c9/graphics/l9_swim/Makefile diff --git a/games/ootw/ootw_graphics/l9swim/ootw_c9_swim.inc b/games/ootw/ootw_c9/graphics/l9_swim/ootw_c9_swim.inc similarity index 100% rename from games/ootw/ootw_graphics/l9swim/ootw_c9_swim.inc rename to games/ootw/ootw_c9/graphics/l9_swim/ootw_c9_swim.inc diff --git a/games/ootw/ootw_graphics/l9swim/pool.png b/games/ootw/ootw_c9/graphics/l9_swim/pool.png similarity index 100% rename from games/ootw/ootw_graphics/l9swim/pool.png rename to games/ootw/ootw_c9/graphics/l9_swim/pool.png diff --git a/games/ootw/ootw_c9.s b/games/ootw/ootw_c9/ootw_c9.s similarity index 100% rename from games/ootw/ootw_c9.s rename to games/ootw/ootw_c9/ootw_c9.s diff --git a/games/ootw/ootw_graphics/sprites/alien.inc b/games/ootw/sprites/alien.inc similarity index 100% rename from games/ootw/ootw_graphics/sprites/alien.inc rename to games/ootw/sprites/alien.inc diff --git a/games/ootw/ootw_graphics/sprites/another_sprites.png b/games/ootw/sprites/another_sprites.png similarity index 100% rename from games/ootw/ootw_graphics/sprites/another_sprites.png rename to games/ootw/sprites/another_sprites.png diff --git a/games/ootw/ootw_graphics/sprites/beast.inc b/games/ootw/sprites/beast.inc similarity index 100% rename from games/ootw/ootw_graphics/sprites/beast.inc rename to games/ootw/sprites/beast.inc diff --git a/games/ootw/ootw_graphics/sprites/friend.inc b/games/ootw/sprites/friend.inc similarity index 100% rename from games/ootw/ootw_graphics/sprites/friend.inc rename to games/ootw/sprites/friend.inc diff --git a/games/ootw/ootw_graphics/sprites/l1_background.inc b/games/ootw/sprites/l1_background.inc similarity index 100% rename from games/ootw/ootw_graphics/sprites/l1_background.inc rename to games/ootw/sprites/l1_background.inc diff --git a/games/ootw/ootw_graphics/sprites/physicist.inc b/games/ootw/sprites/physicist.inc similarity index 100% rename from games/ootw/ootw_graphics/sprites/physicist.inc rename to games/ootw/sprites/physicist.inc diff --git a/games/ootw/ootw_graphics/sprites/physicist_l1_swim.inc b/games/ootw/sprites/physicist_l1_swim.inc similarity index 100% rename from games/ootw/ootw_graphics/sprites/physicist_l1_swim.inc rename to games/ootw/sprites/physicist_l1_swim.inc diff --git a/games/ootw/ootw_graphics/sprites/physicist_rolling.inc b/games/ootw/sprites/physicist_rolling.inc similarity index 100% rename from games/ootw/ootw_graphics/sprites/physicist_rolling.inc rename to games/ootw/sprites/physicist_rolling.inc diff --git a/games/ootw/ootw_graphics/sprites/piskel/alien_shooting-20190718-170845.piskel b/games/ootw/sprites/piskel/alien_shooting-20190718-170845.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/alien_shooting-20190718-170845.piskel rename to games/ootw/sprites/piskel/alien_shooting-20190718-170845.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/alien_takeoff-20190715-160513.piskel b/games/ootw/sprites/piskel/alien_takeoff-20190715-160513.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/alien_takeoff-20190715-160513.piskel rename to games/ootw/sprites/piskel/alien_takeoff-20190715-160513.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/alien_turning-20190718-150134.piskel b/games/ootw/sprites/piskel/alien_turning-20190718-150134.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/alien_turning-20190718-150134.piskel rename to games/ootw/sprites/piskel/alien_turning-20190718-150134.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/alien_walking-20190718-145743.piskel b/games/ootw/sprites/piskel/alien_walking-20190718-145743.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/alien_walking-20190718-145743.piskel rename to games/ootw/sprites/piskel/alien_walking-20190718-145743.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/alien_walking_gun-20190718-160427.piskel b/games/ootw/sprites/piskel/alien_walking_gun-20190718-160427.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/alien_walking_gun-20190718-160427.piskel rename to games/ootw/sprites/piskel/alien_walking_gun-20190718-160427.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/alien_yelling-20190718-165913.piskel b/games/ootw/sprites/piskel/alien_yelling-20190718-165913.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/alien_yelling-20190718-165913.piskel rename to games/ootw/sprites/piskel/alien_yelling-20190718-165913.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/beast-20190126-142310.piskel b/games/ootw/sprites/piskel/beast-20190126-142310.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/beast-20190126-142310.piskel rename to games/ootw/sprites/piskel/beast-20190126-142310.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/friend_walking-20190719-162844.piskel b/games/ootw/sprites/piskel/friend_walking-20190719-162844.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/friend_walking-20190719-162844.piskel rename to games/ootw/sprites/piskel/friend_walking-20190719-162844.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/ootw_jumping-20190315-162115.piskel b/games/ootw/sprites/piskel/ootw_jumping-20190315-162115.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/ootw_jumping-20190315-162115.piskel rename to games/ootw/sprites/piskel/ootw_jumping-20190315-162115.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/ootw_running-20190309-163912.piskel b/games/ootw/sprites/piskel/ootw_running-20190309-163912.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/ootw_running-20190309-163912.piskel rename to games/ootw/sprites/piskel/ootw_running-20190309-163912.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/ootw_walking-20190309-154332.piskel b/games/ootw/sprites/piskel/ootw_walking-20190309-154332.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/ootw_walking-20190309-154332.piskel rename to games/ootw/sprites/piskel/ootw_walking-20190309-154332.piskel diff --git a/games/ootw/ootw_graphics/sprites/piskel/ootw_walking-20190310-011534.piskel b/games/ootw/sprites/piskel/ootw_walking-20190310-011534.piskel similarity index 100% rename from games/ootw/ootw_graphics/sprites/piskel/ootw_walking-20190310-011534.piskel rename to games/ootw/sprites/piskel/ootw_walking-20190310-011534.piskel diff --git a/games/ootw/ootw_graphics/sprites/slugs.inc b/games/ootw/sprites/slugs.inc similarity index 100% rename from games/ootw/ootw_graphics/sprites/slugs.inc rename to games/ootw/sprites/slugs.inc diff --git a/games/ootw/ootw_graphics/Apple II Lores.gpl b/utils/gr-utils/Apple II Lores.gpl similarity index 100% rename from games/ootw/ootw_graphics/Apple II Lores.gpl rename to utils/gr-utils/Apple II Lores.gpl