diff --git a/ootw/Makefile b/ootw/Makefile index 57f7f87e..d5d867ee 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -31,21 +31,21 @@ ootw_c1.o: ootw_c1.s \ ootw_c1_rope.s earthquake.s ootw_c1_mesa.s \ ootw_c1_pool.s ootw_c1_cavern.s physicist.s random16.s \ ootw_cut_slug.s ootw_cut_beast.s \ - ootw_graphics/pool/ootw_pool.inc \ - ootw_graphics/underwater/ootw_underwater.inc \ - ootw_graphics/caves/ootw_cavern.inc \ - ootw_graphics/caves/ootw_cavern2.inc \ - ootw_graphics/caves/ootw_cavern3.inc \ - ootw_graphics/rope/ootw_rope.inc \ - ootw_graphics/rope/ootw_swing.inc \ - ootw_graphics/endl1/ootw_l1end.inc \ + 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/sprites_physicist.inc \ ootw_graphics/sprites/sprites_slugs.inc \ ootw_graphics/sprites/sprites_ootw.inc \ ootw_graphics/sprites/sprites_beast.inc \ - ootw_graphics/end_scenes/ootw_beast_end.inc \ - ootw_graphics/end_scenes/ootw_beast_intro.inc \ - ootw_graphics/end_scenes/ootw_slug_end.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 #### diff --git a/ootw/ootw_c1.s b/ootw/ootw_c1.s index bf5e3313..814a42eb 100644 --- a/ootw/ootw_c1.s +++ b/ootw/ootw_c1.s @@ -118,20 +118,20 @@ end_message: .include "ootw_cut_beast.s" ; room backgrounds -.include "ootw_graphics/pool/ootw_pool.inc" -.include "ootw_graphics/caves/ootw_cavern.inc" -.include "ootw_graphics/caves/ootw_cavern2.inc" -.include "ootw_graphics/caves/ootw_cavern3.inc" -.include "ootw_graphics/rope/ootw_rope.inc" -.include "ootw_graphics/rope/ootw_swing.inc" -.include "ootw_graphics/underwater/ootw_underwater.inc" +.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" ; sprites .include "ootw_graphics/sprites/sprites_ootw.inc" .include "ootw_graphics/sprites/sprites_physicist.inc" .include "ootw_graphics/sprites/sprites_slugs.inc" .include "ootw_graphics/sprites/sprites_beast.inc" ; cutscene data -.include "ootw_graphics/endl1/ootw_l1end.inc" -.include "ootw_graphics/end_scenes/ootw_beast_end.inc" -.include "ootw_graphics/end_scenes/ootw_slug_end.inc" -.include "ootw_graphics/end_scenes/ootw_beast_intro.inc" +.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" diff --git a/ootw/ootw_c2.s b/ootw/ootw_c2.s index 5a1d0100..45207e58 100644 --- a/ootw/ootw_c2.s +++ b/ootw/ootw_c2.s @@ -139,7 +139,7 @@ end_message: ; intro .include "ootw_graphics/l2intro/ootw_l2intro.inc" ; city movie -.include "ootw_graphics/city/city_movie.inc" +.include "ootw_graphics/l2city/city_movie.inc" ; laser movie .include "ootw_graphics/l2laser/ootw_c2_laser.inc" diff --git a/ootw/ootw_graphics/caves/Makefile b/ootw/ootw_graphics/l1caves/Makefile similarity index 100% rename from ootw/ootw_graphics/caves/Makefile rename to ootw/ootw_graphics/l1caves/Makefile diff --git a/ootw/ootw_graphics/caves/another_cave.png b/ootw/ootw_graphics/l1caves/another_cave.png similarity index 100% rename from ootw/ootw_graphics/caves/another_cave.png rename to ootw/ootw_graphics/l1caves/another_cave.png diff --git a/ootw/ootw_graphics/caves/another_cave2.png b/ootw/ootw_graphics/l1caves/another_cave2.png similarity index 100% rename from ootw/ootw_graphics/caves/another_cave2.png rename to ootw/ootw_graphics/l1caves/another_cave2.png diff --git a/ootw/ootw_graphics/caves/another_cave3.png b/ootw/ootw_graphics/l1caves/another_cave3.png similarity index 100% rename from ootw/ootw_graphics/caves/another_cave3.png rename to ootw/ootw_graphics/l1caves/another_cave3.png diff --git a/ootw/ootw_graphics/caves/ootw_cavern.inc b/ootw/ootw_graphics/l1caves/ootw_cavern.inc similarity index 100% rename from ootw/ootw_graphics/caves/ootw_cavern.inc rename to ootw/ootw_graphics/l1caves/ootw_cavern.inc diff --git a/ootw/ootw_graphics/caves/ootw_cavern2.inc b/ootw/ootw_graphics/l1caves/ootw_cavern2.inc similarity index 100% rename from ootw/ootw_graphics/caves/ootw_cavern2.inc rename to ootw/ootw_graphics/l1caves/ootw_cavern2.inc diff --git a/ootw/ootw_graphics/caves/ootw_cavern3.inc b/ootw/ootw_graphics/l1caves/ootw_cavern3.inc similarity index 100% rename from ootw/ootw_graphics/caves/ootw_cavern3.inc rename to ootw/ootw_graphics/l1caves/ootw_cavern3.inc diff --git a/ootw/ootw_graphics/endl1/Makefile b/ootw/ootw_graphics/l1end/Makefile similarity index 100% rename from ootw/ootw_graphics/endl1/Makefile rename to ootw/ootw_graphics/l1end/Makefile diff --git a/ootw/ootw_graphics/endl1/another_cave3_cut-20190308-170625.piskel b/ootw/ootw_graphics/l1end/another_cave3_cut-20190308-170625.piskel similarity index 100% rename from ootw/ootw_graphics/endl1/another_cave3_cut-20190308-170625.piskel rename to ootw/ootw_graphics/l1end/another_cave3_cut-20190308-170625.piskel diff --git a/ootw/ootw_graphics/endl1/another_cave3_cut.png b/ootw/ootw_graphics/l1end/another_cave3_cut.png similarity index 100% rename from ootw/ootw_graphics/endl1/another_cave3_cut.png rename to ootw/ootw_graphics/l1end/another_cave3_cut.png diff --git a/ootw/ootw_graphics/endl1/black.png b/ootw/ootw_graphics/l1end/black.png similarity index 100% rename from ootw/ootw_graphics/endl1/black.png rename to ootw/ootw_graphics/l1end/black.png diff --git a/ootw/ootw_graphics/endl1/l1end01.png b/ootw/ootw_graphics/l1end/l1end01.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end01.png rename to ootw/ootw_graphics/l1end/l1end01.png diff --git a/ootw/ootw_graphics/endl1/l1end02.png b/ootw/ootw_graphics/l1end/l1end02.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end02.png rename to ootw/ootw_graphics/l1end/l1end02.png diff --git a/ootw/ootw_graphics/endl1/l1end03.png b/ootw/ootw_graphics/l1end/l1end03.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end03.png rename to ootw/ootw_graphics/l1end/l1end03.png diff --git a/ootw/ootw_graphics/endl1/l1end04.png b/ootw/ootw_graphics/l1end/l1end04.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end04.png rename to ootw/ootw_graphics/l1end/l1end04.png diff --git a/ootw/ootw_graphics/endl1/l1end05.png b/ootw/ootw_graphics/l1end/l1end05.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end05.png rename to ootw/ootw_graphics/l1end/l1end05.png diff --git a/ootw/ootw_graphics/endl1/l1end06.png b/ootw/ootw_graphics/l1end/l1end06.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end06.png rename to ootw/ootw_graphics/l1end/l1end06.png diff --git a/ootw/ootw_graphics/endl1/l1end07.png b/ootw/ootw_graphics/l1end/l1end07.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end07.png rename to ootw/ootw_graphics/l1end/l1end07.png diff --git a/ootw/ootw_graphics/endl1/l1end08.png b/ootw/ootw_graphics/l1end/l1end08.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end08.png rename to ootw/ootw_graphics/l1end/l1end08.png diff --git a/ootw/ootw_graphics/endl1/l1end09.png b/ootw/ootw_graphics/l1end/l1end09.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end09.png rename to ootw/ootw_graphics/l1end/l1end09.png diff --git a/ootw/ootw_graphics/endl1/l1end10.png b/ootw/ootw_graphics/l1end/l1end10.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end10.png rename to ootw/ootw_graphics/l1end/l1end10.png diff --git a/ootw/ootw_graphics/endl1/l1end11.png b/ootw/ootw_graphics/l1end/l1end11.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end11.png rename to ootw/ootw_graphics/l1end/l1end11.png diff --git a/ootw/ootw_graphics/endl1/l1end12.png b/ootw/ootw_graphics/l1end/l1end12.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end12.png rename to ootw/ootw_graphics/l1end/l1end12.png diff --git a/ootw/ootw_graphics/endl1/l1end13.png b/ootw/ootw_graphics/l1end/l1end13.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end13.png rename to ootw/ootw_graphics/l1end/l1end13.png diff --git a/ootw/ootw_graphics/endl1/l1end14.png b/ootw/ootw_graphics/l1end/l1end14.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end14.png rename to ootw/ootw_graphics/l1end/l1end14.png diff --git a/ootw/ootw_graphics/endl1/l1end15.png b/ootw/ootw_graphics/l1end/l1end15.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end15.png rename to ootw/ootw_graphics/l1end/l1end15.png diff --git a/ootw/ootw_graphics/endl1/l1end16.png b/ootw/ootw_graphics/l1end/l1end16.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end16.png rename to ootw/ootw_graphics/l1end/l1end16.png diff --git a/ootw/ootw_graphics/endl1/l1end17.png b/ootw/ootw_graphics/l1end/l1end17.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end17.png rename to ootw/ootw_graphics/l1end/l1end17.png diff --git a/ootw/ootw_graphics/endl1/l1end18.png b/ootw/ootw_graphics/l1end/l1end18.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end18.png rename to ootw/ootw_graphics/l1end/l1end18.png diff --git a/ootw/ootw_graphics/endl1/l1end19.png b/ootw/ootw_graphics/l1end/l1end19.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end19.png rename to ootw/ootw_graphics/l1end/l1end19.png diff --git a/ootw/ootw_graphics/endl1/l1end20.png b/ootw/ootw_graphics/l1end/l1end20.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end20.png rename to ootw/ootw_graphics/l1end/l1end20.png diff --git a/ootw/ootw_graphics/endl1/l1end21.png b/ootw/ootw_graphics/l1end/l1end21.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end21.png rename to ootw/ootw_graphics/l1end/l1end21.png diff --git a/ootw/ootw_graphics/endl1/l1end22.png b/ootw/ootw_graphics/l1end/l1end22.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end22.png rename to ootw/ootw_graphics/l1end/l1end22.png diff --git a/ootw/ootw_graphics/endl1/l1end23.png b/ootw/ootw_graphics/l1end/l1end23.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end23.png rename to ootw/ootw_graphics/l1end/l1end23.png diff --git a/ootw/ootw_graphics/endl1/l1end24.png b/ootw/ootw_graphics/l1end/l1end24.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end24.png rename to ootw/ootw_graphics/l1end/l1end24.png diff --git a/ootw/ootw_graphics/endl1/l1end25.png b/ootw/ootw_graphics/l1end/l1end25.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end25.png rename to ootw/ootw_graphics/l1end/l1end25.png diff --git a/ootw/ootw_graphics/endl1/l1end26.png b/ootw/ootw_graphics/l1end/l1end26.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end26.png rename to ootw/ootw_graphics/l1end/l1end26.png diff --git a/ootw/ootw_graphics/endl1/l1end27.png b/ootw/ootw_graphics/l1end/l1end27.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end27.png rename to ootw/ootw_graphics/l1end/l1end27.png diff --git a/ootw/ootw_graphics/endl1/l1end28.png b/ootw/ootw_graphics/l1end/l1end28.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end28.png rename to ootw/ootw_graphics/l1end/l1end28.png diff --git a/ootw/ootw_graphics/endl1/l1end29.png b/ootw/ootw_graphics/l1end/l1end29.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end29.png rename to ootw/ootw_graphics/l1end/l1end29.png diff --git a/ootw/ootw_graphics/endl1/l1end30.png b/ootw/ootw_graphics/l1end/l1end30.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end30.png rename to ootw/ootw_graphics/l1end/l1end30.png diff --git a/ootw/ootw_graphics/endl1/l1end31.png b/ootw/ootw_graphics/l1end/l1end31.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end31.png rename to ootw/ootw_graphics/l1end/l1end31.png diff --git a/ootw/ootw_graphics/endl1/l1end32.png b/ootw/ootw_graphics/l1end/l1end32.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end32.png rename to ootw/ootw_graphics/l1end/l1end32.png diff --git a/ootw/ootw_graphics/endl1/l1end33.png b/ootw/ootw_graphics/l1end/l1end33.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end33.png rename to ootw/ootw_graphics/l1end/l1end33.png diff --git a/ootw/ootw_graphics/endl1/l1end36.png b/ootw/ootw_graphics/l1end/l1end36.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end36.png rename to ootw/ootw_graphics/l1end/l1end36.png diff --git a/ootw/ootw_graphics/endl1/l1end37.png b/ootw/ootw_graphics/l1end/l1end37.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end37.png rename to ootw/ootw_graphics/l1end/l1end37.png diff --git a/ootw/ootw_graphics/endl1/l1end38.png b/ootw/ootw_graphics/l1end/l1end38.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end38.png rename to ootw/ootw_graphics/l1end/l1end38.png diff --git a/ootw/ootw_graphics/endl1/l1end39.png b/ootw/ootw_graphics/l1end/l1end39.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end39.png rename to ootw/ootw_graphics/l1end/l1end39.png diff --git a/ootw/ootw_graphics/endl1/l1end40.png b/ootw/ootw_graphics/l1end/l1end40.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end40.png rename to ootw/ootw_graphics/l1end/l1end40.png diff --git a/ootw/ootw_graphics/endl1/l1end41.png b/ootw/ootw_graphics/l1end/l1end41.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end41.png rename to ootw/ootw_graphics/l1end/l1end41.png diff --git a/ootw/ootw_graphics/endl1/l1end42.png b/ootw/ootw_graphics/l1end/l1end42.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end42.png rename to ootw/ootw_graphics/l1end/l1end42.png diff --git a/ootw/ootw_graphics/endl1/l1end43.png b/ootw/ootw_graphics/l1end/l1end43.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end43.png rename to ootw/ootw_graphics/l1end/l1end43.png diff --git a/ootw/ootw_graphics/endl1/l1end44.png b/ootw/ootw_graphics/l1end/l1end44.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end44.png rename to ootw/ootw_graphics/l1end/l1end44.png diff --git a/ootw/ootw_graphics/endl1/l1end45.png b/ootw/ootw_graphics/l1end/l1end45.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end45.png rename to ootw/ootw_graphics/l1end/l1end45.png diff --git a/ootw/ootw_graphics/endl1/l1end46.png b/ootw/ootw_graphics/l1end/l1end46.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end46.png rename to ootw/ootw_graphics/l1end/l1end46.png diff --git a/ootw/ootw_graphics/endl1/l1end47.png b/ootw/ootw_graphics/l1end/l1end47.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end47.png rename to ootw/ootw_graphics/l1end/l1end47.png diff --git a/ootw/ootw_graphics/endl1/l1end48.png b/ootw/ootw_graphics/l1end/l1end48.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end48.png rename to ootw/ootw_graphics/l1end/l1end48.png diff --git a/ootw/ootw_graphics/endl1/l1end49.png b/ootw/ootw_graphics/l1end/l1end49.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end49.png rename to ootw/ootw_graphics/l1end/l1end49.png diff --git a/ootw/ootw_graphics/endl1/l1end50.png b/ootw/ootw_graphics/l1end/l1end50.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end50.png rename to ootw/ootw_graphics/l1end/l1end50.png diff --git a/ootw/ootw_graphics/endl1/l1end51.png b/ootw/ootw_graphics/l1end/l1end51.png similarity index 100% rename from ootw/ootw_graphics/endl1/l1end51.png rename to ootw/ootw_graphics/l1end/l1end51.png diff --git a/ootw/ootw_graphics/endl1/ootw_deadbeast.png b/ootw/ootw_graphics/l1end/ootw_deadbeast.png similarity index 100% rename from ootw/ootw_graphics/endl1/ootw_deadbeast.png rename to ootw/ootw_graphics/l1end/ootw_deadbeast.png diff --git a/ootw/ootw_graphics/endl1/ootw_gunguy.png b/ootw/ootw_graphics/l1end/ootw_gunguy.png similarity index 100% rename from ootw/ootw_graphics/endl1/ootw_gunguy.png rename to ootw/ootw_graphics/l1end/ootw_gunguy.png diff --git a/ootw/ootw_graphics/endl1/ootw_l1end.inc b/ootw/ootw_graphics/l1end/ootw_l1end.inc similarity index 100% rename from ootw/ootw_graphics/endl1/ootw_l1end.inc rename to ootw/ootw_graphics/l1end/ootw_l1end.inc diff --git a/ootw/ootw_graphics/endl1/ootw_peace.png b/ootw/ootw_graphics/l1end/ootw_peace.png similarity index 100% rename from ootw/ootw_graphics/endl1/ootw_peace.png rename to ootw/ootw_graphics/l1end/ootw_peace.png diff --git a/ootw/ootw_graphics/end_scenes/Makefile b/ootw/ootw_graphics/l1end_scenes/Makefile similarity index 100% rename from ootw/ootw_graphics/end_scenes/Makefile rename to ootw/ootw_graphics/l1end_scenes/Makefile diff --git a/ootw/ootw_graphics/end_scenes/beast_bg.png b/ootw/ootw_graphics/l1end_scenes/beast_bg.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_bg.png rename to ootw/ootw_graphics/l1end_scenes/beast_bg.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash07.png b/ootw/ootw_graphics/l1end_scenes/beast_slash07.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash07.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash07.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash08.png b/ootw/ootw_graphics/l1end_scenes/beast_slash08.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash08.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash08.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash09.png b/ootw/ootw_graphics/l1end_scenes/beast_slash09.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash09.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash09.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash10.png b/ootw/ootw_graphics/l1end_scenes/beast_slash10.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash10.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash10.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash11.png b/ootw/ootw_graphics/l1end_scenes/beast_slash11.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash11.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash11.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash12.png b/ootw/ootw_graphics/l1end_scenes/beast_slash12.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash12.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash12.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash13.png b/ootw/ootw_graphics/l1end_scenes/beast_slash13.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash13.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash13.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash14.png b/ootw/ootw_graphics/l1end_scenes/beast_slash14.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash14.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash14.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash15.png b/ootw/ootw_graphics/l1end_scenes/beast_slash15.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash15.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash15.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash16.png b/ootw/ootw_graphics/l1end_scenes/beast_slash16.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash16.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash16.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash17.png b/ootw/ootw_graphics/l1end_scenes/beast_slash17.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash17.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash17.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash18.png b/ootw/ootw_graphics/l1end_scenes/beast_slash18.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash18.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash18.png diff --git a/ootw/ootw_graphics/end_scenes/beast_slash19.png b/ootw/ootw_graphics/l1end_scenes/beast_slash19.png similarity index 100% rename from ootw/ootw_graphics/end_scenes/beast_slash19.png rename to ootw/ootw_graphics/l1end_scenes/beast_slash19.png diff --git a/ootw/ootw_graphics/end_scenes/ootw_beast_end.inc b/ootw/ootw_graphics/l1end_scenes/ootw_beast_end.inc similarity index 100% rename from ootw/ootw_graphics/end_scenes/ootw_beast_end.inc rename to ootw/ootw_graphics/l1end_scenes/ootw_beast_end.inc diff --git a/ootw/ootw_graphics/end_scenes/ootw_beast_intro.inc b/ootw/ootw_graphics/l1end_scenes/ootw_beast_intro.inc similarity index 100% rename from ootw/ootw_graphics/end_scenes/ootw_beast_intro.inc rename to ootw/ootw_graphics/l1end_scenes/ootw_beast_intro.inc diff --git a/ootw/ootw_graphics/end_scenes/ootw_slug_end.inc b/ootw/ootw_graphics/l1end_scenes/ootw_slug_end.inc similarity index 100% rename from ootw/ootw_graphics/end_scenes/ootw_slug_end.inc rename to ootw/ootw_graphics/l1end_scenes/ootw_slug_end.inc diff --git a/ootw/ootw_graphics/pool/Makefile b/ootw/ootw_graphics/l1pool/Makefile similarity index 100% rename from ootw/ootw_graphics/pool/Makefile rename to ootw/ootw_graphics/l1pool/Makefile diff --git a/ootw/ootw_graphics/pool/another_pool.png b/ootw/ootw_graphics/l1pool/another_pool.png similarity index 100% rename from ootw/ootw_graphics/pool/another_pool.png rename to ootw/ootw_graphics/l1pool/another_pool.png diff --git a/ootw/ootw_graphics/pool/ootw_pool.inc b/ootw/ootw_graphics/l1pool/ootw_pool.inc similarity index 100% rename from ootw/ootw_graphics/pool/ootw_pool.inc rename to ootw/ootw_graphics/l1pool/ootw_pool.inc diff --git a/ootw/ootw_graphics/rope/Makefile b/ootw/ootw_graphics/l1rope/Makefile similarity index 100% rename from ootw/ootw_graphics/rope/Makefile rename to ootw/ootw_graphics/l1rope/Makefile diff --git a/ootw/ootw_graphics/rope/another_brokerope.png b/ootw/ootw_graphics/l1rope/another_brokerope.png similarity index 100% rename from ootw/ootw_graphics/rope/another_brokerope.png rename to ootw/ootw_graphics/l1rope/another_brokerope.png diff --git a/ootw/ootw_graphics/rope/another_norope.png b/ootw/ootw_graphics/l1rope/another_norope.png similarity index 100% rename from ootw/ootw_graphics/rope/another_norope.png rename to ootw/ootw_graphics/l1rope/another_norope.png diff --git a/ootw/ootw_graphics/rope/another_rope-20190316-152508.piskel b/ootw/ootw_graphics/l1rope/another_rope-20190316-152508.piskel similarity index 100% rename from ootw/ootw_graphics/rope/another_rope-20190316-152508.piskel rename to ootw/ootw_graphics/l1rope/another_rope-20190316-152508.piskel diff --git a/ootw/ootw_graphics/rope/another_rope.png b/ootw/ootw_graphics/l1rope/another_rope.png similarity index 100% rename from ootw/ootw_graphics/rope/another_rope.png rename to ootw/ootw_graphics/l1rope/another_rope.png diff --git a/ootw/ootw_graphics/rope/another_swing01.png b/ootw/ootw_graphics/l1rope/another_swing01.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing01.png rename to ootw/ootw_graphics/l1rope/another_swing01.png diff --git a/ootw/ootw_graphics/rope/another_swing02.png b/ootw/ootw_graphics/l1rope/another_swing02.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing02.png rename to ootw/ootw_graphics/l1rope/another_swing02.png diff --git a/ootw/ootw_graphics/rope/another_swing03.png b/ootw/ootw_graphics/l1rope/another_swing03.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing03.png rename to ootw/ootw_graphics/l1rope/another_swing03.png diff --git a/ootw/ootw_graphics/rope/another_swing04.png b/ootw/ootw_graphics/l1rope/another_swing04.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing04.png rename to ootw/ootw_graphics/l1rope/another_swing04.png diff --git a/ootw/ootw_graphics/rope/another_swing05.png b/ootw/ootw_graphics/l1rope/another_swing05.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing05.png rename to ootw/ootw_graphics/l1rope/another_swing05.png diff --git a/ootw/ootw_graphics/rope/another_swing06.png b/ootw/ootw_graphics/l1rope/another_swing06.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing06.png rename to ootw/ootw_graphics/l1rope/another_swing06.png diff --git a/ootw/ootw_graphics/rope/another_swing08.png b/ootw/ootw_graphics/l1rope/another_swing08.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing08.png rename to ootw/ootw_graphics/l1rope/another_swing08.png diff --git a/ootw/ootw_graphics/rope/another_swing10.png b/ootw/ootw_graphics/l1rope/another_swing10.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing10.png rename to ootw/ootw_graphics/l1rope/another_swing10.png diff --git a/ootw/ootw_graphics/rope/another_swing11.png b/ootw/ootw_graphics/l1rope/another_swing11.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing11.png rename to ootw/ootw_graphics/l1rope/another_swing11.png diff --git a/ootw/ootw_graphics/rope/another_swing12.png b/ootw/ootw_graphics/l1rope/another_swing12.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing12.png rename to ootw/ootw_graphics/l1rope/another_swing12.png diff --git a/ootw/ootw_graphics/rope/another_swing13.png b/ootw/ootw_graphics/l1rope/another_swing13.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing13.png rename to ootw/ootw_graphics/l1rope/another_swing13.png diff --git a/ootw/ootw_graphics/rope/another_swing14.png b/ootw/ootw_graphics/l1rope/another_swing14.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing14.png rename to ootw/ootw_graphics/l1rope/another_swing14.png diff --git a/ootw/ootw_graphics/rope/another_swing15.png b/ootw/ootw_graphics/l1rope/another_swing15.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing15.png rename to ootw/ootw_graphics/l1rope/another_swing15.png diff --git a/ootw/ootw_graphics/rope/another_swing16.png b/ootw/ootw_graphics/l1rope/another_swing16.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing16.png rename to ootw/ootw_graphics/l1rope/another_swing16.png diff --git a/ootw/ootw_graphics/rope/another_swing17.png b/ootw/ootw_graphics/l1rope/another_swing17.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing17.png rename to ootw/ootw_graphics/l1rope/another_swing17.png diff --git a/ootw/ootw_graphics/rope/another_swing18.png b/ootw/ootw_graphics/l1rope/another_swing18.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing18.png rename to ootw/ootw_graphics/l1rope/another_swing18.png diff --git a/ootw/ootw_graphics/rope/another_swing19.png b/ootw/ootw_graphics/l1rope/another_swing19.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing19.png rename to ootw/ootw_graphics/l1rope/another_swing19.png diff --git a/ootw/ootw_graphics/rope/another_swing20.png b/ootw/ootw_graphics/l1rope/another_swing20.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing20.png rename to ootw/ootw_graphics/l1rope/another_swing20.png diff --git a/ootw/ootw_graphics/rope/another_swing21.png b/ootw/ootw_graphics/l1rope/another_swing21.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing21.png rename to ootw/ootw_graphics/l1rope/another_swing21.png diff --git a/ootw/ootw_graphics/rope/another_swing22.png b/ootw/ootw_graphics/l1rope/another_swing22.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing22.png rename to ootw/ootw_graphics/l1rope/another_swing22.png diff --git a/ootw/ootw_graphics/rope/another_swing23.png b/ootw/ootw_graphics/l1rope/another_swing23.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing23.png rename to ootw/ootw_graphics/l1rope/another_swing23.png diff --git a/ootw/ootw_graphics/rope/another_swing24.png b/ootw/ootw_graphics/l1rope/another_swing24.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing24.png rename to ootw/ootw_graphics/l1rope/another_swing24.png diff --git a/ootw/ootw_graphics/rope/another_swing25.png b/ootw/ootw_graphics/l1rope/another_swing25.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing25.png rename to ootw/ootw_graphics/l1rope/another_swing25.png diff --git a/ootw/ootw_graphics/rope/another_swing_all.png b/ootw/ootw_graphics/l1rope/another_swing_all.png similarity index 100% rename from ootw/ootw_graphics/rope/another_swing_all.png rename to ootw/ootw_graphics/l1rope/another_swing_all.png diff --git a/ootw/ootw_graphics/rope/falling.png b/ootw/ootw_graphics/l1rope/falling.png similarity index 100% rename from ootw/ootw_graphics/rope/falling.png rename to ootw/ootw_graphics/l1rope/falling.png diff --git a/ootw/ootw_graphics/rope/ootw_rope.inc b/ootw/ootw_graphics/l1rope/ootw_rope.inc similarity index 100% rename from ootw/ootw_graphics/rope/ootw_rope.inc rename to ootw/ootw_graphics/l1rope/ootw_rope.inc diff --git a/ootw/ootw_graphics/rope/ootw_swing.inc b/ootw/ootw_graphics/l1rope/ootw_swing.inc similarity index 100% rename from ootw/ootw_graphics/rope/ootw_swing.inc rename to ootw/ootw_graphics/l1rope/ootw_swing.inc diff --git a/ootw/ootw_graphics/underwater/Makefile b/ootw/ootw_graphics/l1underwater/Makefile similarity index 100% rename from ootw/ootw_graphics/underwater/Makefile rename to ootw/ootw_graphics/l1underwater/Makefile diff --git a/ootw/ootw_graphics/underwater/another_uboot.png b/ootw/ootw_graphics/l1underwater/another_uboot.png similarity index 100% rename from ootw/ootw_graphics/underwater/another_uboot.png rename to ootw/ootw_graphics/l1underwater/another_uboot.png diff --git a/ootw/ootw_graphics/underwater/ootw_underwater.inc b/ootw/ootw_graphics/l1underwater/ootw_underwater.inc similarity index 100% rename from ootw/ootw_graphics/underwater/ootw_underwater.inc rename to ootw/ootw_graphics/l1underwater/ootw_underwater.inc diff --git a/ootw/ootw_graphics/city/Makefile b/ootw/ootw_graphics/l2city/Makefile similarity index 100% rename from ootw/ootw_graphics/city/Makefile rename to ootw/ootw_graphics/l2city/Makefile diff --git a/ootw/ootw_graphics/city/city_movie.inc b/ootw/ootw_graphics/l2city/city_movie.inc similarity index 100% rename from ootw/ootw_graphics/city/city_movie.inc rename to ootw/ootw_graphics/l2city/city_movie.inc diff --git a/ootw/ootw_graphics/city/ncity01.png b/ootw/ootw_graphics/l2city/ncity01.png similarity index 100% rename from ootw/ootw_graphics/city/ncity01.png rename to ootw/ootw_graphics/l2city/ncity01.png diff --git a/ootw/ootw_graphics/city/ncity02.png b/ootw/ootw_graphics/l2city/ncity02.png similarity index 100% rename from ootw/ootw_graphics/city/ncity02.png rename to ootw/ootw_graphics/l2city/ncity02.png diff --git a/ootw/ootw_graphics/city/ncity03.png b/ootw/ootw_graphics/l2city/ncity03.png similarity index 100% rename from ootw/ootw_graphics/city/ncity03.png rename to ootw/ootw_graphics/l2city/ncity03.png diff --git a/ootw/ootw_graphics/city/ncity04.png b/ootw/ootw_graphics/l2city/ncity04.png similarity index 100% rename from ootw/ootw_graphics/city/ncity04.png rename to ootw/ootw_graphics/l2city/ncity04.png diff --git a/ootw/ootw_graphics/city/ncity05.png b/ootw/ootw_graphics/l2city/ncity05.png similarity index 100% rename from ootw/ootw_graphics/city/ncity05.png rename to ootw/ootw_graphics/l2city/ncity05.png diff --git a/ootw/ootw_graphics/city/ncity06.png b/ootw/ootw_graphics/l2city/ncity06.png similarity index 100% rename from ootw/ootw_graphics/city/ncity06.png rename to ootw/ootw_graphics/l2city/ncity06.png diff --git a/ootw/ootw_graphics/city/ncity07.png b/ootw/ootw_graphics/l2city/ncity07.png similarity index 100% rename from ootw/ootw_graphics/city/ncity07.png rename to ootw/ootw_graphics/l2city/ncity07.png diff --git a/ootw/ootw_graphics/city/ncity08.png b/ootw/ootw_graphics/l2city/ncity08.png similarity index 100% rename from ootw/ootw_graphics/city/ncity08.png rename to ootw/ootw_graphics/l2city/ncity08.png diff --git a/ootw/ootw_graphics/city/ncity09.png b/ootw/ootw_graphics/l2city/ncity09.png similarity index 100% rename from ootw/ootw_graphics/city/ncity09.png rename to ootw/ootw_graphics/l2city/ncity09.png diff --git a/ootw/ootw_graphics/city/ncity10.png b/ootw/ootw_graphics/l2city/ncity10.png similarity index 100% rename from ootw/ootw_graphics/city/ncity10.png rename to ootw/ootw_graphics/l2city/ncity10.png diff --git a/ootw/ootw_graphics/city/ncity11.png b/ootw/ootw_graphics/l2city/ncity11.png similarity index 100% rename from ootw/ootw_graphics/city/ncity11.png rename to ootw/ootw_graphics/l2city/ncity11.png diff --git a/ootw/ootw_graphics/city/ncity12.png b/ootw/ootw_graphics/l2city/ncity12.png similarity index 100% rename from ootw/ootw_graphics/city/ncity12.png rename to ootw/ootw_graphics/l2city/ncity12.png diff --git a/ootw/ootw_graphics/city/ncity13.png b/ootw/ootw_graphics/l2city/ncity13.png similarity index 100% rename from ootw/ootw_graphics/city/ncity13.png rename to ootw/ootw_graphics/l2city/ncity13.png diff --git a/ootw/ootw_graphics/city/ncity14.png b/ootw/ootw_graphics/l2city/ncity14.png similarity index 100% rename from ootw/ootw_graphics/city/ncity14.png rename to ootw/ootw_graphics/l2city/ncity14.png