From d28b3e906273da547e81c4593f3824dc247a9a5a Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 23 Mar 2019 15:07:13 -0400 Subject: [PATCH] ootw: move rest of sprites to same location --- ootw/Makefile | 5 +++-- ootw/ootw.s | 6 +++--- ootw/{ => ootw_graphics/sprites}/sprites_beast.inc | 0 ootw/{ => ootw_graphics/sprites}/sprites_ootw.inc | 0 ootw/{ => ootw_graphics/sprites}/sprites_slugs.inc | 0 5 files changed, 6 insertions(+), 5 deletions(-) rename ootw/{ => ootw_graphics/sprites}/sprites_beast.inc (100%) rename ootw/{ => ootw_graphics/sprites}/sprites_ootw.inc (100%) rename ootw/{ => ootw_graphics/sprites}/sprites_slugs.inc (100%) diff --git a/ootw/Makefile b/ootw/Makefile index 1469be39..1ef48df8 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -38,8 +38,9 @@ ootw.o: ootw.s \ ootw_graphics/rope/ootw_swing.inc \ ootw_graphics/endl1/ootw_l1end.inc \ ootw_graphics/sprites/sprites_physicist.inc \ - sprites_slugs.inc \ - sprites_ootw.inc sprites_beast.inc + ootw_graphics/sprites/sprites_slugs.inc \ + ootw_graphics/sprites/sprites_ootw.inc \ + ootw_graphics/sprites/sprites_beast.inc ca65 -o ootw.o ootw.s -l ootw.lst #### diff --git a/ootw/ootw.s b/ootw/ootw.s index 930051dd..0056bb26 100644 --- a/ootw/ootw.s +++ b/ootw/ootw.s @@ -120,10 +120,10 @@ end_message: .include "ootw_graphics/rope/ootw_swing.inc" .include "ootw_graphics/underwater/ootw_underwater.inc" ; sprites -.include "sprites_ootw.inc" +.include "ootw_graphics/sprites/sprites_ootw.inc" .include "ootw_graphics/sprites/sprites_physicist.inc" -.include "sprites_slugs.inc" -.include "sprites_beast.inc" +.include "ootw_graphics/sprites/sprites_slugs.inc" +.include "ootw_graphics/sprites/sprites_beast.inc" ; cutscenes .include "cutscene_slug.s" .include "cutscene_beast.s" diff --git a/ootw/sprites_beast.inc b/ootw/ootw_graphics/sprites/sprites_beast.inc similarity index 100% rename from ootw/sprites_beast.inc rename to ootw/ootw_graphics/sprites/sprites_beast.inc diff --git a/ootw/sprites_ootw.inc b/ootw/ootw_graphics/sprites/sprites_ootw.inc similarity index 100% rename from ootw/sprites_ootw.inc rename to ootw/ootw_graphics/sprites/sprites_ootw.inc diff --git a/ootw/sprites_slugs.inc b/ootw/ootw_graphics/sprites/sprites_slugs.inc similarity index 100% rename from ootw/sprites_slugs.inc rename to ootw/ootw_graphics/sprites/sprites_slugs.inc