mirror of
https://github.com/zeldaret/oot.git
synced 2025-02-18 04:45:24 +00:00
Move kaleido scope and map mark data to a misc folder (#1033)
This commit is contained in:
parent
982e7be1f7
commit
1fa6e3874b
15 changed files with 13 additions and 15 deletions
4
Makefile
4
Makefile
|
@ -154,9 +154,7 @@ build/src/code/jpegdecoder.o: CC := $(CC_OLD)
|
||||||
|
|
||||||
build/src/boot/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
build/src/boot/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
||||||
build/src/code/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
build/src/code/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
||||||
build/src/overlays/actors/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
build/src/overlays/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
||||||
build/src/overlays/effects/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
|
||||||
build/src/overlays/gamestates/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
|
||||||
|
|
||||||
build/assets/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
build/assets/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
||||||
|
|
||||||
|
|
24
spec
24
spec
|
@ -556,16 +556,16 @@ endseg
|
||||||
|
|
||||||
beginseg
|
beginseg
|
||||||
name "ovl_kaleido_scope"
|
name "ovl_kaleido_scope"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.o"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.o"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_equipment.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.o"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_item.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.o"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_map_PAL.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.o"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_prompt.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.o"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.o"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark_data.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.o"
|
||||||
include "build/src/overlays/actors/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o"
|
include "build/src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o"
|
||||||
endseg
|
endseg
|
||||||
|
|
||||||
beginseg
|
beginseg
|
||||||
|
@ -576,8 +576,8 @@ endseg
|
||||||
|
|
||||||
beginseg
|
beginseg
|
||||||
name "ovl_map_mark_data"
|
name "ovl_map_mark_data"
|
||||||
include "build/src/overlays/ovl_map_mark_data/z_map_mark_data.o"
|
include "build/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.o"
|
||||||
include "build/src/overlays/ovl_map_mark_data/ovl_map_mark_data_reloc.o"
|
include "build/src/overlays/misc/ovl_map_mark_data/ovl_map_mark_data_reloc.o"
|
||||||
endseg
|
endseg
|
||||||
|
|
||||||
beginseg
|
beginseg
|
||||||
|
|
Loading…
Add table
Reference in a new issue