From 3aa269c33b06dfae2c2e9fcf177ef0221ceed27d Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Tue, 3 Jan 2023 23:03:26 -0800 Subject: [PATCH 01/19] dol2asm: fix game paths --- tools/libdol2asm/split_asm.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/libdol2asm/split_asm.py b/tools/libdol2asm/split_asm.py index c796e006d8..5bfa4e654d 100644 --- a/tools/libdol2asm/split_asm.py +++ b/tools/libdol2asm/split_asm.py @@ -61,6 +61,8 @@ class Dol2AsmSplitter: select_tu, select_asm): self.debug_logging = debug_logging self.game_path = game_path + self.files_path = game_path / "files" + self.sys_path = game_path / "sys" self.lib_path = lib_path self.src_path = src_path self.asm_path = asm_path @@ -88,15 +90,15 @@ class Dol2AsmSplitter: fatal_exit() # check if the 'main.dol' and 'frameworkF.map' exists - self.baserom_path = util.check_file(self.game_path, "main.dol") + self.baserom_path = util.check_file(self.sys_path, "main.dol") self.framework_path = util.check_file( - self.game_path, "map/Final/Release/frameworkF.map") + self.files_path , "map/Final/Release/frameworkF.map") info(f"found 'main.dol' at '{self.baserom_path}'") info(f"found 'frameworkF.map' at '{self.framework_path}'") # search for '.map' files - self.map_path = util.check_dir(self.game_path, "map/Final/Release") + self.map_path = util.check_dir(self.files_path, "map/Final/Release") self.maps_path = [ x for x in util.get_files_with_ext(self.map_path, ".map") @@ -105,9 +107,9 @@ class Dol2AsmSplitter: info(f"found {len(self.maps_path)} map files in '{self.map_path}'") # search for '.rel' files - self._rel_path = util.check_dir(self.game_path, "rel/Final/Release") + self._rel_path = util.check_dir(self.files_path, "rel/Final/Release") self.rels_path = util.get_files_with_ext(self._rel_path, ".rel") - self.rels_archive_path = util.check_file(self.game_path, "RELS.arc") + self.rels_archive_path = util.check_file(self.files_path, "RELS.arc") info(f"found {len(self.rels_path)} RELs in '{self._rel_path}'") def read_dol(self): From 309148334fa84729871aa1947576841dd4035e04 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Tue, 3 Jan 2023 23:09:28 -0800 Subject: [PATCH 02/19] dol2asm: generate Unix paths in makefiles regardless of platform --- tools/libdol2asm/exporter/makefile.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/libdol2asm/exporter/makefile.py b/tools/libdol2asm/exporter/makefile.py index f06fc51cb9..e99c5c787f 100644 --- a/tools/libdol2asm/exporter/makefile.py +++ b/tools/libdol2asm/exporter/makefile.py @@ -1,4 +1,4 @@ -from pathlib import Path +from pathlib import Path, PurePosixPath from .. import util from ..globals import * @@ -8,7 +8,7 @@ from ..builder import AsyncBuilder async def create_library(library: Library): assert library.name lib_path = library.makefile_path - cpp_path = library.source_path + cpp_path = PurePosixPath(library.source_path) o_path = f"$(BUILD_DIR)/{cpp_path}" makefile_path = lib_path.joinpath("Makefile") @@ -30,7 +30,7 @@ async def create_library(library: Library): if tu.is_empty: continue - await builder.write(f"\t{tu.source_path(library)} \\") + await builder.write(f"\t{PurePosixPath(tu.source_path(library))} \\") await builder.write("") await builder.write(f"{prefix}_O_FILES := \\") @@ -38,7 +38,7 @@ async def create_library(library: Library): if tu.is_empty: continue - await builder.write(f"\t$(BUILD_DIR)/{tu.object_path(library)} \\") + await builder.write(f"\t$(BUILD_DIR)/{PurePosixPath(tu.object_path(library))} \\") await builder.write("") await builder.write(f"{prefix}_CFLAGS := \\") @@ -73,7 +73,7 @@ async def create_rel(module: Module, rel_path: Path): prefix = f"m{module.index}".upper() lib_path = base.makefile_path - cpp_path = base.source_path + cpp_path = PurePosixPath(base.source_path) o_path = f"$(BUILD_DIR)/{cpp_path}" makefile_path = lib_path.joinpath("Makefile") @@ -101,9 +101,9 @@ async def create_rel(module: Module, rel_path: Path): if tu.is_empty: continue if tu.special == "rel": - await builder.write(f"\t{rel_path.joinpath(tu.name)}.cpp \\") + await builder.write(f"\t{PurePosixPath(rel_path.joinpath(tu.name))}.cpp \\") else: - await builder.write(f"\t{tu.source_path(base)} \\") + await builder.write(f"\t{PurePosixPath(tu.source_path(base))} \\") await builder.write("") await builder.write(f"{prefix}_O_FILES := \\") @@ -111,9 +111,9 @@ async def create_rel(module: Module, rel_path: Path): if tu.is_empty: continue if tu.special == "rel": - await builder.write(f"\t$(BUILD_DIR)/{rel_path.joinpath(tu.name)}.o \\") + await builder.write(f"\t$(BUILD_DIR)/{PurePosixPath(rel_path.joinpath(tu.name))}.o \\") else: - await builder.write(f"\t$(BUILD_DIR)/{tu.object_path(base)} \\") + await builder.write(f"\t$(BUILD_DIR)/{PurePosixPath(tu.object_path(base))} \\") await builder.write("") await builder.write(f"{prefix}_LIBS := \\") @@ -250,7 +250,7 @@ async def create_obj_files(modules: Module): if tu.is_empty: continue - await builder.write(f"\t$(BUILD_DIR)/{tu.object_path(base)} \\") + await builder.write(f"\t$(BUILD_DIR)/{PurePosixPath(tu.object_path(base))} \\") await builder.write("") await builder.write(f"LIBS := \\") @@ -288,7 +288,7 @@ async def create_include_link(modules: Module): if name == None: continue - target = lib.makefile_path.joinpath('Makefile') + target = PurePosixPath(lib.makefile_path.joinpath('Makefile')) await builder.write(f"-include {target}") await builder.write("") @@ -297,7 +297,7 @@ async def create_include_link(modules: Module): if module.index == 0: continue - target = module.base_library.makefile_path.joinpath('Makefile') + target = PurePosixPath(module.base_library.makefile_path.joinpath('Makefile')) await builder.write(f"-include {target}") await builder.write("") From 95e34e69fd5692917130c768da9fa63ce9a00879 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Tue, 3 Jan 2023 23:11:10 -0800 Subject: [PATCH 03/19] dol2asm: apply makefile changes from bc428f7f65b97cc9035aed1dc1b71c54ff2e6c3d --- tools/libdol2asm/exporter/makefile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libdol2asm/exporter/makefile.py b/tools/libdol2asm/exporter/makefile.py index e99c5c787f..a0070431e1 100644 --- a/tools/libdol2asm/exporter/makefile.py +++ b/tools/libdol2asm/exporter/makefile.py @@ -61,8 +61,8 @@ async def create_library(library: Library): await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp") await builder.write(f"\t@mkdir -p $(@D)") await builder.write(f"\t@echo building... $<") - await builder.write(f"\t@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp") - await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $@.iconv.cpp") + await builder.write(f"\t@$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp") + await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $(basename $@).cpp") await builder.write("") debug(f"generated Makefile: '{makefile_path}'") @@ -149,8 +149,8 @@ async def create_rel(module: Module, rel_path: Path): await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp") await builder.write(f"\t@echo [{module.index:>3}] building $@") await builder.write(f"\t@mkdir -p $(@D)") - await builder.write(f"\t@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp") - await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $@.iconv.cpp") + await builder.write(f"\t@$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp") + await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $(basename $@).cpp") await builder.write("") for library in libraries[1:]: From 3ae051c356319475c44c9e55a23d61e3b419d700 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Tue, 3 Jan 2023 23:31:18 -0800 Subject: [PATCH 04/19] dol2asm: fix libdol2asm.util import issue --- tools/dol2asm.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/dol2asm.py b/tools/dol2asm.py index 222d4b3234..4c80bfc5b0 100644 --- a/tools/dol2asm.py +++ b/tools/dol2asm.py @@ -12,6 +12,7 @@ from pathlib import Path try: import click import libdol2asm + import libdol2asm.util except ImportError as e: MISSING_PREREQUISITES = ( f"Missing prerequisite python module {e}.\n" From 3786e478869a93c54528bb24ffae418ab1e49a77 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 6 Jan 2023 02:51:48 -0800 Subject: [PATCH 05/19] dol2asm: move exi library, f070ee948f094e68e45fe888072ed042af7973e0 --- tools/dol2asm_settings.py | 1 + tools/libdol2asm/settings.py | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/dol2asm_settings.py b/tools/dol2asm_settings.py index 571d4f50ef..8d73b6ecc5 100644 --- a/tools/dol2asm_settings.py +++ b/tools/dol2asm_settings.py @@ -1613,6 +1613,7 @@ LIBRARY_LUT = [ ("db", "dolphin/"), ("dsp", "dolphin/"), ("dvd", "dolphin/"), + ("exi", "dolphin/"), ("gd", "dolphin/"), ("gf", "dolphin/"), ("gx", "dolphin/"), diff --git a/tools/libdol2asm/settings.py b/tools/libdol2asm/settings.py index c33fcd26b2..84a55c0208 100644 --- a/tools/libdol2asm/settings.py +++ b/tools/libdol2asm/settings.py @@ -1613,6 +1613,7 @@ LIBRARY_LUT = [ ("db", "dolphin/"), ("dsp", "dolphin/"), ("dvd", "dolphin/"), + ("exi", "dolphin/"), ("gd", "dolphin/"), ("gf", "dolphin/"), ("gx", "dolphin/"), From b4bfca89a11521692749f5996350e36cf01d11aa Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 6 Jan 2023 03:38:20 -0800 Subject: [PATCH 06/19] dol2asm: fix incorrect debug function importing into libdol2asm/exporter/makefile.py --- tools/libdol2asm/data/function/store.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/libdol2asm/data/function/store.py b/tools/libdol2asm/data/function/store.py index 48116e6edc..794a26bdde 100644 --- a/tools/libdol2asm/data/function/store.py +++ b/tools/libdol2asm/data/function/store.py @@ -1,8 +1,7 @@ from dataclasses import dataclass, field -from capstone import * -from capstone.ppc import * +from capstone.ppc import PPC_REG_R3 from ...builder import AsyncBuilder from ...types import * From 5aa83db436135272bcb51ec6824ee3c4275285e4 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 6 Jan 2023 03:42:42 -0800 Subject: [PATCH 07/19] dol2asm: generate makefiles that use header dependencies for smarter rebuilds --- Makefile | 2 + tools/libdol2asm/exporter/makefile.py | 24 ++++++++-- tools/transform-dep.py | 69 +++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 4 deletions(-) create mode 100755 tools/transform-dep.py diff --git a/Makefile b/Makefile index 64d37dddd6..8a5cbc7ff9 100644 --- a/Makefile +++ b/Makefile @@ -92,6 +92,8 @@ LDFLAGS := -unused -map $(MAP) -fp hard -nodefaults -w off # Compiler flags CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -str pool,readonly,reuse -RTTI off -maxerrors 5 -enum int $(INCLUDES) +DEPFLAGS := $(if $(DISABLE_DEPS),,-MD) + # O4,p for init.c $(BUILD_DIR)/src/init.o: CFLAGS := -Cpp_exceptions off -proc gekko -fp hard -O4,p -nodefaults -str pool,readonly,reuse -RTTI off -maxerrors 5 -enum int $(INCLUDES) diff --git a/tools/libdol2asm/exporter/makefile.py b/tools/libdol2asm/exporter/makefile.py index a0070431e1..ecdf81454a 100644 --- a/tools/libdol2asm/exporter/makefile.py +++ b/tools/libdol2asm/exporter/makefile.py @@ -58,11 +58,19 @@ async def create_library(library: Library): #await builder.write(f"\t@$(STRIP) -d -R .dead -R .comment {target_path}") await builder.write("") - await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp") + await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp {o_path}/%.d") await builder.write(f"\t@mkdir -p $(@D)") await builder.write(f"\t@echo building... $<") await builder.write(f"\t@$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp") - await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $(basename $@).cpp") + await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp") + await builder.write("\t@if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi") + await builder.write("") + + await builder.write("ifndef DISABLE_DEPS") + await builder.write(f"{prefix}_D_FILES := $({prefix}_O_FILES:.o=.d)") + await builder.write(f"$({prefix}_D_FILES):") + await builder.write(f"include $(wildcard $({prefix}_D_FILES))") + await builder.write("endif") await builder.write("") debug(f"generated Makefile: '{makefile_path}'") @@ -146,11 +154,19 @@ async def create_rel(module: Module, rel_path: Path): await builder.write(f"\t@$(LD) -opt_partial -strip_partial $({prefix}_LDFLAGS) -o $({prefix}_TARGET) @{input_file}") await builder.write("") - await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp") + await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp {o_path}/%.d") await builder.write(f"\t@echo [{module.index:>3}] building $@") await builder.write(f"\t@mkdir -p $(@D)") await builder.write(f"\t@$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp") - await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $(basename $@).cpp") + await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp") + await builder.write("\t@if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi") + await builder.write("") + + await builder.write("ifndef DISABLE_DEPS") + await builder.write(f"{prefix}_D_FILES := $({prefix}_O_FILES:.o=.d)") + await builder.write(f"$({prefix}_D_FILES):") + await builder.write(f"include $(wildcard $({prefix}_D_FILES))") + await builder.write("endif") await builder.write("") for library in libraries[1:]: diff --git a/tools/transform-dep.py b/tools/transform-dep.py new file mode 100755 index 0000000000..bdb29e5013 --- /dev/null +++ b/tools/transform-dep.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 +# borrowed from prime-decomp +import argparse +import os +from platform import uname + +if os.name != 'nt': + wineprefix = os.environ.get('WINEPREFIX', os.path.join(os.environ['HOME'], '.wine')) + winedevices = os.path.join(wineprefix, 'dosdevices') + +def in_wsl() -> bool: + return 'microsoft-standard' in uname().release + +def import_d_file(in_file) -> str: + out_lines = [] + + with open(in_file) as file: + for idx, line in enumerate(file): + if idx == 0: + if line.endswith(' \\\n'): + out_lines.append(line[:-3].replace('\\', '/') + " \\\n") + else: + out_lines.append(line.replace('\\', '/')) + else: + suffix = '' + if line.endswith(' \\\n'): + suffix = ' \\' + path = line.lstrip()[:-3] + else: + path = line.strip() + # lowercase drive letter + path = path[0].lower() + path[1:] + if os.name == 'nt': + path = path.replace('\\', '/') + elif path[0] == 'z': + # shortcut for z: + path = path[2:].replace('\\', '/') + elif in_wsl(): + path = path[0:1] + path[2:] + path = os.path.join('/mnt', path.replace('\\', '/')) + else: + # use $WINEPREFIX/dosdevices to resolve path + path = os.path.realpath(os.path.join(winedevices, path.replace('\\', '/'))) + out_lines.append(f"\t{path}{suffix}\n") + + return ''.join(out_lines) + +def main(): + parser = argparse.ArgumentParser( + description="""Transform a .d file from Wine paths to normal paths""" + ) + parser.add_argument( + "d_file", + help="""Dependency file in""", + ) + parser.add_argument( + "d_file_out", + help="""Dependency file out""", + ) + args = parser.parse_args() + + output = import_d_file(args.d_file) + + with open(args.d_file_out, "w", encoding="UTF-8") as f: + f.write(output) + + +if __name__ == "__main__": + main() \ No newline at end of file From dd984e3b8e9da4251f4c0afea305fb235bc5ff54 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 6 Jan 2023 03:42:56 -0800 Subject: [PATCH 08/19] Generate makefiles from dol2asm --- libs/JSystem/J2DGraph/Makefile | 11 +++++++++-- libs/JSystem/J3DGraphAnimator/Makefile | 11 +++++++++-- libs/JSystem/J3DGraphBase/Makefile | 11 +++++++++-- libs/JSystem/J3DGraphLoader/Makefile | 11 +++++++++-- libs/JSystem/J3DU/Makefile | 11 +++++++++-- libs/JSystem/JAudio2/Makefile | 11 +++++++++-- libs/JSystem/JFramework/Makefile | 11 +++++++++-- libs/JSystem/JGadget/Makefile | 11 +++++++++-- libs/JSystem/JKernel/Makefile | 11 +++++++++-- libs/JSystem/JMath/Makefile | 11 +++++++++-- libs/JSystem/JMessage/Makefile | 11 +++++++++-- libs/JSystem/JParticle/Makefile | 11 +++++++++-- libs/JSystem/JStage/Makefile | 11 +++++++++-- libs/JSystem/JStudio/JStudio/Makefile | 11 +++++++++-- libs/JSystem/JStudio/JStudio_JAudio2/Makefile | 11 +++++++++-- libs/JSystem/JStudio/JStudio_JParticle/Makefile | 11 +++++++++-- libs/JSystem/JStudio/JStudio_JStage/Makefile | 11 +++++++++-- libs/JSystem/JSupport/Makefile | 11 +++++++++-- libs/JSystem/JUtility/Makefile | 11 +++++++++-- libs/MSL_C/Makefile | 11 +++++++++-- libs/Runtime.PPCEABI.H/Makefile | 17 +++++++++++++---- libs/SSystem/SComponent/Makefile | 11 +++++++++-- libs/SSystem/SStandard/Makefile | 11 +++++++++-- libs/TRK_MINNOW_DOLPHIN/Makefile | 12 ++++++++++-- libs/Z2AudioLib/Makefile | 11 +++++++++-- libs/amcstubs/Makefile | 11 +++++++++-- libs/dolphin/ai/Makefile | 12 ++++++++++-- libs/dolphin/ar/Makefile | 11 +++++++++-- libs/dolphin/base/Makefile | 11 +++++++++-- libs/dolphin/card/Makefile | 11 +++++++++-- libs/dolphin/db/Makefile | 11 +++++++++-- libs/dolphin/dsp/Makefile | 11 +++++++++-- libs/dolphin/dvd/Makefile | 11 +++++++++-- libs/dolphin/exi/Makefile | 11 +++++++++-- libs/dolphin/gd/Makefile | 11 +++++++++-- libs/dolphin/gf/Makefile | 11 +++++++++-- libs/dolphin/gx/Makefile | 11 +++++++++-- libs/dolphin/mtx/Makefile | 11 +++++++++-- libs/dolphin/os/Makefile | 11 +++++++++-- libs/dolphin/pad/Makefile | 11 +++++++++-- libs/dolphin/si/Makefile | 11 +++++++++-- libs/dolphin/vi/Makefile | 11 +++++++++-- libs/odemuexi2/Makefile | 11 +++++++++-- libs/odenotstub/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_bh/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_bq/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_dr/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_dre/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_ds/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_gg/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_gm/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_gnd/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_go/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_gos/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_mgn/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_ob/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_oh/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_oh2/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_tn/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_yo/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_yo_ice/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_zant/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_zant_magic/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_zant_mobile/Makefile | 11 +++++++++-- rel/d/a/b/d_a_b_zant_sima/Makefile | 11 +++++++++-- rel/d/a/d_a_L7demo_dr/Makefile | 11 +++++++++-- rel/d/a/d_a_L7low_dr/Makefile | 11 +++++++++-- rel/d/a/d_a_L7op_demo_dr/Makefile | 11 +++++++++-- rel/d/a/d_a_alldie/Makefile | 11 +++++++++-- rel/d/a/d_a_andsw/Makefile | 11 +++++++++-- rel/d/a/d_a_andsw2/Makefile | 11 +++++++++-- rel/d/a/d_a_arrow/Makefile | 11 +++++++++-- rel/d/a/d_a_balloon_2D/Makefile | 11 +++++++++-- rel/d/a/d_a_bd/Makefile | 11 +++++++++-- rel/d/a/d_a_bg/Makefile | 11 +++++++++-- rel/d/a/d_a_bg_obj/Makefile | 11 +++++++++-- rel/d/a/d_a_boomerang/Makefile | 11 +++++++++-- rel/d/a/d_a_bullet/Makefile | 11 +++++++++-- rel/d/a/d_a_canoe/Makefile | 11 +++++++++-- rel/d/a/d_a_coach_2D/Makefile | 11 +++++++++-- rel/d/a/d_a_coach_fire/Makefile | 11 +++++++++-- rel/d/a/d_a_cow/Makefile | 11 +++++++++-- rel/d/a/d_a_crod/Makefile | 11 +++++++++-- rel/d/a/d_a_cstaf/Makefile | 11 +++++++++-- rel/d/a/d_a_cstatue/Makefile | 11 +++++++++-- rel/d/a/d_a_demo00/Makefile | 11 +++++++++-- rel/d/a/d_a_demo_item/Makefile | 11 +++++++++-- rel/d/a/d_a_disappear/Makefile | 11 +++++++++-- rel/d/a/d_a_dmidna/Makefile | 11 +++++++++-- rel/d/a/d_a_do/Makefile | 11 +++++++++-- rel/d/a/d_a_dshutter/Makefile | 11 +++++++++-- rel/d/a/d_a_econt/Makefile | 11 +++++++++-- rel/d/a/d_a_ep/Makefile | 11 +++++++++-- rel/d/a/d_a_formation_mng/Makefile | 11 +++++++++-- rel/d/a/d_a_fr/Makefile | 11 +++++++++-- rel/d/a/d_a_grass/Makefile | 11 +++++++++-- rel/d/a/d_a_guard_mng/Makefile | 11 +++++++++-- rel/d/a/d_a_hitobj/Makefile | 11 +++++++++-- rel/d/a/d_a_horse/Makefile | 11 +++++++++-- rel/d/a/d_a_hozelda/Makefile | 11 +++++++++-- rel/d/a/d_a_izumi_gate/Makefile | 11 +++++++++-- rel/d/a/d_a_kago/Makefile | 11 +++++++++-- rel/d/a/d_a_mant/Makefile | 11 +++++++++-- rel/d/a/d_a_mg_fish/Makefile | 11 +++++++++-- rel/d/a/d_a_mg_fshop/Makefile | 11 +++++++++-- rel/d/a/d_a_mg_rod/Makefile | 11 +++++++++-- rel/d/a/d_a_midna/Makefile | 11 +++++++++-- rel/d/a/d_a_mirror/Makefile | 11 +++++++++-- rel/d/a/d_a_movie_player/Makefile | 11 +++++++++-- rel/d/a/d_a_myna/Makefile | 11 +++++++++-- rel/d/a/d_a_nbomb/Makefile | 11 +++++++++-- rel/d/a/d_a_ni/Makefile | 11 +++++++++-- rel/d/a/d_a_passer_mng/Makefile | 11 +++++++++-- rel/d/a/d_a_path_line/Makefile | 11 +++++++++-- rel/d/a/d_a_peru/Makefile | 11 +++++++++-- rel/d/a/d_a_ppolamp/Makefile | 11 +++++++++-- rel/d/a/d_a_scene_exit/Makefile | 11 +++++++++-- rel/d/a/d_a_scene_exit2/Makefile | 11 +++++++++-- rel/d/a/d_a_set_bgobj/Makefile | 11 +++++++++-- rel/d/a/d_a_shop_item/Makefile | 11 +++++++++-- rel/d/a/d_a_skip_2D/Makefile | 11 +++++++++-- rel/d/a/d_a_spinner/Makefile | 11 +++++++++-- rel/d/a/d_a_sq/Makefile | 11 +++++++++-- rel/d/a/d_a_startAndGoal/Makefile | 11 +++++++++-- rel/d/a/d_a_suspend/Makefile | 11 +++++++++-- rel/d/a/d_a_swBall/Makefile | 11 +++++++++-- rel/d/a/d_a_swLBall/Makefile | 11 +++++++++-- rel/d/a/d_a_swTime/Makefile | 11 +++++++++-- rel/d/a/d_a_swc00/Makefile | 11 +++++++++-- rel/d/a/d_a_swhit0/Makefile | 11 +++++++++-- rel/d/a/d_a_talk/Makefile | 11 +++++++++-- rel/d/a/d_a_tbox/Makefile | 11 +++++++++-- rel/d/a/d_a_tbox2/Makefile | 11 +++++++++-- rel/d/a/d_a_tboxSw/Makefile | 11 +++++++++-- rel/d/a/d_a_title/Makefile | 11 +++++++++-- rel/d/a/d_a_vrbox/Makefile | 11 +++++++++-- rel/d/a/d_a_vrbox2/Makefile | 11 +++++++++-- rel/d/a/d_a_warp_bug/Makefile | 11 +++++++++-- rel/d/a/d_a_ykgr/Makefile | 11 +++++++++-- rel/d/a/door/d_a_door_boss/Makefile | 11 +++++++++-- rel/d/a/door/d_a_door_bossL5/Makefile | 11 +++++++++-- rel/d/a/door/d_a_door_bossl1/Makefile | 11 +++++++++-- rel/d/a/door/d_a_door_dbdoor00/Makefile | 11 +++++++++-- rel/d/a/door/d_a_door_knob00/Makefile | 11 +++++++++-- rel/d/a/door/d_a_door_mbossL1/Makefile | 11 +++++++++-- rel/d/a/door/d_a_door_push/Makefile | 11 +++++++++-- rel/d/a/door/d_a_door_shutter/Makefile | 11 +++++++++-- rel/d/a/door/d_a_door_spiral/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ai/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_arrow/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ba/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_bee/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_bg/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_bi/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_bi_leaf/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_bs/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_bu/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_bug/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_cr/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_cr_egg/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_db/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_db_leaf/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_dd/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_df/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_dk/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_dn/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_dt/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_fb/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_fk/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_fm/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_fs/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_fz/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ga/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_gb/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ge/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_gi/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_gm/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_gob/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_gs/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_hb/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_hb_leaf/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_hm/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_hp/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_hz/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_hzelda/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_is/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_kg/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_kk/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_kr/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_mb/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_md/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_mf/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_mk/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_mk_bo/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_mm/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_mm_mt/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ms/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_nest/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_nz/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_oc/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_oct_bg/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ot/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ph/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_pm/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_po/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_pz/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_rb/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_rd/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_rdb/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_rdy/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_s1/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_sb/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_sf/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_sg/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_sh/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_sm/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_sm2/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_st/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_st_line/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_sw/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_th/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_th_ball/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_tk/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_tk2/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_tk_ball/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_tt/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_vt/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_warpappear/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_wb/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ws/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ww/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_yc/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_yd/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_yd_leaf/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_yg/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_yh/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_yk/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ym/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ym_tag/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_ymb/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_yr/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_zh/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_zm/Makefile | 11 +++++++++-- rel/d/a/e/d_a_e_zs/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag00/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag01/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag02/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag03/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag04/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag05/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag06/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag07/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag08/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag09/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag10/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag11/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag12/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag13/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag14/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag15/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag16/Makefile | 11 +++++++++-- rel/d/a/kytag/d_a_kytag17/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_aru/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_ash/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_ashB/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_bans/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_besu/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_blue_ns/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_bou/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_bouS/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_cdn3/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_chat/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_chin/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_clerka/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_clerkb/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_clerkt/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_coach/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_df/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_doc/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_doorboy/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_drainSol/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_du/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_fairy/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_fairy_seirei/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_fguard/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_fish/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_gnd/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_gra/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_grc/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_grd/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_grm/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_grmc/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_gro/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_grr/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_grs/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_grz/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_guard/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_gwolf/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_hanjo/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_henna/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_henna0/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_hoz/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_impal/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_inko/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_ins/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_jagar/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kakashi/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kasi_hana/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kasi_kyu/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kasi_mich/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kdk/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kkri/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kn/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_knj/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kolin/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kolinb/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_ks/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_kyury/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_len/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_lf/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_lud/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_maro/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_midp/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_mk/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_moi/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_moir/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_myna2/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_ne/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_p2/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_pachi_besu/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_pachi_maro/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_pachi_taro/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_passer/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_passer2/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_post/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_pouya/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_prayer/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_raca/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_rafrel/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_saru/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_seib/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_seic/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_seid/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_seira/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_seira2/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_seirei/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_shad/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_shaman/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_shoe/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_shop0/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_shop_maro/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_sola/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_soldierA/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_soldierB/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_sq/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_taro/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_the/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_theB/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_tk/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_tkc/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_tkj/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_tkj2/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_tks/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_toby/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_tr/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_uri/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_worm/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_wrestler/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_yamid/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_yamis/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_yamit/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_yelia/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_ykm/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_ykw/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_zanb/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_zant/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_zelR/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_zelRo/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_zelda/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_zra/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_zrc/Makefile | 11 +++++++++-- rel/d/a/npc/d_a_npc_zrz/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_Lv5Key/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_Turara/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_TvCdlst/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_Y_taihou/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_amiShutter/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ari/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_automata/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_avalanche/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_balloon/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_barDesk/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_batta/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bbox/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bed/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bemos/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bhashi/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bhbridge/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bk_leaf/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bkdoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bky_rock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bmWindow/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bmshutter/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bombf/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bosswarp/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_boumato/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_brakeeff/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_brg/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bsGate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_bubblePilar/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_burnbox/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_carry/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_catdoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_cb/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_cblock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_cboard/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_cdoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_chandelier/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_chest/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_cho/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_cowdoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_crope/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_crvfence/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_crvgate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_crvhahen/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_crvlh_down/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_crvlh_up/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_crvsteel/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_crystal/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_cwall/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_damCps/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_dan/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_digholl/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_digplace/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_digsnow/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_dmelevator/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_drop/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_dust/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_eff/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_enemy_create/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_fallobj/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_fan/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_fchain/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_fireWood/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_fireWood2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_firepillar/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_firepillar2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_flag/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_flag2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_flag3/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_fmobj/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_food/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_fw/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_gadget/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ganonwall/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ganonwall2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_gb/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_geyser/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_glowSphere/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_gm/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_goGate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_gomikabe/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_gptaru/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_gra2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_graWall/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_gra_rock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_grave_stone/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_groundwater/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_grz_rock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_h_saku/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_hakai_brl/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_hakai_ftr/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_hasu2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_hata/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_hb/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_hbombkoya/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_heavySw/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_hfuta/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_hhashi/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_hsTarget/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ice_l/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ice_s/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_iceblock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_iceleaf/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ihasi/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ikada/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_inobone/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ita/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_itamato/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ito/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kabuto/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kag/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kage/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kago/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kaisou/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kamakiri/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kanban2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kantera/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_katatsumuri/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kazeneko/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kbacket/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kbox/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_key/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_keyhole/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kgate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ki/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kiPot/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kita/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kjgjs/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kkanban/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_klift00/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_knBullet/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kshutter/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ktonfire/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kuwagata/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kwheel00/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kwheel01/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_kznkarm/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ladder/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_laundry/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_laundry_rope/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lbox/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_life_container/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lp/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv1Candle00/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv1Candle01/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv2candle/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv3Candle/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv3Water/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv3Water2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv3WaterB/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv3saka00/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv3waterEff/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4CandleDemoTag/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4CandleTag/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4EdShutter/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4Gate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4HsTarget/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4PoGate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4RailWall/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4SlideWall/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4bridge/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4chandelier/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4digsand/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4floor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4gear/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4prelvtr/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4prwall/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv4sand/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv5FloorBoard/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv5IceWall/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv5SwIce/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv5ychndlr/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv5yiblltray/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6ChangeGate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6FurikoTrap/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6Lblock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6SwGate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6SzGate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6Tenbin/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6TogeRoll/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6TogeTrap/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6bemos/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6bemos2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6egate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6elevta/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv6swturn/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv7BsGate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv7PropellerY/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv7bridge/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv8KekkaiTrap/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv8Lift/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv8OptiLift/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv8UdFloor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_lv9SwShutter/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_magLift/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_magLiftRot/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_magne_arm/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_maki/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_master_sword/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_mato/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_metalbox/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_mgate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_mhole/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_mie/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_movebox/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_msima/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_mvstair/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_myogan/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_nagaisu/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_nameplate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_nan/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ndoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_nougu/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_octhashi/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_oiltubo/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_onsen/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_onsenFire/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_onsenTaru/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ornament_cloth/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_pdoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_pdtile/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_pdwall/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_picture/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_pillar/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_pleaf/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_poCandle/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_poFire/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_poTbox/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_prop/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_pumpkin/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_rcircle/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_rfHole/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_rgate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_riverrock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_rock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_rope_bridge/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_rotBridge/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_rotTrap/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_roten/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_rstair/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_rw/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_saidan/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_sakuita/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_sakuita_rope/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_scannon/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_scannon_crs/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_scannon_ten/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_sekidoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_sekizo/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_sekizoa/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_shield/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_sm_door/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_smallkey/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_smgdoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_smoke/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_smtile/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_smw_stone/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_snowEffTag/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_snow_soup/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_so/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_spinLift/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ss_drink/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ss_item/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_stairBlock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_stick/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_stone/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_stonemark/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_stopper/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_stopper2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_suisya/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_sw/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swBallA/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swBallB/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swBallC/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swLight/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swallshutter/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swchain/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swhang/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_sword/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swpropeller/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swpush/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swpush2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swpush5/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swspinner/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_swturn/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_syRock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_szbridge/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_taFence/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_table/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_takaraDai/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_tatigi/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ten/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_testcube/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_tgake/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_thashi/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_thdoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_timeFire/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_timer/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_tks/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_tmoon/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_toaru_maki/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_toby/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_tobyhouse/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_togeTrap/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_tombo/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_tornado/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_tornado2/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_tp/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_treesh/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_twGate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_udoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_usaku/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_vground/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_volcball/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_volcbom/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_warp_kbrg/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_warp_obrg/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_waterGate/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_waterPillar/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_waterfall/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_wchain/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_wdStick/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_web0/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_web1/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_well_cover/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_wflag/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_wind_stone/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_window/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_wood_pendulum/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_wood_statue/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_wsword/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_yel_bag/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_yobikusa/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_yousei/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_ystone/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_zcloth/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_zdoor/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_zrTurara/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_zrTuraraRock/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_zraMark/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_zra_freeze/Makefile | 11 +++++++++-- rel/d/a/obj/d_a_obj_zra_rock/Makefile | 11 +++++++++-- .../a/obj/mirror/d_a_obj_mirror_6pole/Makefile | 11 +++++++++-- .../a/obj/mirror/d_a_obj_mirror_chain/Makefile | 11 +++++++++-- rel/d/a/obj/mirror/d_a_obj_mirror_sand/Makefile | 11 +++++++++-- .../a/obj/mirror/d_a_obj_mirror_screw/Makefile | 11 +++++++++-- .../a/obj/mirror/d_a_obj_mirror_table/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_Lv6Gate/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_Lv7Gate/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_Lv8Gate/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_TWgate/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_ajnot/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_allmato/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_arena/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_assistance/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_attack_item/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_attention/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_bottle_item/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_camera/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_chgrestart/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_chkpoint/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_cstasw/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_csw/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_escape/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_event/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_evt/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_evtarea/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_evtmsg/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_firewall/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_gra/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_gstart/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_guard/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_hinit/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_hjump/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_howl/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_hstop/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_instruction/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_kago_fall/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_kmsg/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_lantern/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_lightball/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_lv2prchk/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_lv5soup/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_lv6CstaSw/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_magne/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_mhint/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_mist/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_mmsg/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_msg/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_mstop/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_mwait/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_myna2/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_myna_light/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_pachi/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_poFire/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_push/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_qs/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_ret_room/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_river_back/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_rmbit_sw/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_schedule/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_setBall/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_setrestart/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_shop_camera/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_shop_item/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_smk_emt/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_spinner/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_sppath/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_spring/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_ss_drink/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_statue_evt/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_stream/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_telop/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_theB_hint/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_wara_howl/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_watchge/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_waterfall/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_wljump/Makefile | 11 +++++++++-- rel/d/a/tag/d_a_tag_yami/Makefile | 11 +++++++++-- rel/f_pc/f_pc_profile_lst/Makefile | 11 +++++++++-- 801 files changed, 7215 insertions(+), 1604 deletions(-) diff --git a/libs/JSystem/J2DGraph/Makefile b/libs/JSystem/J2DGraph/Makefile index d3fc92ef46..708cb4ddd5 100644 --- a/libs/JSystem/J2DGraph/Makefile +++ b/libs/JSystem/J2DGraph/Makefile @@ -55,9 +55,16 @@ $(BUILD_DIR)/libJ2DGraph.a: $(LIBJ2DGRAPH_A_O_FILES) @echo $(LIBJ2DGRAPH_A_O_FILES) > build/LIBJ2DGRAPH_A_ofiles @$(LD) -xm l $(LIBJ2DGRAPH_A_LDFLAGS) -o $(BUILD_DIR)/libJ2DGraph.a @build/LIBJ2DGRAPH_A_ofiles -$(BUILD_DIR)/libs/JSystem/J2DGraph/%.o: libs/JSystem/J2DGraph/%.cpp +$(BUILD_DIR)/libs/JSystem/J2DGraph/%.o: libs/JSystem/J2DGraph/%.cpp $(BUILD_DIR)/libs/JSystem/J2DGraph/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJ2DGRAPH_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJ2DGRAPH_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJ2DGRAPH_A_D_FILES := $(LIBJ2DGRAPH_A_O_FILES:.o=.d) +$(LIBJ2DGRAPH_A_D_FILES): +include $(wildcard $(LIBJ2DGRAPH_A_D_FILES)) +endif diff --git a/libs/JSystem/J3DGraphAnimator/Makefile b/libs/JSystem/J3DGraphAnimator/Makefile index cf3389d85e..6519b67f82 100644 --- a/libs/JSystem/J3DGraphAnimator/Makefile +++ b/libs/JSystem/J3DGraphAnimator/Makefile @@ -41,9 +41,16 @@ $(BUILD_DIR)/libJ3DGraphAnimator.a: $(LIBJ3DGRAPHANIMATOR_A_O_FILES) @echo $(LIBJ3DGRAPHANIMATOR_A_O_FILES) > build/LIBJ3DGRAPHANIMATOR_A_ofiles @$(LD) -xm l $(LIBJ3DGRAPHANIMATOR_A_LDFLAGS) -o $(BUILD_DIR)/libJ3DGraphAnimator.a @build/LIBJ3DGRAPHANIMATOR_A_ofiles -$(BUILD_DIR)/libs/JSystem/J3DGraphAnimator/%.o: libs/JSystem/J3DGraphAnimator/%.cpp +$(BUILD_DIR)/libs/JSystem/J3DGraphAnimator/%.o: libs/JSystem/J3DGraphAnimator/%.cpp $(BUILD_DIR)/libs/JSystem/J3DGraphAnimator/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJ3DGRAPHANIMATOR_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJ3DGRAPHANIMATOR_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJ3DGRAPHANIMATOR_A_D_FILES := $(LIBJ3DGRAPHANIMATOR_A_O_FILES:.o=.d) +$(LIBJ3DGRAPHANIMATOR_A_D_FILES): +include $(wildcard $(LIBJ3DGRAPHANIMATOR_A_D_FILES)) +endif diff --git a/libs/JSystem/J3DGraphBase/Makefile b/libs/JSystem/J3DGraphBase/Makefile index 82af2f83b3..edce8afed5 100644 --- a/libs/JSystem/J3DGraphBase/Makefile +++ b/libs/JSystem/J3DGraphBase/Makefile @@ -47,9 +47,16 @@ $(BUILD_DIR)/libJ3DGraphBase.a: $(LIBJ3DGRAPHBASE_A_O_FILES) @echo $(LIBJ3DGRAPHBASE_A_O_FILES) > build/LIBJ3DGRAPHBASE_A_ofiles @$(LD) -xm l $(LIBJ3DGRAPHBASE_A_LDFLAGS) -o $(BUILD_DIR)/libJ3DGraphBase.a @build/LIBJ3DGRAPHBASE_A_ofiles -$(BUILD_DIR)/libs/JSystem/J3DGraphBase/%.o: libs/JSystem/J3DGraphBase/%.cpp +$(BUILD_DIR)/libs/JSystem/J3DGraphBase/%.o: libs/JSystem/J3DGraphBase/%.cpp $(BUILD_DIR)/libs/JSystem/J3DGraphBase/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJ3DGRAPHBASE_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJ3DGRAPHBASE_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJ3DGRAPHBASE_A_D_FILES := $(LIBJ3DGRAPHBASE_A_O_FILES:.o=.d) +$(LIBJ3DGRAPHBASE_A_D_FILES): +include $(wildcard $(LIBJ3DGRAPHBASE_A_D_FILES)) +endif diff --git a/libs/JSystem/J3DGraphLoader/Makefile b/libs/JSystem/J3DGraphLoader/Makefile index 01b3dee5bc..2330fa5516 100644 --- a/libs/JSystem/J3DGraphLoader/Makefile +++ b/libs/JSystem/J3DGraphLoader/Makefile @@ -35,9 +35,16 @@ $(BUILD_DIR)/libJ3DGraphLoader.a: $(LIBJ3DGRAPHLOADER_A_O_FILES) @echo $(LIBJ3DGRAPHLOADER_A_O_FILES) > build/LIBJ3DGRAPHLOADER_A_ofiles @$(LD) -xm l $(LIBJ3DGRAPHLOADER_A_LDFLAGS) -o $(BUILD_DIR)/libJ3DGraphLoader.a @build/LIBJ3DGRAPHLOADER_A_ofiles -$(BUILD_DIR)/libs/JSystem/J3DGraphLoader/%.o: libs/JSystem/J3DGraphLoader/%.cpp +$(BUILD_DIR)/libs/JSystem/J3DGraphLoader/%.o: libs/JSystem/J3DGraphLoader/%.cpp $(BUILD_DIR)/libs/JSystem/J3DGraphLoader/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJ3DGRAPHLOADER_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJ3DGRAPHLOADER_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJ3DGRAPHLOADER_A_D_FILES := $(LIBJ3DGRAPHLOADER_A_O_FILES:.o=.d) +$(LIBJ3DGRAPHLOADER_A_D_FILES): +include $(wildcard $(LIBJ3DGRAPHLOADER_A_D_FILES)) +endif diff --git a/libs/JSystem/J3DU/Makefile b/libs/JSystem/J3DU/Makefile index 5d551ad846..aecbabd667 100644 --- a/libs/JSystem/J3DU/Makefile +++ b/libs/JSystem/J3DU/Makefile @@ -23,9 +23,16 @@ $(BUILD_DIR)/libJ3DU.a: $(LIBJ3DU_A_O_FILES) @echo $(LIBJ3DU_A_O_FILES) > build/LIBJ3DU_A_ofiles @$(LD) -xm l $(LIBJ3DU_A_LDFLAGS) -o $(BUILD_DIR)/libJ3DU.a @build/LIBJ3DU_A_ofiles -$(BUILD_DIR)/libs/JSystem/J3DU/%.o: libs/JSystem/J3DU/%.cpp +$(BUILD_DIR)/libs/JSystem/J3DU/%.o: libs/JSystem/J3DU/%.cpp $(BUILD_DIR)/libs/JSystem/J3DU/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJ3DU_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJ3DU_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJ3DU_A_D_FILES := $(LIBJ3DU_A_O_FILES:.o=.d) +$(LIBJ3DU_A_D_FILES): +include $(wildcard $(LIBJ3DU_A_D_FILES)) +endif diff --git a/libs/JSystem/JAudio2/Makefile b/libs/JSystem/JAudio2/Makefile index 28a05a45da..44416c8b62 100644 --- a/libs/JSystem/JAudio2/Makefile +++ b/libs/JSystem/JAudio2/Makefile @@ -155,9 +155,16 @@ $(BUILD_DIR)/libJAudio2.a: $(LIBJAUDIO2_A_O_FILES) @echo $(LIBJAUDIO2_A_O_FILES) > build/LIBJAUDIO2_A_ofiles @$(LD) -xm l $(LIBJAUDIO2_A_LDFLAGS) -o $(BUILD_DIR)/libJAudio2.a @build/LIBJAUDIO2_A_ofiles -$(BUILD_DIR)/libs/JSystem/JAudio2/%.o: libs/JSystem/JAudio2/%.cpp +$(BUILD_DIR)/libs/JSystem/JAudio2/%.o: libs/JSystem/JAudio2/%.cpp $(BUILD_DIR)/libs/JSystem/JAudio2/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJAUDIO2_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJAUDIO2_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJAUDIO2_A_D_FILES := $(LIBJAUDIO2_A_O_FILES:.o=.d) +$(LIBJAUDIO2_A_D_FILES): +include $(wildcard $(LIBJAUDIO2_A_D_FILES)) +endif diff --git a/libs/JSystem/JFramework/Makefile b/libs/JSystem/JFramework/Makefile index 8df842d47a..0365ce3893 100644 --- a/libs/JSystem/JFramework/Makefile +++ b/libs/JSystem/JFramework/Makefile @@ -23,9 +23,16 @@ $(BUILD_DIR)/libJFramework.a: $(LIBJFRAMEWORK_A_O_FILES) @echo $(LIBJFRAMEWORK_A_O_FILES) > build/LIBJFRAMEWORK_A_ofiles @$(LD) -xm l $(LIBJFRAMEWORK_A_LDFLAGS) -o $(BUILD_DIR)/libJFramework.a @build/LIBJFRAMEWORK_A_ofiles -$(BUILD_DIR)/libs/JSystem/JFramework/%.o: libs/JSystem/JFramework/%.cpp +$(BUILD_DIR)/libs/JSystem/JFramework/%.o: libs/JSystem/JFramework/%.cpp $(BUILD_DIR)/libs/JSystem/JFramework/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJFRAMEWORK_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJFRAMEWORK_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJFRAMEWORK_A_D_FILES := $(LIBJFRAMEWORK_A_O_FILES:.o=.d) +$(LIBJFRAMEWORK_A_D_FILES): +include $(wildcard $(LIBJFRAMEWORK_A_D_FILES)) +endif diff --git a/libs/JSystem/JGadget/Makefile b/libs/JSystem/JGadget/Makefile index 68f5c8eeb6..add15f043e 100644 --- a/libs/JSystem/JGadget/Makefile +++ b/libs/JSystem/JGadget/Makefile @@ -25,9 +25,16 @@ $(BUILD_DIR)/libJGadget.a: $(LIBJGADGET_A_O_FILES) @echo $(LIBJGADGET_A_O_FILES) > build/LIBJGADGET_A_ofiles @$(LD) -xm l $(LIBJGADGET_A_LDFLAGS) -o $(BUILD_DIR)/libJGadget.a @build/LIBJGADGET_A_ofiles -$(BUILD_DIR)/libs/JSystem/JGadget/%.o: libs/JSystem/JGadget/%.cpp +$(BUILD_DIR)/libs/JSystem/JGadget/%.o: libs/JSystem/JGadget/%.cpp $(BUILD_DIR)/libs/JSystem/JGadget/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJGADGET_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJGADGET_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJGADGET_A_D_FILES := $(LIBJGADGET_A_O_FILES:.o=.d) +$(LIBJGADGET_A_D_FILES): +include $(wildcard $(LIBJGADGET_A_D_FILES)) +endif diff --git a/libs/JSystem/JKernel/Makefile b/libs/JSystem/JKernel/Makefile index 3e1c472dce..d8a9906a08 100644 --- a/libs/JSystem/JKernel/Makefile +++ b/libs/JSystem/JKernel/Makefile @@ -69,9 +69,16 @@ $(BUILD_DIR)/libJKernel.a: $(LIBJKERNEL_A_O_FILES) @echo $(LIBJKERNEL_A_O_FILES) > build/LIBJKERNEL_A_ofiles @$(LD) -xm l $(LIBJKERNEL_A_LDFLAGS) -o $(BUILD_DIR)/libJKernel.a @build/LIBJKERNEL_A_ofiles -$(BUILD_DIR)/libs/JSystem/JKernel/%.o: libs/JSystem/JKernel/%.cpp +$(BUILD_DIR)/libs/JSystem/JKernel/%.o: libs/JSystem/JKernel/%.cpp $(BUILD_DIR)/libs/JSystem/JKernel/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJKERNEL_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJKERNEL_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJKERNEL_A_D_FILES := $(LIBJKERNEL_A_O_FILES:.o=.d) +$(LIBJKERNEL_A_D_FILES): +include $(wildcard $(LIBJKERNEL_A_D_FILES)) +endif diff --git a/libs/JSystem/JMath/Makefile b/libs/JSystem/JMath/Makefile index abb8024475..4c7cd678dc 100644 --- a/libs/JSystem/JMath/Makefile +++ b/libs/JSystem/JMath/Makefile @@ -25,9 +25,16 @@ $(BUILD_DIR)/libJMath.a: $(LIBJMATH_A_O_FILES) @echo $(LIBJMATH_A_O_FILES) > build/LIBJMATH_A_ofiles @$(LD) -xm l $(LIBJMATH_A_LDFLAGS) -o $(BUILD_DIR)/libJMath.a @build/LIBJMATH_A_ofiles -$(BUILD_DIR)/libs/JSystem/JMath/%.o: libs/JSystem/JMath/%.cpp +$(BUILD_DIR)/libs/JSystem/JMath/%.o: libs/JSystem/JMath/%.cpp $(BUILD_DIR)/libs/JSystem/JMath/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJMATH_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJMATH_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJMATH_A_D_FILES := $(LIBJMATH_A_O_FILES:.o=.d) +$(LIBJMATH_A_D_FILES): +include $(wildcard $(LIBJMATH_A_D_FILES)) +endif diff --git a/libs/JSystem/JMessage/Makefile b/libs/JSystem/JMessage/Makefile index f5755e34f1..4c8687e0e4 100644 --- a/libs/JSystem/JMessage/Makefile +++ b/libs/JSystem/JMessage/Makefile @@ -29,9 +29,16 @@ $(BUILD_DIR)/libJMessage.a: $(LIBJMESSAGE_A_O_FILES) @echo $(LIBJMESSAGE_A_O_FILES) > build/LIBJMESSAGE_A_ofiles @$(LD) -xm l $(LIBJMESSAGE_A_LDFLAGS) -o $(BUILD_DIR)/libJMessage.a @build/LIBJMESSAGE_A_ofiles -$(BUILD_DIR)/libs/JSystem/JMessage/%.o: libs/JSystem/JMessage/%.cpp +$(BUILD_DIR)/libs/JSystem/JMessage/%.o: libs/JSystem/JMessage/%.cpp $(BUILD_DIR)/libs/JSystem/JMessage/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJMESSAGE_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJMESSAGE_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJMESSAGE_A_D_FILES := $(LIBJMESSAGE_A_O_FILES:.o=.d) +$(LIBJMESSAGE_A_D_FILES): +include $(wildcard $(LIBJMESSAGE_A_D_FILES)) +endif diff --git a/libs/JSystem/JParticle/Makefile b/libs/JSystem/JParticle/Makefile index 8f8c1a34f6..0bdcd7d0ec 100644 --- a/libs/JSystem/JParticle/Makefile +++ b/libs/JSystem/JParticle/Makefile @@ -49,9 +49,16 @@ $(BUILD_DIR)/libJParticle.a: $(LIBJPARTICLE_A_O_FILES) @echo $(LIBJPARTICLE_A_O_FILES) > build/LIBJPARTICLE_A_ofiles @$(LD) -xm l $(LIBJPARTICLE_A_LDFLAGS) -o $(BUILD_DIR)/libJParticle.a @build/LIBJPARTICLE_A_ofiles -$(BUILD_DIR)/libs/JSystem/JParticle/%.o: libs/JSystem/JParticle/%.cpp +$(BUILD_DIR)/libs/JSystem/JParticle/%.o: libs/JSystem/JParticle/%.cpp $(BUILD_DIR)/libs/JSystem/JParticle/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJPARTICLE_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJPARTICLE_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJPARTICLE_A_D_FILES := $(LIBJPARTICLE_A_O_FILES:.o=.d) +$(LIBJPARTICLE_A_D_FILES): +include $(wildcard $(LIBJPARTICLE_A_D_FILES)) +endif diff --git a/libs/JSystem/JStage/Makefile b/libs/JSystem/JStage/Makefile index b6270b2528..fd5dc316be 100644 --- a/libs/JSystem/JStage/Makefile +++ b/libs/JSystem/JStage/Makefile @@ -33,9 +33,16 @@ $(BUILD_DIR)/libJStage.a: $(LIBJSTAGE_A_O_FILES) @echo $(LIBJSTAGE_A_O_FILES) > build/LIBJSTAGE_A_ofiles @$(LD) -xm l $(LIBJSTAGE_A_LDFLAGS) -o $(BUILD_DIR)/libJStage.a @build/LIBJSTAGE_A_ofiles -$(BUILD_DIR)/libs/JSystem/JStage/%.o: libs/JSystem/JStage/%.cpp +$(BUILD_DIR)/libs/JSystem/JStage/%.o: libs/JSystem/JStage/%.cpp $(BUILD_DIR)/libs/JSystem/JStage/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJSTAGE_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJSTAGE_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJSTAGE_A_D_FILES := $(LIBJSTAGE_A_O_FILES:.o=.d) +$(LIBJSTAGE_A_D_FILES): +include $(wildcard $(LIBJSTAGE_A_D_FILES)) +endif diff --git a/libs/JSystem/JStudio/JStudio/Makefile b/libs/JSystem/JStudio/JStudio/Makefile index babd1d84de..5a0414ecda 100644 --- a/libs/JSystem/JStudio/JStudio/Makefile +++ b/libs/JSystem/JStudio/JStudio/Makefile @@ -51,9 +51,16 @@ $(BUILD_DIR)/libJStudio.a: $(LIBJSTUDIO_A_O_FILES) @echo $(LIBJSTUDIO_A_O_FILES) > build/LIBJSTUDIO_A_ofiles @$(LD) -xm l $(LIBJSTUDIO_A_LDFLAGS) -o $(BUILD_DIR)/libJStudio.a @build/LIBJSTUDIO_A_ofiles -$(BUILD_DIR)/libs/JSystem/JStudio/JStudio/%.o: libs/JSystem/JStudio/JStudio/%.cpp +$(BUILD_DIR)/libs/JSystem/JStudio/JStudio/%.o: libs/JSystem/JStudio/JStudio/%.cpp $(BUILD_DIR)/libs/JSystem/JStudio/JStudio/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJSTUDIO_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJSTUDIO_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJSTUDIO_A_D_FILES := $(LIBJSTUDIO_A_O_FILES:.o=.d) +$(LIBJSTUDIO_A_D_FILES): +include $(wildcard $(LIBJSTUDIO_A_D_FILES)) +endif diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/Makefile b/libs/JSystem/JStudio/JStudio_JAudio2/Makefile index 5ec8a7cd29..1ced071d60 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/Makefile +++ b/libs/JSystem/JStudio/JStudio_JAudio2/Makefile @@ -23,9 +23,16 @@ $(BUILD_DIR)/libJStudio_JAudio2.a: $(LIBJSTUDIO_JAUDIO2_A_O_FILES) @echo $(LIBJSTUDIO_JAUDIO2_A_O_FILES) > build/LIBJSTUDIO_JAUDIO2_A_ofiles @$(LD) -xm l $(LIBJSTUDIO_JAUDIO2_A_LDFLAGS) -o $(BUILD_DIR)/libJStudio_JAudio2.a @build/LIBJSTUDIO_JAUDIO2_A_ofiles -$(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JAudio2/%.o: libs/JSystem/JStudio/JStudio_JAudio2/%.cpp +$(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JAudio2/%.o: libs/JSystem/JStudio/JStudio_JAudio2/%.cpp $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JAudio2/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJSTUDIO_JAUDIO2_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJSTUDIO_JAUDIO2_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJSTUDIO_JAUDIO2_A_D_FILES := $(LIBJSTUDIO_JAUDIO2_A_O_FILES:.o=.d) +$(LIBJSTUDIO_JAUDIO2_A_D_FILES): +include $(wildcard $(LIBJSTUDIO_JAUDIO2_A_D_FILES)) +endif diff --git a/libs/JSystem/JStudio/JStudio_JParticle/Makefile b/libs/JSystem/JStudio/JStudio_JParticle/Makefile index b8db51d5b9..20244d3886 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/Makefile +++ b/libs/JSystem/JStudio/JStudio_JParticle/Makefile @@ -23,9 +23,16 @@ $(BUILD_DIR)/libJStudio_JParticle.a: $(LIBJSTUDIO_JPARTICLE_A_O_FILES) @echo $(LIBJSTUDIO_JPARTICLE_A_O_FILES) > build/LIBJSTUDIO_JPARTICLE_A_ofiles @$(LD) -xm l $(LIBJSTUDIO_JPARTICLE_A_LDFLAGS) -o $(BUILD_DIR)/libJStudio_JParticle.a @build/LIBJSTUDIO_JPARTICLE_A_ofiles -$(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JParticle/%.o: libs/JSystem/JStudio/JStudio_JParticle/%.cpp +$(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JParticle/%.o: libs/JSystem/JStudio/JStudio_JParticle/%.cpp $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JParticle/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJSTUDIO_JPARTICLE_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJSTUDIO_JPARTICLE_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJSTUDIO_JPARTICLE_A_D_FILES := $(LIBJSTUDIO_JPARTICLE_A_O_FILES:.o=.d) +$(LIBJSTUDIO_JPARTICLE_A_D_FILES): +include $(wildcard $(LIBJSTUDIO_JPARTICLE_A_D_FILES)) +endif diff --git a/libs/JSystem/JStudio/JStudio_JStage/Makefile b/libs/JSystem/JStudio/JStudio_JStage/Makefile index 4c48f6ec89..315f641ff7 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/Makefile +++ b/libs/JSystem/JStudio/JStudio_JStage/Makefile @@ -33,9 +33,16 @@ $(BUILD_DIR)/libJStudio_JStage.a: $(LIBJSTUDIO_JSTAGE_A_O_FILES) @echo $(LIBJSTUDIO_JSTAGE_A_O_FILES) > build/LIBJSTUDIO_JSTAGE_A_ofiles @$(LD) -xm l $(LIBJSTUDIO_JSTAGE_A_LDFLAGS) -o $(BUILD_DIR)/libJStudio_JStage.a @build/LIBJSTUDIO_JSTAGE_A_ofiles -$(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JStage/%.o: libs/JSystem/JStudio/JStudio_JStage/%.cpp +$(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JStage/%.o: libs/JSystem/JStudio/JStudio_JStage/%.cpp $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JStage/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJSTUDIO_JSTAGE_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJSTUDIO_JSTAGE_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJSTUDIO_JSTAGE_A_D_FILES := $(LIBJSTUDIO_JSTAGE_A_O_FILES:.o=.d) +$(LIBJSTUDIO_JSTAGE_A_D_FILES): +include $(wildcard $(LIBJSTUDIO_JSTAGE_A_D_FILES)) +endif diff --git a/libs/JSystem/JSupport/Makefile b/libs/JSystem/JSupport/Makefile index 66b713ac18..34ca9caf1c 100644 --- a/libs/JSystem/JSupport/Makefile +++ b/libs/JSystem/JSupport/Makefile @@ -27,9 +27,16 @@ $(BUILD_DIR)/libJSupport.a: $(LIBJSUPPORT_A_O_FILES) @echo $(LIBJSUPPORT_A_O_FILES) > build/LIBJSUPPORT_A_ofiles @$(LD) -xm l $(LIBJSUPPORT_A_LDFLAGS) -o $(BUILD_DIR)/libJSupport.a @build/LIBJSUPPORT_A_ofiles -$(BUILD_DIR)/libs/JSystem/JSupport/%.o: libs/JSystem/JSupport/%.cpp +$(BUILD_DIR)/libs/JSystem/JSupport/%.o: libs/JSystem/JSupport/%.cpp $(BUILD_DIR)/libs/JSystem/JSupport/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJSUPPORT_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJSUPPORT_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJSUPPORT_A_D_FILES := $(LIBJSUPPORT_A_O_FILES:.o=.d) +$(LIBJSUPPORT_A_D_FILES): +include $(wildcard $(LIBJSUPPORT_A_D_FILES)) +endif diff --git a/libs/JSystem/JUtility/Makefile b/libs/JSystem/JUtility/Makefile index 953ea3b208..b78f4a139a 100644 --- a/libs/JSystem/JUtility/Makefile +++ b/libs/JSystem/JUtility/Makefile @@ -59,9 +59,16 @@ $(BUILD_DIR)/libJUtility.a: $(LIBJUTILITY_A_O_FILES) @echo $(LIBJUTILITY_A_O_FILES) > build/LIBJUTILITY_A_ofiles @$(LD) -xm l $(LIBJUTILITY_A_LDFLAGS) -o $(BUILD_DIR)/libJUtility.a @build/LIBJUTILITY_A_ofiles -$(BUILD_DIR)/libs/JSystem/JUtility/%.o: libs/JSystem/JUtility/%.cpp +$(BUILD_DIR)/libs/JSystem/JUtility/%.o: libs/JSystem/JUtility/%.cpp $(BUILD_DIR)/libs/JSystem/JUtility/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBJUTILITY_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBJUTILITY_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBJUTILITY_A_D_FILES := $(LIBJUTILITY_A_O_FILES:.o=.d) +$(LIBJUTILITY_A_D_FILES): +include $(wildcard $(LIBJUTILITY_A_D_FILES)) +endif diff --git a/libs/MSL_C/Makefile b/libs/MSL_C/Makefile index 2f0e5a8317..f918f89903 100644 --- a/libs/MSL_C/Makefile +++ b/libs/MSL_C/Makefile @@ -136,9 +136,16 @@ $(BUILD_DIR)/libMSL_C.a: $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) @echo $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) > build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles @$(LD) -xm l $(LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS) -o $(BUILD_DIR)/libMSL_C.a @build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles -$(BUILD_DIR)/libs/MSL_C/%.o: libs/MSL_C/%.c +$(BUILD_DIR)/libs/MSL_C/%.o: libs/MSL_C/%.c $(BUILD_DIR)/libs/MSL_C/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(CC) $(CFLAGS) $(LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS) -c -o $@ $(basename $@).c + @$(CC) $(CFLAGS) $(LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBMSL_C_PPCEABI_BARE_H_A_D_FILES := $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES:.o=.d) +$(LIBMSL_C_PPCEABI_BARE_H_A_D_FILES): +include $(wildcard $(LIBMSL_C_PPCEABI_BARE_H_A_D_FILES)) +endif diff --git a/libs/Runtime.PPCEABI.H/Makefile b/libs/Runtime.PPCEABI.H/Makefile index 1bb02dc552..21ca78fcac 100644 --- a/libs/Runtime.PPCEABI.H/Makefile +++ b/libs/Runtime.PPCEABI.H/Makefile @@ -42,14 +42,23 @@ $(BUILD_DIR)/libRuntime.PPCEABI.H.a: $(LIBRUNTIME_PPCEABI_H_A_O_FILES) @echo $(LIBRUNTIME_PPCEABI_H_A_O_FILES) > build/LIBRUNTIME_PPCEABI_H_A_ofiles @$(LD) -xm l $(LIBRUNTIME_PPCEABI_H_A_LDFLAGS) -o $(BUILD_DIR)/libRuntime.PPCEABI.H.a @build/LIBRUNTIME_PPCEABI_H_A_ofiles -$(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.o: libs/Runtime.PPCEABI.H/%.cpp +$(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.o: libs/Runtime.PPCEABI.H/%.cpp $(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBRUNTIME_PPCEABI_H_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBRUNTIME_PPCEABI_H_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi -$(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.o: libs/Runtime.PPCEABI.H/%.c +$(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.o: libs/Runtime.PPCEABI.H/%.c $(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(CC) $(CFLAGS) -c -o $@ $(basename $@).c + @$(CC) $(CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBRUNTIME_PPCEABI_H_A_D_FILES := $(LIBRUNTIME_PPCEABI_H_A_O_FILES:.o=.d) +$(LIBRUNTIME_PPCEABI_H_A_D_FILES): +include $(wildcard $(LIBRUNTIME_PPCEABI_H_A_D_FILES)) +endif + diff --git a/libs/SSystem/SComponent/Makefile b/libs/SSystem/SComponent/Makefile index a169474d19..7454ceff2a 100644 --- a/libs/SSystem/SComponent/Makefile +++ b/libs/SSystem/SComponent/Makefile @@ -95,9 +95,16 @@ $(BUILD_DIR)/libSComponent.a: $(LIBSCOMPONENT_A_O_FILES) @echo $(LIBSCOMPONENT_A_O_FILES) > build/LIBSCOMPONENT_A_ofiles @$(LD) -xm l $(LIBSCOMPONENT_A_LDFLAGS) -o $(BUILD_DIR)/libSComponent.a @build/LIBSCOMPONENT_A_ofiles -$(BUILD_DIR)/libs/SSystem/SComponent/%.o: libs/SSystem/SComponent/%.cpp +$(BUILD_DIR)/libs/SSystem/SComponent/%.o: libs/SSystem/SComponent/%.cpp $(BUILD_DIR)/libs/SSystem/SComponent/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBSCOMPONENT_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBSCOMPONENT_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBSCOMPONENT_A_D_FILES := $(LIBSCOMPONENT_A_O_FILES:.o=.d) +$(LIBSCOMPONENT_A_D_FILES): +include $(wildcard $(LIBSCOMPONENT_A_D_FILES)) +endif diff --git a/libs/SSystem/SStandard/Makefile b/libs/SSystem/SStandard/Makefile index aceba2cd66..360ddb6c1b 100644 --- a/libs/SSystem/SStandard/Makefile +++ b/libs/SSystem/SStandard/Makefile @@ -21,9 +21,16 @@ $(BUILD_DIR)/libSStandard.a: $(LIBSSTANDARD_A_O_FILES) @echo $(LIBSSTANDARD_A_O_FILES) > build/LIBSSTANDARD_A_ofiles @$(LD) -xm l $(LIBSSTANDARD_A_LDFLAGS) -o $(BUILD_DIR)/libSStandard.a @build/LIBSSTANDARD_A_ofiles -$(BUILD_DIR)/libs/SSystem/SStandard/%.o: libs/SSystem/SStandard/%.cpp +$(BUILD_DIR)/libs/SSystem/SStandard/%.o: libs/SSystem/SStandard/%.cpp $(BUILD_DIR)/libs/SSystem/SStandard/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBSSTANDARD_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBSSTANDARD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBSSTANDARD_A_D_FILES := $(LIBSSTANDARD_A_O_FILES:.o=.d) +$(LIBSSTANDARD_A_D_FILES): +include $(wildcard $(LIBSSTANDARD_A_D_FILES)) +endif diff --git a/libs/TRK_MINNOW_DOLPHIN/Makefile b/libs/TRK_MINNOW_DOLPHIN/Makefile index a53fe1194e..9845f05112 100644 --- a/libs/TRK_MINNOW_DOLPHIN/Makefile +++ b/libs/TRK_MINNOW_DOLPHIN/Makefile @@ -82,8 +82,16 @@ $(BUILD_DIR)/libTRK_MINNOW_DOLPHIN.a: $(LIBTRK_MINNOW_DOLPHIN_A_O_FILES) @echo $(LIBTRK_MINNOW_DOLPHIN_A_O_FILES) > build/LIBTRK_MINNOW_DOLPHIN_A_ofiles @$(LD) -xm l $(LIBTRK_MINNOW_DOLPHIN_A_LDFLAGS) -o $(BUILD_DIR)/libTRK_MINNOW_DOLPHIN.a @build/LIBTRK_MINNOW_DOLPHIN_A_ofiles -$(BUILD_DIR)/libs/TRK_MINNOW_DOLPHIN/%.o: libs/TRK_MINNOW_DOLPHIN/%.c +$(BUILD_DIR)/libs/TRK_MINNOW_DOLPHIN/%.o: libs/TRK_MINNOW_DOLPHIN/%.c $(BUILD_DIR)/libs/TRK_MINNOW_DOLPHIN/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(CC) $(CFLAGS) $(LIBTRK_MINNOW_DOLPHIN_A_CFLAGS) -c -o $@ $(basename $@).c + @$(CC) $(CFLAGS) $(LIBTRK_MINNOW_DOLPHIN_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBTRK_MINNOW_DOLPHIN_A_D_FILES := $(LIBTRK_MINNOW_DOLPHIN_A_O_FILES:.o=.d) +$(LIBTRK_MINNOW_DOLPHIN_A_D_FILES): +include $(wildcard $(LIBTRK_MINNOW_DOLPHIN_A_D_FILES)) +endif + diff --git a/libs/Z2AudioLib/Makefile b/libs/Z2AudioLib/Makefile index c24d8ad285..fd19aab54c 100644 --- a/libs/Z2AudioLib/Makefile +++ b/libs/Z2AudioLib/Makefile @@ -61,9 +61,16 @@ $(BUILD_DIR)/libZ2AudioLib.a: $(LIBZ2AUDIOLIB_A_O_FILES) @echo $(LIBZ2AUDIOLIB_A_O_FILES) > build/LIBZ2AUDIOLIB_A_ofiles @$(LD) -xm l $(LIBZ2AUDIOLIB_A_LDFLAGS) -o $(BUILD_DIR)/libZ2AudioLib.a @build/LIBZ2AUDIOLIB_A_ofiles -$(BUILD_DIR)/libs/Z2AudioLib/%.o: libs/Z2AudioLib/%.cpp +$(BUILD_DIR)/libs/Z2AudioLib/%.o: libs/Z2AudioLib/%.cpp $(BUILD_DIR)/libs/Z2AudioLib/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBZ2AUDIOLIB_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBZ2AUDIOLIB_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBZ2AUDIOLIB_A_D_FILES := $(LIBZ2AUDIOLIB_A_O_FILES:.o=.d) +$(LIBZ2AUDIOLIB_A_D_FILES): +include $(wildcard $(LIBZ2AUDIOLIB_A_D_FILES)) +endif diff --git a/libs/amcstubs/Makefile b/libs/amcstubs/Makefile index ec8f5ba003..4b60d2e390 100644 --- a/libs/amcstubs/Makefile +++ b/libs/amcstubs/Makefile @@ -23,9 +23,16 @@ $(BUILD_DIR)/libamcstubs.a: $(LIBAMCSTUBS_A_O_FILES) @echo $(LIBAMCSTUBS_A_O_FILES) > build/LIBAMCSTUBS_A_ofiles @$(LD) -xm l $(LIBAMCSTUBS_A_LDFLAGS) -o $(BUILD_DIR)/libamcstubs.a @build/LIBAMCSTUBS_A_ofiles -$(BUILD_DIR)/libs/amcstubs/%.o: libs/amcstubs/%.c +$(BUILD_DIR)/libs/amcstubs/%.o: libs/amcstubs/%.c $(BUILD_DIR)/libs/amcstubs/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(CC) $(CFLAGS) $(LIBAMCSTUBS_A_CFLAGS) -c -o $@ $(basename $@).c + @$(CC) $(CFLAGS) $(LIBAMCSTUBS_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBAMCSTUBS_A_D_FILES := $(LIBAMCSTUBS_A_O_FILES:.o=.d) +$(LIBAMCSTUBS_A_D_FILES): +include $(wildcard $(LIBAMCSTUBS_A_D_FILES)) +endif diff --git a/libs/dolphin/ai/Makefile b/libs/dolphin/ai/Makefile index b4a68b263e..256159ed07 100644 --- a/libs/dolphin/ai/Makefile +++ b/libs/dolphin/ai/Makefile @@ -31,10 +31,18 @@ $(BUILD_DIR)/libai.a: $(LIBAI_A_O_FILES) @echo $(LIBAI_A_O_FILES) > build/LIBAI_A_ofiles @$(LD) -xm l $(LIBAI_A_LDFLAGS) -o $(BUILD_DIR)/libai.a @build/LIBAI_A_ofiles -$(BUILD_DIR)/libs/dolphin/ai/%.o: libs/dolphin/ai/%.c +$(BUILD_DIR)/libs/dolphin/ai/%.o: libs/dolphin/ai/%.c $(BUILD_DIR)/libs/dolphin/ai/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBAI_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBAI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ + +ifndef DISABLE_DEPS +LIBAI_A_D_FILES := $(LIBAI_A_O_FILES:.o=.d) +$(LIBAI_A_D_FILES): +include $(wildcard $(LIBAI_A_D_FILES)) +endif + diff --git a/libs/dolphin/ar/Makefile b/libs/dolphin/ar/Makefile index 0d2c1d0264..0d583d014c 100644 --- a/libs/dolphin/ar/Makefile +++ b/libs/dolphin/ar/Makefile @@ -33,11 +33,18 @@ $(BUILD_DIR)/libar.a: $(LIBAR_A_O_FILES) @echo $(LIBAR_A_O_FILES) > build/LIBAR_A_ofiles @$(LD) -xm l $(LIBAR_A_LDFLAGS) -o $(BUILD_DIR)/libar.a @build/LIBAR_A_ofiles -$(BUILD_DIR)/libs/dolphin/ar/%.o: libs/dolphin/ar/%.c +$(BUILD_DIR)/libs/dolphin/ar/%.o: libs/dolphin/ar/%.c $(BUILD_DIR)/libs/dolphin/ar/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBAR_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBAR_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBAR_A_D_FILES := $(LIBAR_A_O_FILES:.o=.d) +$(LIBAR_A_D_FILES): +include $(wildcard $(LIBAR_A_D_FILES)) +endif + diff --git a/libs/dolphin/base/Makefile b/libs/dolphin/base/Makefile index 91baf15200..086f7cd8ef 100644 --- a/libs/dolphin/base/Makefile +++ b/libs/dolphin/base/Makefile @@ -23,11 +23,18 @@ $(BUILD_DIR)/libbase.a: $(LIBBASE_A_O_FILES) @echo $(LIBBASE_A_O_FILES) > build/LIBBASE_A_ofiles @$(LD) -xm l $(LIBBASE_A_LDFLAGS) -o $(BUILD_DIR)/libbase.a @build/LIBBASE_A_ofiles -$(BUILD_DIR)/libs/dolphin/base/%.o: libs/dolphin/base/%.c +$(BUILD_DIR)/libs/dolphin/base/%.o: libs/dolphin/base/%.c $(BUILD_DIR)/libs/dolphin/base/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBBASE_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBBASE_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBBASE_A_D_FILES := $(LIBBASE_A_O_FILES:.o=.d) +$(LIBBASE_A_D_FILES): +include $(wildcard $(LIBBASE_A_D_FILES)) +endif + diff --git a/libs/dolphin/card/Makefile b/libs/dolphin/card/Makefile index 1ff4e5596c..ac749c4cf5 100644 --- a/libs/dolphin/card/Makefile +++ b/libs/dolphin/card/Makefile @@ -57,11 +57,18 @@ $(BUILD_DIR)/libcard.a: $(LIBCARD_A_O_FILES) @echo $(LIBCARD_A_O_FILES) > build/LIBCARD_A_ofiles @$(LD) -xm l $(LIBCARD_A_LDFLAGS) -o $(BUILD_DIR)/libcard.a @build/LIBCARD_A_ofiles -$(BUILD_DIR)/libs/dolphin/card/%.o: libs/dolphin/card/%.c +$(BUILD_DIR)/libs/dolphin/card/%.o: libs/dolphin/card/%.c $(BUILD_DIR)/libs/dolphin/card/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBCARD_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBCARD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBCARD_A_D_FILES := $(LIBCARD_A_O_FILES:.o=.d) +$(LIBCARD_A_D_FILES): +include $(wildcard $(LIBCARD_A_D_FILES)) +endif + diff --git a/libs/dolphin/db/Makefile b/libs/dolphin/db/Makefile index 6f6e3b5d72..3ad6bd440d 100644 --- a/libs/dolphin/db/Makefile +++ b/libs/dolphin/db/Makefile @@ -31,11 +31,18 @@ $(BUILD_DIR)/libdb.a: $(LIBDB_A_O_FILES) @echo $(LIBDB_A_O_FILES) > build/LIBDB_A_ofiles @$(LD) -xm l $(LIBDB_A_LDFLAGS) -o $(BUILD_DIR)/libdb.a @build/LIBDB_A_ofiles -$(BUILD_DIR)/libs/dolphin/db/%.o: libs/dolphin/db/%.c +$(BUILD_DIR)/libs/dolphin/db/%.o: libs/dolphin/db/%.c $(BUILD_DIR)/libs/dolphin/db/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBDB_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBDB_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBDB_A_D_FILES := $(LIBDB_A_O_FILES:.o=.d) +$(LIBDB_A_D_FILES): +include $(wildcard $(LIBDB_A_D_FILES)) +endif + diff --git a/libs/dolphin/dsp/Makefile b/libs/dolphin/dsp/Makefile index 6cb9ad4e5b..4987d752e5 100644 --- a/libs/dolphin/dsp/Makefile +++ b/libs/dolphin/dsp/Makefile @@ -35,11 +35,18 @@ $(BUILD_DIR)/libdsp.a: $(LIBDSP_A_O_FILES) @echo $(LIBDSP_A_O_FILES) > build/LIBDSP_A_ofiles @$(LD) -xm l $(LIBDSP_A_LDFLAGS) -o $(BUILD_DIR)/libdsp.a @build/LIBDSP_A_ofiles -$(BUILD_DIR)/libs/dolphin/dsp/%.o: libs/dolphin/dsp/%.c +$(BUILD_DIR)/libs/dolphin/dsp/%.o: libs/dolphin/dsp/%.c $(BUILD_DIR)/libs/dolphin/dsp/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBDSP_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBDSP_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBDSP_A_D_FILES := $(LIBDSP_A_O_FILES:.o=.d) +$(LIBDSP_A_D_FILES): +include $(wildcard $(LIBDSP_A_D_FILES)) +endif + diff --git a/libs/dolphin/dvd/Makefile b/libs/dolphin/dvd/Makefile index fdbbf62997..da1943fdb2 100644 --- a/libs/dolphin/dvd/Makefile +++ b/libs/dolphin/dvd/Makefile @@ -45,11 +45,18 @@ $(BUILD_DIR)/libdvd.a: $(LIBDVD_A_O_FILES) @echo $(LIBDVD_A_O_FILES) > build/LIBDVD_A_ofiles @$(LD) -xm l $(LIBDVD_A_LDFLAGS) -o $(BUILD_DIR)/libdvd.a @build/LIBDVD_A_ofiles -$(BUILD_DIR)/libs/dolphin/dvd/%.o: libs/dolphin/dvd/%.c +$(BUILD_DIR)/libs/dolphin/dvd/%.o: libs/dolphin/dvd/%.c $(BUILD_DIR)/libs/dolphin/dvd/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBDVD_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBDVD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBDVD_A_D_FILES := $(LIBDVD_A_O_FILES:.o=.d) +$(LIBDVD_A_D_FILES): +include $(wildcard $(LIBDVD_A_D_FILES)) +endif + diff --git a/libs/dolphin/exi/Makefile b/libs/dolphin/exi/Makefile index ebed15640c..e37f98a2d3 100644 --- a/libs/dolphin/exi/Makefile +++ b/libs/dolphin/exi/Makefile @@ -33,11 +33,18 @@ $(BUILD_DIR)/libexi.a: $(LIBEXI_A_O_FILES) @echo $(LIBEXI_A_O_FILES) > build/LIBEXI_A_ofiles @$(LD) -xm l $(LIBEXI_A_LDFLAGS) -o $(BUILD_DIR)/libexi.a @build/LIBEXI_A_ofiles -$(BUILD_DIR)/libs/dolphin/exi/%.o: libs/dolphin/exi/%.c +$(BUILD_DIR)/libs/dolphin/exi/%.o: libs/dolphin/exi/%.c $(BUILD_DIR)/libs/dolphin/exi/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBEXI_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBEXI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBEXI_A_D_FILES := $(LIBEXI_A_O_FILES:.o=.d) +$(LIBEXI_A_D_FILES): +include $(wildcard $(LIBEXI_A_D_FILES)) +endif + diff --git a/libs/dolphin/gd/Makefile b/libs/dolphin/gd/Makefile index 83c2cfe71c..6388955b90 100644 --- a/libs/dolphin/gd/Makefile +++ b/libs/dolphin/gd/Makefile @@ -33,11 +33,18 @@ $(BUILD_DIR)/libgd.a: $(LIBGD_A_O_FILES) @echo $(LIBGD_A_O_FILES) > build/LIBGD_A_ofiles @$(LD) -xm l $(LIBGD_A_LDFLAGS) -o $(BUILD_DIR)/libgd.a @build/LIBGD_A_ofiles -$(BUILD_DIR)/libs/dolphin/gd/%.o: libs/dolphin/gd/%.c +$(BUILD_DIR)/libs/dolphin/gd/%.o: libs/dolphin/gd/%.c $(BUILD_DIR)/libs/dolphin/gd/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBGD_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBGD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBGD_A_D_FILES := $(LIBGD_A_O_FILES:.o=.d) +$(LIBGD_A_D_FILES): +include $(wildcard $(LIBGD_A_D_FILES)) +endif + diff --git a/libs/dolphin/gf/Makefile b/libs/dolphin/gf/Makefile index ed9e459fd6..dd5da0f01e 100644 --- a/libs/dolphin/gf/Makefile +++ b/libs/dolphin/gf/Makefile @@ -27,9 +27,16 @@ $(BUILD_DIR)/libgf.a: $(LIBGF_A_O_FILES) @echo $(LIBGF_A_O_FILES) > build/LIBGF_A_ofiles @$(LD) -xm l $(LIBGF_A_LDFLAGS) -o $(BUILD_DIR)/libgf.a @build/LIBGF_A_ofiles -$(BUILD_DIR)/libs/dolphin/gf/%.o: libs/dolphin/gf/%.cpp +$(BUILD_DIR)/libs/dolphin/gf/%.o: libs/dolphin/gf/%.cpp $(BUILD_DIR)/libs/dolphin/gf/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBGF_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBGF_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBGF_A_D_FILES := $(LIBGF_A_O_FILES:.o=.d) +$(LIBGF_A_D_FILES): +include $(wildcard $(LIBGF_A_D_FILES)) +endif diff --git a/libs/dolphin/gx/Makefile b/libs/dolphin/gx/Makefile index 3278a71f3d..33bca405fb 100644 --- a/libs/dolphin/gx/Makefile +++ b/libs/dolphin/gx/Makefile @@ -49,11 +49,18 @@ $(BUILD_DIR)/libgx.a: $(LIBGX_A_O_FILES) @echo $(LIBGX_A_O_FILES) > build/LIBGX_A_ofiles @$(LD) -xm l $(LIBGX_A_LDFLAGS) -o $(BUILD_DIR)/libgx.a @build/LIBGX_A_ofiles -$(BUILD_DIR)/libs/dolphin/gx/%.o: libs/dolphin/gx/%.c +$(BUILD_DIR)/libs/dolphin/gx/%.o: libs/dolphin/gx/%.c $(BUILD_DIR)/libs/dolphin/gx/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBGX_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBGX_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBGX_A_D_FILES := $(LIBGX_A_O_FILES:.o=.d) +$(LIBGX_A_D_FILES): +include $(wildcard $(LIBGX_A_D_FILES)) +endif + diff --git a/libs/dolphin/mtx/Makefile b/libs/dolphin/mtx/Makefile index 3262e3e80d..99f00a40d9 100644 --- a/libs/dolphin/mtx/Makefile +++ b/libs/dolphin/mtx/Makefile @@ -31,11 +31,18 @@ $(BUILD_DIR)/libmtx.a: $(LIBMTX_A_O_FILES) @echo $(LIBMTX_A_O_FILES) > build/LIBMTX_A_ofiles @$(LD) -xm l $(LIBMTX_A_LDFLAGS) -o $(BUILD_DIR)/libmtx.a @build/LIBMTX_A_ofiles -$(BUILD_DIR)/libs/dolphin/mtx/%.o: libs/dolphin/mtx/%.c +$(BUILD_DIR)/libs/dolphin/mtx/%.o: libs/dolphin/mtx/%.c $(BUILD_DIR)/libs/dolphin/mtx/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBMTX_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBMTX_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBMTX_A_D_FILES := $(LIBMTX_A_O_FILES:.o=.d) +$(LIBMTX_A_D_FILES): +include $(wildcard $(LIBMTX_A_D_FILES)) +endif + diff --git a/libs/dolphin/os/Makefile b/libs/dolphin/os/Makefile index b757133808..d9818d6ca0 100644 --- a/libs/dolphin/os/Makefile +++ b/libs/dolphin/os/Makefile @@ -75,11 +75,18 @@ $(BUILD_DIR)/libos.a: $(LIBOS_A_O_FILES) @echo $(LIBOS_A_O_FILES) > build/LIBOS_A_ofiles @$(LD) -xm l $(LIBOS_A_LDFLAGS) -o $(BUILD_DIR)/libos.a @build/LIBOS_A_ofiles -$(BUILD_DIR)/libs/dolphin/os/%.o: libs/dolphin/os/%.c +$(BUILD_DIR)/libs/dolphin/os/%.o: libs/dolphin/os/%.c $(BUILD_DIR)/libs/dolphin/os/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBOS_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBOS_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBOS_A_D_FILES := $(LIBOS_A_O_FILES:.o=.d) +$(LIBOS_A_D_FILES): +include $(wildcard $(LIBOS_A_D_FILES)) +endif + diff --git a/libs/dolphin/pad/Makefile b/libs/dolphin/pad/Makefile index 27f49a6db1..b531393957 100644 --- a/libs/dolphin/pad/Makefile +++ b/libs/dolphin/pad/Makefile @@ -33,11 +33,18 @@ $(BUILD_DIR)/libpad.a: $(LIBPAD_A_O_FILES) @echo $(LIBPAD_A_O_FILES) > build/LIBPAD_A_ofiles @$(LD) -xm l $(LIBPAD_A_LDFLAGS) -o $(BUILD_DIR)/libpad.a @build/LIBPAD_A_ofiles -$(BUILD_DIR)/libs/dolphin/pad/%.o: libs/dolphin/pad/%.c +$(BUILD_DIR)/libs/dolphin/pad/%.o: libs/dolphin/pad/%.c $(BUILD_DIR)/libs/dolphin/pad/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBPAD_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBPAD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBPAD_A_D_FILES := $(LIBPAD_A_O_FILES:.o=.d) +$(LIBPAD_A_D_FILES): +include $(wildcard $(LIBPAD_A_D_FILES)) +endif + diff --git a/libs/dolphin/si/Makefile b/libs/dolphin/si/Makefile index 3146026607..892875eae3 100644 --- a/libs/dolphin/si/Makefile +++ b/libs/dolphin/si/Makefile @@ -33,11 +33,18 @@ $(BUILD_DIR)/libsi.a: $(LIBSI_A_O_FILES) @echo $(LIBSI_A_O_FILES) > build/LIBSI_A_ofiles @$(LD) -xm l $(LIBSI_A_LDFLAGS) -o $(BUILD_DIR)/libsi.a @build/LIBSI_A_ofiles -$(BUILD_DIR)/libs/dolphin/si/%.o: libs/dolphin/si/%.c +$(BUILD_DIR)/libs/dolphin/si/%.o: libs/dolphin/si/%.c $(BUILD_DIR)/libs/dolphin/si/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBSI_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBSI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBSI_A_D_FILES := $(LIBSI_A_O_FILES:.o=.d) +$(LIBSI_A_D_FILES): +include $(wildcard $(LIBSI_A_D_FILES)) +endif + diff --git a/libs/dolphin/vi/Makefile b/libs/dolphin/vi/Makefile index b59f0351ac..17c0b6f8eb 100644 --- a/libs/dolphin/vi/Makefile +++ b/libs/dolphin/vi/Makefile @@ -31,11 +31,18 @@ $(BUILD_DIR)/libvi.a: $(LIBVI_A_O_FILES) @echo $(LIBVI_A_O_FILES) > build/LIBVI_A_ofiles @$(LD) -xm l $(LIBVI_A_LDFLAGS) -o $(BUILD_DIR)/libvi.a @build/LIBVI_A_ofiles -$(BUILD_DIR)/libs/dolphin/vi/%.o: libs/dolphin/vi/%.c +$(BUILD_DIR)/libs/dolphin/vi/%.o: libs/dolphin/vi/%.c $(BUILD_DIR)/libs/dolphin/vi/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBVI_A_CFLAGS) -c -o $@ $(basename $@).c + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBVI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ +ifndef DISABLE_DEPS +LIBVI_A_D_FILES := $(LIBVI_A_O_FILES:.o=.d) +$(LIBVI_A_D_FILES): +include $(wildcard $(LIBVI_A_D_FILES)) +endif + diff --git a/libs/odemuexi2/Makefile b/libs/odemuexi2/Makefile index 437019d19c..5096cb5419 100644 --- a/libs/odemuexi2/Makefile +++ b/libs/odemuexi2/Makefile @@ -21,9 +21,16 @@ $(BUILD_DIR)/libodemuexi2.a: $(LIBODEMUEXI2_A_O_FILES) @echo $(LIBODEMUEXI2_A_O_FILES) > build/LIBODEMUEXI2_A_ofiles @$(LD) -xm l $(LIBODEMUEXI2_A_LDFLAGS) -o $(BUILD_DIR)/libodemuexi2.a @build/LIBODEMUEXI2_A_ofiles -$(BUILD_DIR)/libs/odemuexi2/%.o: libs/odemuexi2/%.cpp +$(BUILD_DIR)/libs/odemuexi2/%.o: libs/odemuexi2/%.cpp $(BUILD_DIR)/libs/odemuexi2/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBODEMUEXI2_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBODEMUEXI2_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBODEMUEXI2_A_D_FILES := $(LIBODEMUEXI2_A_O_FILES:.o=.d) +$(LIBODEMUEXI2_A_D_FILES): +include $(wildcard $(LIBODEMUEXI2_A_D_FILES)) +endif diff --git a/libs/odenotstub/Makefile b/libs/odenotstub/Makefile index 0ac22f017b..6b8a92c529 100644 --- a/libs/odenotstub/Makefile +++ b/libs/odenotstub/Makefile @@ -21,9 +21,16 @@ $(BUILD_DIR)/libodenotstub.a: $(LIBODENOTSTUB_A_O_FILES) @echo $(LIBODENOTSTUB_A_O_FILES) > build/LIBODENOTSTUB_A_ofiles @$(LD) -xm l $(LIBODENOTSTUB_A_LDFLAGS) -o $(BUILD_DIR)/libodenotstub.a @build/LIBODENOTSTUB_A_ofiles -$(BUILD_DIR)/libs/odenotstub/%.o: libs/odenotstub/%.cpp +$(BUILD_DIR)/libs/odenotstub/%.o: libs/odenotstub/%.cpp $(BUILD_DIR)/libs/odenotstub/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBODENOTSTUB_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBODENOTSTUB_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBODENOTSTUB_A_D_FILES := $(LIBODENOTSTUB_A_O_FILES:.o=.d) +$(LIBODENOTSTUB_A_D_FILES): +include $(wildcard $(LIBODENOTSTUB_A_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_bh/Makefile b/rel/d/a/b/d_a_b_bh/Makefile index 7b69832af1..daef92e41b 100644 --- a/rel/d/a/b/d_a_b_bh/Makefile +++ b/rel/d/a/b/d_a_b_bh/Makefile @@ -40,10 +40,17 @@ $(M138_TARGET): $(M138_O_FILES) $(M138_LIBS) @python3 tools/lcf.py rel 138 --output $(M138_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M138_LDFLAGS) -o $(M138_TARGET) @build/M138_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_bh/%.o: rel/d/a/b/d_a_b_bh/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_bh/%.o: rel/d/a/b/d_a_b_bh/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_bh/%.d @echo [138] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M138_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M138_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M138_D_FILES := $(M138_O_FILES:.o=.d) +$(M138_D_FILES): +include $(wildcard $(M138_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_bq/Makefile b/rel/d/a/b/d_a_b_bq/Makefile index 76524d0e8b..a53cc02cf7 100644 --- a/rel/d/a/b/d_a_b_bq/Makefile +++ b/rel/d/a/b/d_a_b_bq/Makefile @@ -40,10 +40,17 @@ $(M139_TARGET): $(M139_O_FILES) $(M139_LIBS) @python3 tools/lcf.py rel 139 --output $(M139_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M139_LDFLAGS) -o $(M139_TARGET) @build/M139_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_bq/%.o: rel/d/a/b/d_a_b_bq/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_bq/%.o: rel/d/a/b/d_a_b_bq/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_bq/%.d @echo [139] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M139_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M139_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M139_D_FILES := $(M139_O_FILES:.o=.d) +$(M139_D_FILES): +include $(wildcard $(M139_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_dr/Makefile b/rel/d/a/b/d_a_b_dr/Makefile index 1a9459b8fb..fe9887c668 100644 --- a/rel/d/a/b/d_a_b_dr/Makefile +++ b/rel/d/a/b/d_a_b_dr/Makefile @@ -40,10 +40,17 @@ $(M140_TARGET): $(M140_O_FILES) $(M140_LIBS) @python3 tools/lcf.py rel 140 --output $(M140_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M140_LDFLAGS) -o $(M140_TARGET) @build/M140_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_dr/%.o: rel/d/a/b/d_a_b_dr/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_dr/%.o: rel/d/a/b/d_a_b_dr/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_dr/%.d @echo [140] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M140_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M140_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M140_D_FILES := $(M140_O_FILES:.o=.d) +$(M140_D_FILES): +include $(wildcard $(M140_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_dre/Makefile b/rel/d/a/b/d_a_b_dre/Makefile index cde40d49b6..444d4ed26a 100644 --- a/rel/d/a/b/d_a_b_dre/Makefile +++ b/rel/d/a/b/d_a_b_dre/Makefile @@ -40,10 +40,17 @@ $(M141_TARGET): $(M141_O_FILES) $(M141_LIBS) @python3 tools/lcf.py rel 141 --output $(M141_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M141_LDFLAGS) -o $(M141_TARGET) @build/M141_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_dre/%.o: rel/d/a/b/d_a_b_dre/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_dre/%.o: rel/d/a/b/d_a_b_dre/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_dre/%.d @echo [141] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M141_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M141_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M141_D_FILES := $(M141_O_FILES:.o=.d) +$(M141_D_FILES): +include $(wildcard $(M141_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_ds/Makefile b/rel/d/a/b/d_a_b_ds/Makefile index b5401b5e74..1f750cba00 100644 --- a/rel/d/a/b/d_a_b_ds/Makefile +++ b/rel/d/a/b/d_a_b_ds/Makefile @@ -40,10 +40,17 @@ $(M142_TARGET): $(M142_O_FILES) $(M142_LIBS) @python3 tools/lcf.py rel 142 --output $(M142_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M142_LDFLAGS) -o $(M142_TARGET) @build/M142_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_ds/%.o: rel/d/a/b/d_a_b_ds/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_ds/%.o: rel/d/a/b/d_a_b_ds/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_ds/%.d @echo [142] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M142_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M142_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M142_D_FILES := $(M142_O_FILES:.o=.d) +$(M142_D_FILES): +include $(wildcard $(M142_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_gg/Makefile b/rel/d/a/b/d_a_b_gg/Makefile index 6bb489dfa8..15d3de7999 100644 --- a/rel/d/a/b/d_a_b_gg/Makefile +++ b/rel/d/a/b/d_a_b_gg/Makefile @@ -40,10 +40,17 @@ $(M143_TARGET): $(M143_O_FILES) $(M143_LIBS) @python3 tools/lcf.py rel 143 --output $(M143_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M143_LDFLAGS) -o $(M143_TARGET) @build/M143_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_gg/%.o: rel/d/a/b/d_a_b_gg/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_gg/%.o: rel/d/a/b/d_a_b_gg/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_gg/%.d @echo [143] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M143_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M143_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M143_D_FILES := $(M143_O_FILES:.o=.d) +$(M143_D_FILES): +include $(wildcard $(M143_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_gm/Makefile b/rel/d/a/b/d_a_b_gm/Makefile index 82d020405c..40607ebe23 100644 --- a/rel/d/a/b/d_a_b_gm/Makefile +++ b/rel/d/a/b/d_a_b_gm/Makefile @@ -40,10 +40,17 @@ $(M144_TARGET): $(M144_O_FILES) $(M144_LIBS) @python3 tools/lcf.py rel 144 --output $(M144_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M144_LDFLAGS) -o $(M144_TARGET) @build/M144_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_gm/%.o: rel/d/a/b/d_a_b_gm/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_gm/%.o: rel/d/a/b/d_a_b_gm/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_gm/%.d @echo [144] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M144_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M144_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M144_D_FILES := $(M144_O_FILES:.o=.d) +$(M144_D_FILES): +include $(wildcard $(M144_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_gnd/Makefile b/rel/d/a/b/d_a_b_gnd/Makefile index fa3ea70479..447b6bcc24 100644 --- a/rel/d/a/b/d_a_b_gnd/Makefile +++ b/rel/d/a/b/d_a_b_gnd/Makefile @@ -40,10 +40,17 @@ $(M145_TARGET): $(M145_O_FILES) $(M145_LIBS) @python3 tools/lcf.py rel 145 --output $(M145_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M145_LDFLAGS) -o $(M145_TARGET) @build/M145_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_gnd/%.o: rel/d/a/b/d_a_b_gnd/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_gnd/%.o: rel/d/a/b/d_a_b_gnd/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_gnd/%.d @echo [145] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M145_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M145_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M145_D_FILES := $(M145_O_FILES:.o=.d) +$(M145_D_FILES): +include $(wildcard $(M145_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_go/Makefile b/rel/d/a/b/d_a_b_go/Makefile index 16d1f78a8b..3e29077369 100644 --- a/rel/d/a/b/d_a_b_go/Makefile +++ b/rel/d/a/b/d_a_b_go/Makefile @@ -40,10 +40,17 @@ $(M146_TARGET): $(M146_O_FILES) $(M146_LIBS) @python3 tools/lcf.py rel 146 --output $(M146_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M146_LDFLAGS) -o $(M146_TARGET) @build/M146_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_go/%.o: rel/d/a/b/d_a_b_go/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_go/%.o: rel/d/a/b/d_a_b_go/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_go/%.d @echo [146] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M146_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M146_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M146_D_FILES := $(M146_O_FILES:.o=.d) +$(M146_D_FILES): +include $(wildcard $(M146_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_gos/Makefile b/rel/d/a/b/d_a_b_gos/Makefile index 9658ff7302..a9bda44c2b 100644 --- a/rel/d/a/b/d_a_b_gos/Makefile +++ b/rel/d/a/b/d_a_b_gos/Makefile @@ -40,10 +40,17 @@ $(M147_TARGET): $(M147_O_FILES) $(M147_LIBS) @python3 tools/lcf.py rel 147 --output $(M147_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M147_LDFLAGS) -o $(M147_TARGET) @build/M147_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_gos/%.o: rel/d/a/b/d_a_b_gos/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_gos/%.o: rel/d/a/b/d_a_b_gos/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_gos/%.d @echo [147] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M147_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M147_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M147_D_FILES := $(M147_O_FILES:.o=.d) +$(M147_D_FILES): +include $(wildcard $(M147_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_mgn/Makefile b/rel/d/a/b/d_a_b_mgn/Makefile index 043b258dc5..b6092e796a 100644 --- a/rel/d/a/b/d_a_b_mgn/Makefile +++ b/rel/d/a/b/d_a_b_mgn/Makefile @@ -40,10 +40,17 @@ $(M148_TARGET): $(M148_O_FILES) $(M148_LIBS) @python3 tools/lcf.py rel 148 --output $(M148_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M148_LDFLAGS) -o $(M148_TARGET) @build/M148_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_mgn/%.o: rel/d/a/b/d_a_b_mgn/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_mgn/%.o: rel/d/a/b/d_a_b_mgn/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_mgn/%.d @echo [148] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M148_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M148_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M148_D_FILES := $(M148_O_FILES:.o=.d) +$(M148_D_FILES): +include $(wildcard $(M148_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_ob/Makefile b/rel/d/a/b/d_a_b_ob/Makefile index 8a81632a4e..b01544b184 100644 --- a/rel/d/a/b/d_a_b_ob/Makefile +++ b/rel/d/a/b/d_a_b_ob/Makefile @@ -40,10 +40,17 @@ $(M149_TARGET): $(M149_O_FILES) $(M149_LIBS) @python3 tools/lcf.py rel 149 --output $(M149_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M149_LDFLAGS) -o $(M149_TARGET) @build/M149_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_ob/%.o: rel/d/a/b/d_a_b_ob/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_ob/%.o: rel/d/a/b/d_a_b_ob/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_ob/%.d @echo [149] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M149_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M149_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M149_D_FILES := $(M149_O_FILES:.o=.d) +$(M149_D_FILES): +include $(wildcard $(M149_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_oh/Makefile b/rel/d/a/b/d_a_b_oh/Makefile index 771b0f6165..f1af08f862 100644 --- a/rel/d/a/b/d_a_b_oh/Makefile +++ b/rel/d/a/b/d_a_b_oh/Makefile @@ -40,10 +40,17 @@ $(M150_TARGET): $(M150_O_FILES) $(M150_LIBS) @python3 tools/lcf.py rel 150 --output $(M150_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M150_LDFLAGS) -o $(M150_TARGET) @build/M150_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_oh/%.o: rel/d/a/b/d_a_b_oh/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_oh/%.o: rel/d/a/b/d_a_b_oh/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_oh/%.d @echo [150] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M150_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M150_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M150_D_FILES := $(M150_O_FILES:.o=.d) +$(M150_D_FILES): +include $(wildcard $(M150_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_oh2/Makefile b/rel/d/a/b/d_a_b_oh2/Makefile index 546fc53dcf..02a7be9e8e 100644 --- a/rel/d/a/b/d_a_b_oh2/Makefile +++ b/rel/d/a/b/d_a_b_oh2/Makefile @@ -38,10 +38,17 @@ $(M151_TARGET): $(M151_O_FILES) $(M151_LIBS) @python3 tools/lcf.py rel 151 --output $(M151_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M151_LDFLAGS) -o $(M151_TARGET) @build/M151_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_oh2/%.o: rel/d/a/b/d_a_b_oh2/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_oh2/%.o: rel/d/a/b/d_a_b_oh2/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_oh2/%.d @echo [151] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M151_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M151_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M151_D_FILES := $(M151_O_FILES:.o=.d) +$(M151_D_FILES): +include $(wildcard $(M151_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_tn/Makefile b/rel/d/a/b/d_a_b_tn/Makefile index 2597681fd8..9c428f7c27 100644 --- a/rel/d/a/b/d_a_b_tn/Makefile +++ b/rel/d/a/b/d_a_b_tn/Makefile @@ -40,10 +40,17 @@ $(M152_TARGET): $(M152_O_FILES) $(M152_LIBS) @python3 tools/lcf.py rel 152 --output $(M152_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M152_LDFLAGS) -o $(M152_TARGET) @build/M152_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_tn/%.o: rel/d/a/b/d_a_b_tn/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_tn/%.o: rel/d/a/b/d_a_b_tn/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_tn/%.d @echo [152] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M152_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M152_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M152_D_FILES := $(M152_O_FILES:.o=.d) +$(M152_D_FILES): +include $(wildcard $(M152_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_yo/Makefile b/rel/d/a/b/d_a_b_yo/Makefile index f129c06875..b25889c3d7 100644 --- a/rel/d/a/b/d_a_b_yo/Makefile +++ b/rel/d/a/b/d_a_b_yo/Makefile @@ -40,10 +40,17 @@ $(M153_TARGET): $(M153_O_FILES) $(M153_LIBS) @python3 tools/lcf.py rel 153 --output $(M153_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M153_LDFLAGS) -o $(M153_TARGET) @build/M153_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_yo/%.o: rel/d/a/b/d_a_b_yo/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_yo/%.o: rel/d/a/b/d_a_b_yo/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_yo/%.d @echo [153] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M153_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M153_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M153_D_FILES := $(M153_O_FILES:.o=.d) +$(M153_D_FILES): +include $(wildcard $(M153_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_yo_ice/Makefile b/rel/d/a/b/d_a_b_yo_ice/Makefile index 72e381b3d4..c9b4b7f5e4 100644 --- a/rel/d/a/b/d_a_b_yo_ice/Makefile +++ b/rel/d/a/b/d_a_b_yo_ice/Makefile @@ -40,10 +40,17 @@ $(M154_TARGET): $(M154_O_FILES) $(M154_LIBS) @python3 tools/lcf.py rel 154 --output $(M154_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M154_LDFLAGS) -o $(M154_TARGET) @build/M154_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_yo_ice/%.o: rel/d/a/b/d_a_b_yo_ice/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_yo_ice/%.o: rel/d/a/b/d_a_b_yo_ice/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_yo_ice/%.d @echo [154] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M154_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M154_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M154_D_FILES := $(M154_O_FILES:.o=.d) +$(M154_D_FILES): +include $(wildcard $(M154_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_zant/Makefile b/rel/d/a/b/d_a_b_zant/Makefile index 10a9c705de..2e43b48f36 100644 --- a/rel/d/a/b/d_a_b_zant/Makefile +++ b/rel/d/a/b/d_a_b_zant/Makefile @@ -40,10 +40,17 @@ $(M155_TARGET): $(M155_O_FILES) $(M155_LIBS) @python3 tools/lcf.py rel 155 --output $(M155_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M155_LDFLAGS) -o $(M155_TARGET) @build/M155_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_zant/%.o: rel/d/a/b/d_a_b_zant/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_zant/%.o: rel/d/a/b/d_a_b_zant/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_zant/%.d @echo [155] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M155_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M155_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M155_D_FILES := $(M155_O_FILES:.o=.d) +$(M155_D_FILES): +include $(wildcard $(M155_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_zant_magic/Makefile b/rel/d/a/b/d_a_b_zant_magic/Makefile index a426e7254a..3c282a419f 100644 --- a/rel/d/a/b/d_a_b_zant_magic/Makefile +++ b/rel/d/a/b/d_a_b_zant_magic/Makefile @@ -38,10 +38,17 @@ $(M156_TARGET): $(M156_O_FILES) $(M156_LIBS) @python3 tools/lcf.py rel 156 --output $(M156_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M156_LDFLAGS) -o $(M156_TARGET) @build/M156_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_magic/%.o: rel/d/a/b/d_a_b_zant_magic/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_magic/%.o: rel/d/a/b/d_a_b_zant_magic/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_zant_magic/%.d @echo [156] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M156_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M156_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M156_D_FILES := $(M156_O_FILES:.o=.d) +$(M156_D_FILES): +include $(wildcard $(M156_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_zant_mobile/Makefile b/rel/d/a/b/d_a_b_zant_mobile/Makefile index ac6b0c6f07..095eed4c7f 100644 --- a/rel/d/a/b/d_a_b_zant_mobile/Makefile +++ b/rel/d/a/b/d_a_b_zant_mobile/Makefile @@ -40,10 +40,17 @@ $(M157_TARGET): $(M157_O_FILES) $(M157_LIBS) @python3 tools/lcf.py rel 157 --output $(M157_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M157_LDFLAGS) -o $(M157_TARGET) @build/M157_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_mobile/%.o: rel/d/a/b/d_a_b_zant_mobile/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_mobile/%.o: rel/d/a/b/d_a_b_zant_mobile/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_zant_mobile/%.d @echo [157] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M157_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M157_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M157_D_FILES := $(M157_O_FILES:.o=.d) +$(M157_D_FILES): +include $(wildcard $(M157_D_FILES)) +endif diff --git a/rel/d/a/b/d_a_b_zant_sima/Makefile b/rel/d/a/b/d_a_b_zant_sima/Makefile index 00f1589e2e..f1051d1ed1 100644 --- a/rel/d/a/b/d_a_b_zant_sima/Makefile +++ b/rel/d/a/b/d_a_b_zant_sima/Makefile @@ -38,10 +38,17 @@ $(M158_TARGET): $(M158_O_FILES) $(M158_LIBS) @python3 tools/lcf.py rel 158 --output $(M158_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M158_LDFLAGS) -o $(M158_TARGET) @build/M158_ofiles -$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_sima/%.o: rel/d/a/b/d_a_b_zant_sima/%.cpp +$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_sima/%.o: rel/d/a/b/d_a_b_zant_sima/%.cpp $(BUILD_DIR)/rel/d/a/b/d_a_b_zant_sima/%.d @echo [158] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M158_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M158_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M158_D_FILES := $(M158_O_FILES:.o=.d) +$(M158_D_FILES): +include $(wildcard $(M158_D_FILES)) +endif diff --git a/rel/d/a/d_a_L7demo_dr/Makefile b/rel/d/a/d_a_L7demo_dr/Makefile index 488825561c..7b1359a45b 100644 --- a/rel/d/a/d_a_L7demo_dr/Makefile +++ b/rel/d/a/d_a_L7demo_dr/Makefile @@ -38,10 +38,17 @@ $(M135_TARGET): $(M135_O_FILES) $(M135_LIBS) @python3 tools/lcf.py rel 135 --output $(M135_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M135_LDFLAGS) -o $(M135_TARGET) @build/M135_ofiles -$(BUILD_DIR)/rel/d/a/d_a_L7demo_dr/%.o: rel/d/a/d_a_L7demo_dr/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_L7demo_dr/%.o: rel/d/a/d_a_L7demo_dr/%.cpp $(BUILD_DIR)/rel/d/a/d_a_L7demo_dr/%.d @echo [135] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M135_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M135_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M135_D_FILES := $(M135_O_FILES:.o=.d) +$(M135_D_FILES): +include $(wildcard $(M135_D_FILES)) +endif diff --git a/rel/d/a/d_a_L7low_dr/Makefile b/rel/d/a/d_a_L7low_dr/Makefile index 978b8ac4e5..846dce1ef2 100644 --- a/rel/d/a/d_a_L7low_dr/Makefile +++ b/rel/d/a/d_a_L7low_dr/Makefile @@ -38,10 +38,17 @@ $(M136_TARGET): $(M136_O_FILES) $(M136_LIBS) @python3 tools/lcf.py rel 136 --output $(M136_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M136_LDFLAGS) -o $(M136_TARGET) @build/M136_ofiles -$(BUILD_DIR)/rel/d/a/d_a_L7low_dr/%.o: rel/d/a/d_a_L7low_dr/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_L7low_dr/%.o: rel/d/a/d_a_L7low_dr/%.cpp $(BUILD_DIR)/rel/d/a/d_a_L7low_dr/%.d @echo [136] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M136_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M136_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M136_D_FILES := $(M136_O_FILES:.o=.d) +$(M136_D_FILES): +include $(wildcard $(M136_D_FILES)) +endif diff --git a/rel/d/a/d_a_L7op_demo_dr/Makefile b/rel/d/a/d_a_L7op_demo_dr/Makefile index d40377001b..1f69132d4d 100644 --- a/rel/d/a/d_a_L7op_demo_dr/Makefile +++ b/rel/d/a/d_a_L7op_demo_dr/Makefile @@ -38,10 +38,17 @@ $(M137_TARGET): $(M137_O_FILES) $(M137_LIBS) @python3 tools/lcf.py rel 137 --output $(M137_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M137_LDFLAGS) -o $(M137_TARGET) @build/M137_ofiles -$(BUILD_DIR)/rel/d/a/d_a_L7op_demo_dr/%.o: rel/d/a/d_a_L7op_demo_dr/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_L7op_demo_dr/%.o: rel/d/a/d_a_L7op_demo_dr/%.cpp $(BUILD_DIR)/rel/d/a/d_a_L7op_demo_dr/%.d @echo [137] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M137_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M137_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M137_D_FILES := $(M137_O_FILES:.o=.d) +$(M137_D_FILES): +include $(wildcard $(M137_D_FILES)) +endif diff --git a/rel/d/a/d_a_alldie/Makefile b/rel/d/a/d_a_alldie/Makefile index c3a65d428a..2ee0b34a12 100644 --- a/rel/d/a/d_a_alldie/Makefile +++ b/rel/d/a/d_a_alldie/Makefile @@ -38,10 +38,17 @@ $(M58_TARGET): $(M58_O_FILES) $(M58_LIBS) @python3 tools/lcf.py rel 58 --output $(M58_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M58_LDFLAGS) -o $(M58_TARGET) @build/M58_ofiles -$(BUILD_DIR)/rel/d/a/d_a_alldie/%.o: rel/d/a/d_a_alldie/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_alldie/%.o: rel/d/a/d_a_alldie/%.cpp $(BUILD_DIR)/rel/d/a/d_a_alldie/%.d @echo [ 58] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M58_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M58_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M58_D_FILES := $(M58_O_FILES:.o=.d) +$(M58_D_FILES): +include $(wildcard $(M58_D_FILES)) +endif diff --git a/rel/d/a/d_a_andsw/Makefile b/rel/d/a/d_a_andsw/Makefile index b278436221..49ab23c43a 100644 --- a/rel/d/a/d_a_andsw/Makefile +++ b/rel/d/a/d_a_andsw/Makefile @@ -38,10 +38,17 @@ $(M2_TARGET): $(M2_O_FILES) $(M2_LIBS) @python3 tools/lcf.py rel 2 --output $(M2_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M2_LDFLAGS) -o $(M2_TARGET) @build/M2_ofiles -$(BUILD_DIR)/rel/d/a/d_a_andsw/%.o: rel/d/a/d_a_andsw/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_andsw/%.o: rel/d/a/d_a_andsw/%.cpp $(BUILD_DIR)/rel/d/a/d_a_andsw/%.d @echo [ 2] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M2_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M2_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M2_D_FILES := $(M2_O_FILES:.o=.d) +$(M2_D_FILES): +include $(wildcard $(M2_D_FILES)) +endif diff --git a/rel/d/a/d_a_andsw2/Makefile b/rel/d/a/d_a_andsw2/Makefile index f2ffe11073..6719e0116c 100644 --- a/rel/d/a/d_a_andsw2/Makefile +++ b/rel/d/a/d_a_andsw2/Makefile @@ -38,10 +38,17 @@ $(M59_TARGET): $(M59_O_FILES) $(M59_LIBS) @python3 tools/lcf.py rel 59 --output $(M59_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M59_LDFLAGS) -o $(M59_TARGET) @build/M59_ofiles -$(BUILD_DIR)/rel/d/a/d_a_andsw2/%.o: rel/d/a/d_a_andsw2/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_andsw2/%.o: rel/d/a/d_a_andsw2/%.cpp $(BUILD_DIR)/rel/d/a/d_a_andsw2/%.d @echo [ 59] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M59_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M59_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M59_D_FILES := $(M59_O_FILES:.o=.d) +$(M59_D_FILES): +include $(wildcard $(M59_D_FILES)) +endif diff --git a/rel/d/a/d_a_arrow/Makefile b/rel/d/a/d_a_arrow/Makefile index a8d5a72f69..697186304d 100644 --- a/rel/d/a/d_a_arrow/Makefile +++ b/rel/d/a/d_a_arrow/Makefile @@ -40,10 +40,17 @@ $(M45_TARGET): $(M45_O_FILES) $(M45_LIBS) @python3 tools/lcf.py rel 45 --output $(M45_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M45_LDFLAGS) -o $(M45_TARGET) @build/M45_ofiles -$(BUILD_DIR)/rel/d/a/d_a_arrow/%.o: rel/d/a/d_a_arrow/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_arrow/%.o: rel/d/a/d_a_arrow/%.cpp $(BUILD_DIR)/rel/d/a/d_a_arrow/%.d @echo [ 45] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M45_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M45_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M45_D_FILES := $(M45_O_FILES:.o=.d) +$(M45_D_FILES): +include $(wildcard $(M45_D_FILES)) +endif diff --git a/rel/d/a/d_a_balloon_2D/Makefile b/rel/d/a/d_a_balloon_2D/Makefile index f96f378ef0..f5078d8b7c 100644 --- a/rel/d/a/d_a_balloon_2D/Makefile +++ b/rel/d/a/d_a_balloon_2D/Makefile @@ -40,10 +40,17 @@ $(M159_TARGET): $(M159_O_FILES) $(M159_LIBS) @python3 tools/lcf.py rel 159 --output $(M159_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M159_LDFLAGS) -o $(M159_TARGET) @build/M159_ofiles -$(BUILD_DIR)/rel/d/a/d_a_balloon_2D/%.o: rel/d/a/d_a_balloon_2D/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_balloon_2D/%.o: rel/d/a/d_a_balloon_2D/%.cpp $(BUILD_DIR)/rel/d/a/d_a_balloon_2D/%.d @echo [159] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M159_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M159_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M159_D_FILES := $(M159_O_FILES:.o=.d) +$(M159_D_FILES): +include $(wildcard $(M159_D_FILES)) +endif diff --git a/rel/d/a/d_a_bd/Makefile b/rel/d/a/d_a_bd/Makefile index 684bf5bd2b..a72b60874b 100644 --- a/rel/d/a/d_a_bd/Makefile +++ b/rel/d/a/d_a_bd/Makefile @@ -40,10 +40,17 @@ $(M60_TARGET): $(M60_O_FILES) $(M60_LIBS) @python3 tools/lcf.py rel 60 --output $(M60_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M60_LDFLAGS) -o $(M60_TARGET) @build/M60_ofiles -$(BUILD_DIR)/rel/d/a/d_a_bd/%.o: rel/d/a/d_a_bd/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_bd/%.o: rel/d/a/d_a_bd/%.cpp $(BUILD_DIR)/rel/d/a/d_a_bd/%.d @echo [ 60] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M60_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M60_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M60_D_FILES := $(M60_O_FILES:.o=.d) +$(M60_D_FILES): +include $(wildcard $(M60_D_FILES)) +endif diff --git a/rel/d/a/d_a_bg/Makefile b/rel/d/a/d_a_bg/Makefile index e655d9c8ff..a4d6d294e3 100644 --- a/rel/d/a/d_a_bg/Makefile +++ b/rel/d/a/d_a_bg/Makefile @@ -39,10 +39,17 @@ $(M3_TARGET): $(M3_O_FILES) $(M3_LIBS) @python3 tools/lcf.py rel 3 --output $(M3_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M3_LDFLAGS) -o $(M3_TARGET) @build/M3_ofiles -$(BUILD_DIR)/rel/d/a/d_a_bg/%.o: rel/d/a/d_a_bg/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_bg/%.o: rel/d/a/d_a_bg/%.cpp $(BUILD_DIR)/rel/d/a/d_a_bg/%.d @echo [ 3] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M3_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M3_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M3_D_FILES := $(M3_O_FILES:.o=.d) +$(M3_D_FILES): +include $(wildcard $(M3_D_FILES)) +endif diff --git a/rel/d/a/d_a_bg_obj/Makefile b/rel/d/a/d_a_bg_obj/Makefile index 16b41d7597..da7ec9edc8 100644 --- a/rel/d/a/d_a_bg_obj/Makefile +++ b/rel/d/a/d_a_bg_obj/Makefile @@ -38,10 +38,17 @@ $(M4_TARGET): $(M4_O_FILES) $(M4_LIBS) @python3 tools/lcf.py rel 4 --output $(M4_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M4_LDFLAGS) -o $(M4_TARGET) @build/M4_ofiles -$(BUILD_DIR)/rel/d/a/d_a_bg_obj/%.o: rel/d/a/d_a_bg_obj/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_bg_obj/%.o: rel/d/a/d_a_bg_obj/%.cpp $(BUILD_DIR)/rel/d/a/d_a_bg_obj/%.d @echo [ 4] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M4_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M4_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M4_D_FILES := $(M4_O_FILES:.o=.d) +$(M4_D_FILES): +include $(wildcard $(M4_D_FILES)) +endif diff --git a/rel/d/a/d_a_boomerang/Makefile b/rel/d/a/d_a_boomerang/Makefile index fe20a10315..abc5033318 100644 --- a/rel/d/a/d_a_boomerang/Makefile +++ b/rel/d/a/d_a_boomerang/Makefile @@ -38,10 +38,17 @@ $(M46_TARGET): $(M46_O_FILES) $(M46_LIBS) @python3 tools/lcf.py rel 46 --output $(M46_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M46_LDFLAGS) -o $(M46_TARGET) @build/M46_ofiles -$(BUILD_DIR)/rel/d/a/d_a_boomerang/%.o: rel/d/a/d_a_boomerang/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_boomerang/%.o: rel/d/a/d_a_boomerang/%.cpp $(BUILD_DIR)/rel/d/a/d_a_boomerang/%.d @echo [ 46] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M46_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M46_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M46_D_FILES := $(M46_O_FILES:.o=.d) +$(M46_D_FILES): +include $(wildcard $(M46_D_FILES)) +endif diff --git a/rel/d/a/d_a_bullet/Makefile b/rel/d/a/d_a_bullet/Makefile index bada40be7a..628ec0250d 100644 --- a/rel/d/a/d_a_bullet/Makefile +++ b/rel/d/a/d_a_bullet/Makefile @@ -40,10 +40,17 @@ $(M160_TARGET): $(M160_O_FILES) $(M160_LIBS) @python3 tools/lcf.py rel 160 --output $(M160_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M160_LDFLAGS) -o $(M160_TARGET) @build/M160_ofiles -$(BUILD_DIR)/rel/d/a/d_a_bullet/%.o: rel/d/a/d_a_bullet/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_bullet/%.o: rel/d/a/d_a_bullet/%.cpp $(BUILD_DIR)/rel/d/a/d_a_bullet/%.d @echo [160] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M160_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M160_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M160_D_FILES := $(M160_O_FILES:.o=.d) +$(M160_D_FILES): +include $(wildcard $(M160_D_FILES)) +endif diff --git a/rel/d/a/d_a_canoe/Makefile b/rel/d/a/d_a_canoe/Makefile index a619305ecd..450816b379 100644 --- a/rel/d/a/d_a_canoe/Makefile +++ b/rel/d/a/d_a_canoe/Makefile @@ -40,10 +40,17 @@ $(M61_TARGET): $(M61_O_FILES) $(M61_LIBS) @python3 tools/lcf.py rel 61 --output $(M61_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M61_LDFLAGS) -o $(M61_TARGET) @build/M61_ofiles -$(BUILD_DIR)/rel/d/a/d_a_canoe/%.o: rel/d/a/d_a_canoe/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_canoe/%.o: rel/d/a/d_a_canoe/%.cpp $(BUILD_DIR)/rel/d/a/d_a_canoe/%.d @echo [ 61] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M61_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M61_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M61_D_FILES := $(M61_O_FILES:.o=.d) +$(M61_D_FILES): +include $(wildcard $(M61_D_FILES)) +endif diff --git a/rel/d/a/d_a_coach_2D/Makefile b/rel/d/a/d_a_coach_2D/Makefile index 4de7a06500..bdd276cb06 100644 --- a/rel/d/a/d_a_coach_2D/Makefile +++ b/rel/d/a/d_a_coach_2D/Makefile @@ -40,10 +40,17 @@ $(M161_TARGET): $(M161_O_FILES) $(M161_LIBS) @python3 tools/lcf.py rel 161 --output $(M161_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M161_LDFLAGS) -o $(M161_TARGET) @build/M161_ofiles -$(BUILD_DIR)/rel/d/a/d_a_coach_2D/%.o: rel/d/a/d_a_coach_2D/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_coach_2D/%.o: rel/d/a/d_a_coach_2D/%.cpp $(BUILD_DIR)/rel/d/a/d_a_coach_2D/%.d @echo [161] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M161_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M161_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M161_D_FILES := $(M161_O_FILES:.o=.d) +$(M161_D_FILES): +include $(wildcard $(M161_D_FILES)) +endif diff --git a/rel/d/a/d_a_coach_fire/Makefile b/rel/d/a/d_a_coach_fire/Makefile index 8c2bf5512b..bdab4d40f1 100644 --- a/rel/d/a/d_a_coach_fire/Makefile +++ b/rel/d/a/d_a_coach_fire/Makefile @@ -38,10 +38,17 @@ $(M162_TARGET): $(M162_O_FILES) $(M162_LIBS) @python3 tools/lcf.py rel 162 --output $(M162_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M162_LDFLAGS) -o $(M162_TARGET) @build/M162_ofiles -$(BUILD_DIR)/rel/d/a/d_a_coach_fire/%.o: rel/d/a/d_a_coach_fire/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_coach_fire/%.o: rel/d/a/d_a_coach_fire/%.cpp $(BUILD_DIR)/rel/d/a/d_a_coach_fire/%.d @echo [162] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M162_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M162_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M162_D_FILES := $(M162_O_FILES:.o=.d) +$(M162_D_FILES): +include $(wildcard $(M162_D_FILES)) +endif diff --git a/rel/d/a/d_a_cow/Makefile b/rel/d/a/d_a_cow/Makefile index dfd4af00a1..eaf90c13c8 100644 --- a/rel/d/a/d_a_cow/Makefile +++ b/rel/d/a/d_a_cow/Makefile @@ -40,10 +40,17 @@ $(M163_TARGET): $(M163_O_FILES) $(M163_LIBS) @python3 tools/lcf.py rel 163 --output $(M163_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M163_LDFLAGS) -o $(M163_TARGET) @build/M163_ofiles -$(BUILD_DIR)/rel/d/a/d_a_cow/%.o: rel/d/a/d_a_cow/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_cow/%.o: rel/d/a/d_a_cow/%.cpp $(BUILD_DIR)/rel/d/a/d_a_cow/%.d @echo [163] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M163_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M163_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M163_D_FILES := $(M163_O_FILES:.o=.d) +$(M163_D_FILES): +include $(wildcard $(M163_D_FILES)) +endif diff --git a/rel/d/a/d_a_crod/Makefile b/rel/d/a/d_a_crod/Makefile index 0b13a0fa39..c7a8ddb082 100644 --- a/rel/d/a/d_a_crod/Makefile +++ b/rel/d/a/d_a_crod/Makefile @@ -40,10 +40,17 @@ $(M47_TARGET): $(M47_O_FILES) $(M47_LIBS) @python3 tools/lcf.py rel 47 --output $(M47_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M47_LDFLAGS) -o $(M47_TARGET) @build/M47_ofiles -$(BUILD_DIR)/rel/d/a/d_a_crod/%.o: rel/d/a/d_a_crod/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_crod/%.o: rel/d/a/d_a_crod/%.cpp $(BUILD_DIR)/rel/d/a/d_a_crod/%.d @echo [ 47] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M47_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M47_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M47_D_FILES := $(M47_O_FILES:.o=.d) +$(M47_D_FILES): +include $(wildcard $(M47_D_FILES)) +endif diff --git a/rel/d/a/d_a_cstaf/Makefile b/rel/d/a/d_a_cstaf/Makefile index 1d7d4841c1..b1641974bc 100644 --- a/rel/d/a/d_a_cstaf/Makefile +++ b/rel/d/a/d_a_cstaf/Makefile @@ -38,10 +38,17 @@ $(M62_TARGET): $(M62_O_FILES) $(M62_LIBS) @python3 tools/lcf.py rel 62 --output $(M62_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M62_LDFLAGS) -o $(M62_TARGET) @build/M62_ofiles -$(BUILD_DIR)/rel/d/a/d_a_cstaf/%.o: rel/d/a/d_a_cstaf/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_cstaf/%.o: rel/d/a/d_a_cstaf/%.cpp $(BUILD_DIR)/rel/d/a/d_a_cstaf/%.d @echo [ 62] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M62_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M62_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M62_D_FILES := $(M62_O_FILES:.o=.d) +$(M62_D_FILES): +include $(wildcard $(M62_D_FILES)) +endif diff --git a/rel/d/a/d_a_cstatue/Makefile b/rel/d/a/d_a_cstatue/Makefile index eaa041323d..2baee1d242 100644 --- a/rel/d/a/d_a_cstatue/Makefile +++ b/rel/d/a/d_a_cstatue/Makefile @@ -40,10 +40,17 @@ $(M164_TARGET): $(M164_O_FILES) $(M164_LIBS) @python3 tools/lcf.py rel 164 --output $(M164_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M164_LDFLAGS) -o $(M164_TARGET) @build/M164_ofiles -$(BUILD_DIR)/rel/d/a/d_a_cstatue/%.o: rel/d/a/d_a_cstatue/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_cstatue/%.o: rel/d/a/d_a_cstatue/%.cpp $(BUILD_DIR)/rel/d/a/d_a_cstatue/%.d @echo [164] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M164_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M164_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M164_D_FILES := $(M164_O_FILES:.o=.d) +$(M164_D_FILES): +include $(wildcard $(M164_D_FILES)) +endif diff --git a/rel/d/a/d_a_demo00/Makefile b/rel/d/a/d_a_demo00/Makefile index 6d26e648d0..a92efd771c 100644 --- a/rel/d/a/d_a_demo00/Makefile +++ b/rel/d/a/d_a_demo00/Makefile @@ -40,10 +40,17 @@ $(M48_TARGET): $(M48_O_FILES) $(M48_LIBS) @python3 tools/lcf.py rel 48 --output $(M48_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M48_LDFLAGS) -o $(M48_TARGET) @build/M48_ofiles -$(BUILD_DIR)/rel/d/a/d_a_demo00/%.o: rel/d/a/d_a_demo00/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_demo00/%.o: rel/d/a/d_a_demo00/%.cpp $(BUILD_DIR)/rel/d/a/d_a_demo00/%.d @echo [ 48] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M48_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M48_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M48_D_FILES := $(M48_O_FILES:.o=.d) +$(M48_D_FILES): +include $(wildcard $(M48_D_FILES)) +endif diff --git a/rel/d/a/d_a_demo_item/Makefile b/rel/d/a/d_a_demo_item/Makefile index 25f3cb99f6..3e50990fa4 100644 --- a/rel/d/a/d_a_demo_item/Makefile +++ b/rel/d/a/d_a_demo_item/Makefile @@ -40,10 +40,17 @@ $(M63_TARGET): $(M63_O_FILES) $(M63_LIBS) @python3 tools/lcf.py rel 63 --output $(M63_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M63_LDFLAGS) -o $(M63_TARGET) @build/M63_ofiles -$(BUILD_DIR)/rel/d/a/d_a_demo_item/%.o: rel/d/a/d_a_demo_item/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_demo_item/%.o: rel/d/a/d_a_demo_item/%.cpp $(BUILD_DIR)/rel/d/a/d_a_demo_item/%.d @echo [ 63] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M63_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M63_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M63_D_FILES := $(M63_O_FILES:.o=.d) +$(M63_D_FILES): +include $(wildcard $(M63_D_FILES)) +endif diff --git a/rel/d/a/d_a_disappear/Makefile b/rel/d/a/d_a_disappear/Makefile index 4e68024946..6f549ac085 100644 --- a/rel/d/a/d_a_disappear/Makefile +++ b/rel/d/a/d_a_disappear/Makefile @@ -38,10 +38,17 @@ $(M49_TARGET): $(M49_O_FILES) $(M49_LIBS) @python3 tools/lcf.py rel 49 --output $(M49_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M49_LDFLAGS) -o $(M49_TARGET) @build/M49_ofiles -$(BUILD_DIR)/rel/d/a/d_a_disappear/%.o: rel/d/a/d_a_disappear/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_disappear/%.o: rel/d/a/d_a_disappear/%.cpp $(BUILD_DIR)/rel/d/a/d_a_disappear/%.d @echo [ 49] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M49_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M49_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M49_D_FILES := $(M49_O_FILES:.o=.d) +$(M49_D_FILES): +include $(wildcard $(M49_D_FILES)) +endif diff --git a/rel/d/a/d_a_dmidna/Makefile b/rel/d/a/d_a_dmidna/Makefile index 1349121c7e..7925dfff49 100644 --- a/rel/d/a/d_a_dmidna/Makefile +++ b/rel/d/a/d_a_dmidna/Makefile @@ -38,10 +38,17 @@ $(M5_TARGET): $(M5_O_FILES) $(M5_LIBS) @python3 tools/lcf.py rel 5 --output $(M5_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M5_LDFLAGS) -o $(M5_TARGET) @build/M5_ofiles -$(BUILD_DIR)/rel/d/a/d_a_dmidna/%.o: rel/d/a/d_a_dmidna/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_dmidna/%.o: rel/d/a/d_a_dmidna/%.cpp $(BUILD_DIR)/rel/d/a/d_a_dmidna/%.d @echo [ 5] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M5_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M5_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M5_D_FILES := $(M5_O_FILES:.o=.d) +$(M5_D_FILES): +include $(wildcard $(M5_D_FILES)) +endif diff --git a/rel/d/a/d_a_do/Makefile b/rel/d/a/d_a_do/Makefile index 827fdbf827..e93672ccca 100644 --- a/rel/d/a/d_a_do/Makefile +++ b/rel/d/a/d_a_do/Makefile @@ -40,10 +40,17 @@ $(M165_TARGET): $(M165_O_FILES) $(M165_LIBS) @python3 tools/lcf.py rel 165 --output $(M165_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M165_LDFLAGS) -o $(M165_TARGET) @build/M165_ofiles -$(BUILD_DIR)/rel/d/a/d_a_do/%.o: rel/d/a/d_a_do/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_do/%.o: rel/d/a/d_a_do/%.cpp $(BUILD_DIR)/rel/d/a/d_a_do/%.d @echo [165] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M165_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M165_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M165_D_FILES := $(M165_O_FILES:.o=.d) +$(M165_D_FILES): +include $(wildcard $(M165_D_FILES)) +endif diff --git a/rel/d/a/d_a_dshutter/Makefile b/rel/d/a/d_a_dshutter/Makefile index 1cfd60b553..037013ac38 100644 --- a/rel/d/a/d_a_dshutter/Makefile +++ b/rel/d/a/d_a_dshutter/Makefile @@ -38,10 +38,17 @@ $(M10_TARGET): $(M10_O_FILES) $(M10_LIBS) @python3 tools/lcf.py rel 10 --output $(M10_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M10_LDFLAGS) -o $(M10_TARGET) @build/M10_ofiles -$(BUILD_DIR)/rel/d/a/d_a_dshutter/%.o: rel/d/a/d_a_dshutter/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_dshutter/%.o: rel/d/a/d_a_dshutter/%.cpp $(BUILD_DIR)/rel/d/a/d_a_dshutter/%.d @echo [ 10] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M10_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M10_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M10_D_FILES := $(M10_O_FILES:.o=.d) +$(M10_D_FILES): +include $(wildcard $(M10_D_FILES)) +endif diff --git a/rel/d/a/d_a_econt/Makefile b/rel/d/a/d_a_econt/Makefile index 18b889bea9..7232a0138b 100644 --- a/rel/d/a/d_a_econt/Makefile +++ b/rel/d/a/d_a_econt/Makefile @@ -40,10 +40,17 @@ $(M71_TARGET): $(M71_O_FILES) $(M71_LIBS) @python3 tools/lcf.py rel 71 --output $(M71_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M71_LDFLAGS) -o $(M71_TARGET) @build/M71_ofiles -$(BUILD_DIR)/rel/d/a/d_a_econt/%.o: rel/d/a/d_a_econt/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_econt/%.o: rel/d/a/d_a_econt/%.cpp $(BUILD_DIR)/rel/d/a/d_a_econt/%.d @echo [ 71] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M71_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M71_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M71_D_FILES := $(M71_O_FILES:.o=.d) +$(M71_D_FILES): +include $(wildcard $(M71_D_FILES)) +endif diff --git a/rel/d/a/d_a_ep/Makefile b/rel/d/a/d_a_ep/Makefile index 87e45ccac0..f2e8b03c79 100644 --- a/rel/d/a/d_a_ep/Makefile +++ b/rel/d/a/d_a_ep/Makefile @@ -38,10 +38,17 @@ $(M11_TARGET): $(M11_O_FILES) $(M11_LIBS) @python3 tools/lcf.py rel 11 --output $(M11_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M11_LDFLAGS) -o $(M11_TARGET) @build/M11_ofiles -$(BUILD_DIR)/rel/d/a/d_a_ep/%.o: rel/d/a/d_a_ep/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_ep/%.o: rel/d/a/d_a_ep/%.cpp $(BUILD_DIR)/rel/d/a/d_a_ep/%.d @echo [ 11] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M11_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M11_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M11_D_FILES := $(M11_O_FILES:.o=.d) +$(M11_D_FILES): +include $(wildcard $(M11_D_FILES)) +endif diff --git a/rel/d/a/d_a_formation_mng/Makefile b/rel/d/a/d_a_formation_mng/Makefile index eac18295d6..40b0183477 100644 --- a/rel/d/a/d_a_formation_mng/Makefile +++ b/rel/d/a/d_a_formation_mng/Makefile @@ -38,10 +38,17 @@ $(M260_TARGET): $(M260_O_FILES) $(M260_LIBS) @python3 tools/lcf.py rel 260 --output $(M260_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M260_LDFLAGS) -o $(M260_TARGET) @build/M260_ofiles -$(BUILD_DIR)/rel/d/a/d_a_formation_mng/%.o: rel/d/a/d_a_formation_mng/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_formation_mng/%.o: rel/d/a/d_a_formation_mng/%.cpp $(BUILD_DIR)/rel/d/a/d_a_formation_mng/%.d @echo [260] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M260_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M260_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M260_D_FILES := $(M260_O_FILES:.o=.d) +$(M260_D_FILES): +include $(wildcard $(M260_D_FILES)) +endif diff --git a/rel/d/a/d_a_fr/Makefile b/rel/d/a/d_a_fr/Makefile index 7c5a65b565..58f12b197f 100644 --- a/rel/d/a/d_a_fr/Makefile +++ b/rel/d/a/d_a_fr/Makefile @@ -40,10 +40,17 @@ $(M72_TARGET): $(M72_O_FILES) $(M72_LIBS) @python3 tools/lcf.py rel 72 --output $(M72_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M72_LDFLAGS) -o $(M72_TARGET) @build/M72_ofiles -$(BUILD_DIR)/rel/d/a/d_a_fr/%.o: rel/d/a/d_a_fr/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_fr/%.o: rel/d/a/d_a_fr/%.cpp $(BUILD_DIR)/rel/d/a/d_a_fr/%.d @echo [ 72] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M72_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M72_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M72_D_FILES := $(M72_O_FILES:.o=.d) +$(M72_D_FILES): +include $(wildcard $(M72_D_FILES)) +endif diff --git a/rel/d/a/d_a_grass/Makefile b/rel/d/a/d_a_grass/Makefile index 1699661a37..e0e90fda50 100644 --- a/rel/d/a/d_a_grass/Makefile +++ b/rel/d/a/d_a_grass/Makefile @@ -40,10 +40,17 @@ $(M73_TARGET): $(M73_O_FILES) $(M73_LIBS) @python3 tools/lcf.py rel 73 --output $(M73_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M73_LDFLAGS) -o $(M73_TARGET) @build/M73_ofiles -$(BUILD_DIR)/rel/d/a/d_a_grass/%.o: rel/d/a/d_a_grass/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_grass/%.o: rel/d/a/d_a_grass/%.cpp $(BUILD_DIR)/rel/d/a/d_a_grass/%.d @echo [ 73] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M73_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M73_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M73_D_FILES := $(M73_O_FILES:.o=.d) +$(M73_D_FILES): +include $(wildcard $(M73_D_FILES)) +endif diff --git a/rel/d/a/d_a_guard_mng/Makefile b/rel/d/a/d_a_guard_mng/Makefile index b7338a73d7..c314c94a5a 100644 --- a/rel/d/a/d_a_guard_mng/Makefile +++ b/rel/d/a/d_a_guard_mng/Makefile @@ -38,10 +38,17 @@ $(M261_TARGET): $(M261_O_FILES) $(M261_LIBS) @python3 tools/lcf.py rel 261 --output $(M261_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M261_LDFLAGS) -o $(M261_TARGET) @build/M261_ofiles -$(BUILD_DIR)/rel/d/a/d_a_guard_mng/%.o: rel/d/a/d_a_guard_mng/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_guard_mng/%.o: rel/d/a/d_a_guard_mng/%.cpp $(BUILD_DIR)/rel/d/a/d_a_guard_mng/%.d @echo [261] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M261_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M261_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M261_D_FILES := $(M261_O_FILES:.o=.d) +$(M261_D_FILES): +include $(wildcard $(M261_D_FILES)) +endif diff --git a/rel/d/a/d_a_hitobj/Makefile b/rel/d/a/d_a_hitobj/Makefile index c4666aa683..12673b16f2 100644 --- a/rel/d/a/d_a_hitobj/Makefile +++ b/rel/d/a/d_a_hitobj/Makefile @@ -38,10 +38,17 @@ $(M12_TARGET): $(M12_O_FILES) $(M12_LIBS) @python3 tools/lcf.py rel 12 --output $(M12_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M12_LDFLAGS) -o $(M12_TARGET) @build/M12_ofiles -$(BUILD_DIR)/rel/d/a/d_a_hitobj/%.o: rel/d/a/d_a_hitobj/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_hitobj/%.o: rel/d/a/d_a_hitobj/%.cpp $(BUILD_DIR)/rel/d/a/d_a_hitobj/%.d @echo [ 12] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M12_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M12_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M12_D_FILES := $(M12_O_FILES:.o=.d) +$(M12_D_FILES): +include $(wildcard $(M12_D_FILES)) +endif diff --git a/rel/d/a/d_a_horse/Makefile b/rel/d/a/d_a_horse/Makefile index c3056cf744..7770b58b3f 100644 --- a/rel/d/a/d_a_horse/Makefile +++ b/rel/d/a/d_a_horse/Makefile @@ -40,10 +40,17 @@ $(M262_TARGET): $(M262_O_FILES) $(M262_LIBS) @python3 tools/lcf.py rel 262 --output $(M262_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M262_LDFLAGS) -o $(M262_TARGET) @build/M262_ofiles -$(BUILD_DIR)/rel/d/a/d_a_horse/%.o: rel/d/a/d_a_horse/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_horse/%.o: rel/d/a/d_a_horse/%.cpp $(BUILD_DIR)/rel/d/a/d_a_horse/%.d @echo [262] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M262_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M262_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M262_D_FILES := $(M262_O_FILES:.o=.d) +$(M262_D_FILES): +include $(wildcard $(M262_D_FILES)) +endif diff --git a/rel/d/a/d_a_hozelda/Makefile b/rel/d/a/d_a_hozelda/Makefile index e2a36efe06..92e4e56303 100644 --- a/rel/d/a/d_a_hozelda/Makefile +++ b/rel/d/a/d_a_hozelda/Makefile @@ -40,10 +40,17 @@ $(M263_TARGET): $(M263_O_FILES) $(M263_LIBS) @python3 tools/lcf.py rel 263 --output $(M263_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M263_LDFLAGS) -o $(M263_TARGET) @build/M263_ofiles -$(BUILD_DIR)/rel/d/a/d_a_hozelda/%.o: rel/d/a/d_a_hozelda/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_hozelda/%.o: rel/d/a/d_a_hozelda/%.cpp $(BUILD_DIR)/rel/d/a/d_a_hozelda/%.d @echo [263] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M263_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M263_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M263_D_FILES := $(M263_O_FILES:.o=.d) +$(M263_D_FILES): +include $(wildcard $(M263_D_FILES)) +endif diff --git a/rel/d/a/d_a_izumi_gate/Makefile b/rel/d/a/d_a_izumi_gate/Makefile index 53ad33797a..cddc07a209 100644 --- a/rel/d/a/d_a_izumi_gate/Makefile +++ b/rel/d/a/d_a_izumi_gate/Makefile @@ -38,10 +38,17 @@ $(M264_TARGET): $(M264_O_FILES) $(M264_LIBS) @python3 tools/lcf.py rel 264 --output $(M264_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M264_LDFLAGS) -o $(M264_TARGET) @build/M264_ofiles -$(BUILD_DIR)/rel/d/a/d_a_izumi_gate/%.o: rel/d/a/d_a_izumi_gate/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_izumi_gate/%.o: rel/d/a/d_a_izumi_gate/%.cpp $(BUILD_DIR)/rel/d/a/d_a_izumi_gate/%.d @echo [264] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M264_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M264_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M264_D_FILES := $(M264_O_FILES:.o=.d) +$(M264_D_FILES): +include $(wildcard $(M264_D_FILES)) +endif diff --git a/rel/d/a/d_a_kago/Makefile b/rel/d/a/d_a_kago/Makefile index 1fcaac882f..1a350da5ca 100644 --- a/rel/d/a/d_a_kago/Makefile +++ b/rel/d/a/d_a_kago/Makefile @@ -40,10 +40,17 @@ $(M265_TARGET): $(M265_O_FILES) $(M265_LIBS) @python3 tools/lcf.py rel 265 --output $(M265_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M265_LDFLAGS) -o $(M265_TARGET) @build/M265_ofiles -$(BUILD_DIR)/rel/d/a/d_a_kago/%.o: rel/d/a/d_a_kago/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_kago/%.o: rel/d/a/d_a_kago/%.cpp $(BUILD_DIR)/rel/d/a/d_a_kago/%.d @echo [265] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M265_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M265_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M265_D_FILES := $(M265_O_FILES:.o=.d) +$(M265_D_FILES): +include $(wildcard $(M265_D_FILES)) +endif diff --git a/rel/d/a/d_a_mant/Makefile b/rel/d/a/d_a_mant/Makefile index 28006bb178..dfe5ed2929 100644 --- a/rel/d/a/d_a_mant/Makefile +++ b/rel/d/a/d_a_mant/Makefile @@ -38,10 +38,17 @@ $(M277_TARGET): $(M277_O_FILES) $(M277_LIBS) @python3 tools/lcf.py rel 277 --output $(M277_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M277_LDFLAGS) -o $(M277_TARGET) @build/M277_ofiles -$(BUILD_DIR)/rel/d/a/d_a_mant/%.o: rel/d/a/d_a_mant/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_mant/%.o: rel/d/a/d_a_mant/%.cpp $(BUILD_DIR)/rel/d/a/d_a_mant/%.d @echo [277] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M277_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M277_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M277_D_FILES := $(M277_O_FILES:.o=.d) +$(M277_D_FILES): +include $(wildcard $(M277_D_FILES)) +endif diff --git a/rel/d/a/d_a_mg_fish/Makefile b/rel/d/a/d_a_mg_fish/Makefile index 9e743cd4d6..e63dbbefec 100644 --- a/rel/d/a/d_a_mg_fish/Makefile +++ b/rel/d/a/d_a_mg_fish/Makefile @@ -40,10 +40,17 @@ $(M78_TARGET): $(M78_O_FILES) $(M78_LIBS) @python3 tools/lcf.py rel 78 --output $(M78_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M78_LDFLAGS) -o $(M78_TARGET) @build/M78_ofiles -$(BUILD_DIR)/rel/d/a/d_a_mg_fish/%.o: rel/d/a/d_a_mg_fish/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_mg_fish/%.o: rel/d/a/d_a_mg_fish/%.cpp $(BUILD_DIR)/rel/d/a/d_a_mg_fish/%.d @echo [ 78] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M78_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M78_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M78_D_FILES := $(M78_O_FILES:.o=.d) +$(M78_D_FILES): +include $(wildcard $(M78_D_FILES)) +endif diff --git a/rel/d/a/d_a_mg_fshop/Makefile b/rel/d/a/d_a_mg_fshop/Makefile index 348e886e6b..a0adfc309f 100644 --- a/rel/d/a/d_a_mg_fshop/Makefile +++ b/rel/d/a/d_a_mg_fshop/Makefile @@ -40,10 +40,17 @@ $(M278_TARGET): $(M278_O_FILES) $(M278_LIBS) @python3 tools/lcf.py rel 278 --output $(M278_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M278_LDFLAGS) -o $(M278_TARGET) @build/M278_ofiles -$(BUILD_DIR)/rel/d/a/d_a_mg_fshop/%.o: rel/d/a/d_a_mg_fshop/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_mg_fshop/%.o: rel/d/a/d_a_mg_fshop/%.cpp $(BUILD_DIR)/rel/d/a/d_a_mg_fshop/%.d @echo [278] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M278_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M278_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M278_D_FILES := $(M278_O_FILES:.o=.d) +$(M278_D_FILES): +include $(wildcard $(M278_D_FILES)) +endif diff --git a/rel/d/a/d_a_mg_rod/Makefile b/rel/d/a/d_a_mg_rod/Makefile index 813509f3c1..515c68f854 100644 --- a/rel/d/a/d_a_mg_rod/Makefile +++ b/rel/d/a/d_a_mg_rod/Makefile @@ -40,10 +40,17 @@ $(M50_TARGET): $(M50_O_FILES) $(M50_LIBS) @python3 tools/lcf.py rel 50 --output $(M50_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M50_LDFLAGS) -o $(M50_TARGET) @build/M50_ofiles -$(BUILD_DIR)/rel/d/a/d_a_mg_rod/%.o: rel/d/a/d_a_mg_rod/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_mg_rod/%.o: rel/d/a/d_a_mg_rod/%.cpp $(BUILD_DIR)/rel/d/a/d_a_mg_rod/%.d @echo [ 50] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M50_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M50_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M50_D_FILES := $(M50_O_FILES:.o=.d) +$(M50_D_FILES): +include $(wildcard $(M50_D_FILES)) +endif diff --git a/rel/d/a/d_a_midna/Makefile b/rel/d/a/d_a_midna/Makefile index 758bdf6fab..c7cbb20b09 100644 --- a/rel/d/a/d_a_midna/Makefile +++ b/rel/d/a/d_a_midna/Makefile @@ -40,10 +40,17 @@ $(M51_TARGET): $(M51_O_FILES) $(M51_LIBS) @python3 tools/lcf.py rel 51 --output $(M51_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M51_LDFLAGS) -o $(M51_TARGET) @build/M51_ofiles -$(BUILD_DIR)/rel/d/a/d_a_midna/%.o: rel/d/a/d_a_midna/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_midna/%.o: rel/d/a/d_a_midna/%.cpp $(BUILD_DIR)/rel/d/a/d_a_midna/%.d @echo [ 51] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M51_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M51_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M51_D_FILES := $(M51_O_FILES:.o=.d) +$(M51_D_FILES): +include $(wildcard $(M51_D_FILES)) +endif diff --git a/rel/d/a/d_a_mirror/Makefile b/rel/d/a/d_a_mirror/Makefile index 354c81c75a..3dca9c8bd1 100644 --- a/rel/d/a/d_a_mirror/Makefile +++ b/rel/d/a/d_a_mirror/Makefile @@ -38,10 +38,17 @@ $(M279_TARGET): $(M279_O_FILES) $(M279_LIBS) @python3 tools/lcf.py rel 279 --output $(M279_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M279_LDFLAGS) -o $(M279_TARGET) @build/M279_ofiles -$(BUILD_DIR)/rel/d/a/d_a_mirror/%.o: rel/d/a/d_a_mirror/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_mirror/%.o: rel/d/a/d_a_mirror/%.cpp $(BUILD_DIR)/rel/d/a/d_a_mirror/%.d @echo [279] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M279_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M279_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M279_D_FILES := $(M279_O_FILES:.o=.d) +$(M279_D_FILES): +include $(wildcard $(M279_D_FILES)) +endif diff --git a/rel/d/a/d_a_movie_player/Makefile b/rel/d/a/d_a_movie_player/Makefile index a986028e5c..14e3ca7ef4 100644 --- a/rel/d/a/d_a_movie_player/Makefile +++ b/rel/d/a/d_a_movie_player/Makefile @@ -38,10 +38,17 @@ $(M280_TARGET): $(M280_O_FILES) $(M280_LIBS) @python3 tools/lcf.py rel 280 --output $(M280_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M280_LDFLAGS) -o $(M280_TARGET) @build/M280_ofiles -$(BUILD_DIR)/rel/d/a/d_a_movie_player/%.o: rel/d/a/d_a_movie_player/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_movie_player/%.o: rel/d/a/d_a_movie_player/%.cpp $(BUILD_DIR)/rel/d/a/d_a_movie_player/%.d @echo [280] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M280_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M280_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M280_D_FILES := $(M280_O_FILES:.o=.d) +$(M280_D_FILES): +include $(wildcard $(M280_D_FILES)) +endif diff --git a/rel/d/a/d_a_myna/Makefile b/rel/d/a/d_a_myna/Makefile index bbf79d1988..3dcd487965 100644 --- a/rel/d/a/d_a_myna/Makefile +++ b/rel/d/a/d_a_myna/Makefile @@ -40,10 +40,17 @@ $(M281_TARGET): $(M281_O_FILES) $(M281_LIBS) @python3 tools/lcf.py rel 281 --output $(M281_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M281_LDFLAGS) -o $(M281_TARGET) @build/M281_ofiles -$(BUILD_DIR)/rel/d/a/d_a_myna/%.o: rel/d/a/d_a_myna/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_myna/%.o: rel/d/a/d_a_myna/%.cpp $(BUILD_DIR)/rel/d/a/d_a_myna/%.d @echo [281] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M281_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M281_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M281_D_FILES := $(M281_O_FILES:.o=.d) +$(M281_D_FILES): +include $(wildcard $(M281_D_FILES)) +endif diff --git a/rel/d/a/d_a_nbomb/Makefile b/rel/d/a/d_a_nbomb/Makefile index cef2142579..47a57a97ad 100644 --- a/rel/d/a/d_a_nbomb/Makefile +++ b/rel/d/a/d_a_nbomb/Makefile @@ -40,10 +40,17 @@ $(M52_TARGET): $(M52_O_FILES) $(M52_LIBS) @python3 tools/lcf.py rel 52 --output $(M52_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M52_LDFLAGS) -o $(M52_TARGET) @build/M52_ofiles -$(BUILD_DIR)/rel/d/a/d_a_nbomb/%.o: rel/d/a/d_a_nbomb/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_nbomb/%.o: rel/d/a/d_a_nbomb/%.cpp $(BUILD_DIR)/rel/d/a/d_a_nbomb/%.d @echo [ 52] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M52_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M52_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M52_D_FILES := $(M52_O_FILES:.o=.d) +$(M52_D_FILES): +include $(wildcard $(M52_D_FILES)) +endif diff --git a/rel/d/a/d_a_ni/Makefile b/rel/d/a/d_a_ni/Makefile index d037990d0d..6a9ca337ba 100644 --- a/rel/d/a/d_a_ni/Makefile +++ b/rel/d/a/d_a_ni/Makefile @@ -40,10 +40,17 @@ $(M282_TARGET): $(M282_O_FILES) $(M282_LIBS) @python3 tools/lcf.py rel 282 --output $(M282_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M282_LDFLAGS) -o $(M282_TARGET) @build/M282_ofiles -$(BUILD_DIR)/rel/d/a/d_a_ni/%.o: rel/d/a/d_a_ni/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_ni/%.o: rel/d/a/d_a_ni/%.cpp $(BUILD_DIR)/rel/d/a/d_a_ni/%.d @echo [282] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M282_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M282_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M282_D_FILES := $(M282_O_FILES:.o=.d) +$(M282_D_FILES): +include $(wildcard $(M282_D_FILES)) +endif diff --git a/rel/d/a/d_a_passer_mng/Makefile b/rel/d/a/d_a_passer_mng/Makefile index 654551b6a0..1cd4bf25a8 100644 --- a/rel/d/a/d_a_passer_mng/Makefile +++ b/rel/d/a/d_a_passer_mng/Makefile @@ -38,10 +38,17 @@ $(M702_TARGET): $(M702_O_FILES) $(M702_LIBS) @python3 tools/lcf.py rel 702 --output $(M702_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M702_LDFLAGS) -o $(M702_TARGET) @build/M702_ofiles -$(BUILD_DIR)/rel/d/a/d_a_passer_mng/%.o: rel/d/a/d_a_passer_mng/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_passer_mng/%.o: rel/d/a/d_a_passer_mng/%.cpp $(BUILD_DIR)/rel/d/a/d_a_passer_mng/%.d @echo [702] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M702_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M702_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M702_D_FILES := $(M702_O_FILES:.o=.d) +$(M702_D_FILES): +include $(wildcard $(M702_D_FILES)) +endif diff --git a/rel/d/a/d_a_path_line/Makefile b/rel/d/a/d_a_path_line/Makefile index c8ca07fe19..3735a92cca 100644 --- a/rel/d/a/d_a_path_line/Makefile +++ b/rel/d/a/d_a_path_line/Makefile @@ -38,10 +38,17 @@ $(M23_TARGET): $(M23_O_FILES) $(M23_LIBS) @python3 tools/lcf.py rel 23 --output $(M23_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M23_LDFLAGS) -o $(M23_TARGET) @build/M23_ofiles -$(BUILD_DIR)/rel/d/a/d_a_path_line/%.o: rel/d/a/d_a_path_line/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_path_line/%.o: rel/d/a/d_a_path_line/%.cpp $(BUILD_DIR)/rel/d/a/d_a_path_line/%.d @echo [ 23] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M23_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M23_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M23_D_FILES := $(M23_O_FILES:.o=.d) +$(M23_D_FILES): +include $(wildcard $(M23_D_FILES)) +endif diff --git a/rel/d/a/d_a_peru/Makefile b/rel/d/a/d_a_peru/Makefile index a878614f10..0489bec53c 100644 --- a/rel/d/a/d_a_peru/Makefile +++ b/rel/d/a/d_a_peru/Makefile @@ -40,10 +40,17 @@ $(M703_TARGET): $(M703_O_FILES) $(M703_LIBS) @python3 tools/lcf.py rel 703 --output $(M703_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M703_LDFLAGS) -o $(M703_TARGET) @build/M703_ofiles -$(BUILD_DIR)/rel/d/a/d_a_peru/%.o: rel/d/a/d_a_peru/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_peru/%.o: rel/d/a/d_a_peru/%.cpp $(BUILD_DIR)/rel/d/a/d_a_peru/%.d @echo [703] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M703_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M703_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M703_D_FILES := $(M703_O_FILES:.o=.d) +$(M703_D_FILES): +include $(wildcard $(M703_D_FILES)) +endif diff --git a/rel/d/a/d_a_ppolamp/Makefile b/rel/d/a/d_a_ppolamp/Makefile index 3a052e9820..900b676799 100644 --- a/rel/d/a/d_a_ppolamp/Makefile +++ b/rel/d/a/d_a_ppolamp/Makefile @@ -38,10 +38,17 @@ $(M704_TARGET): $(M704_O_FILES) $(M704_LIBS) @python3 tools/lcf.py rel 704 --output $(M704_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M704_LDFLAGS) -o $(M704_TARGET) @build/M704_ofiles -$(BUILD_DIR)/rel/d/a/d_a_ppolamp/%.o: rel/d/a/d_a_ppolamp/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_ppolamp/%.o: rel/d/a/d_a_ppolamp/%.cpp $(BUILD_DIR)/rel/d/a/d_a_ppolamp/%.d @echo [704] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M704_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M704_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M704_D_FILES := $(M704_O_FILES:.o=.d) +$(M704_D_FILES): +include $(wildcard $(M704_D_FILES)) +endif diff --git a/rel/d/a/d_a_scene_exit/Makefile b/rel/d/a/d_a_scene_exit/Makefile index 7ef78db213..5dc19b3aad 100644 --- a/rel/d/a/d_a_scene_exit/Makefile +++ b/rel/d/a/d_a_scene_exit/Makefile @@ -38,10 +38,17 @@ $(M24_TARGET): $(M24_O_FILES) $(M24_LIBS) @python3 tools/lcf.py rel 24 --output $(M24_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M24_LDFLAGS) -o $(M24_TARGET) @build/M24_ofiles -$(BUILD_DIR)/rel/d/a/d_a_scene_exit/%.o: rel/d/a/d_a_scene_exit/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_scene_exit/%.o: rel/d/a/d_a_scene_exit/%.cpp $(BUILD_DIR)/rel/d/a/d_a_scene_exit/%.d @echo [ 24] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M24_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M24_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M24_D_FILES := $(M24_O_FILES:.o=.d) +$(M24_D_FILES): +include $(wildcard $(M24_D_FILES)) +endif diff --git a/rel/d/a/d_a_scene_exit2/Makefile b/rel/d/a/d_a_scene_exit2/Makefile index 3ce4b232d3..611c51dc72 100644 --- a/rel/d/a/d_a_scene_exit2/Makefile +++ b/rel/d/a/d_a_scene_exit2/Makefile @@ -40,10 +40,17 @@ $(M117_TARGET): $(M117_O_FILES) $(M117_LIBS) @python3 tools/lcf.py rel 117 --output $(M117_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M117_LDFLAGS) -o $(M117_TARGET) @build/M117_ofiles -$(BUILD_DIR)/rel/d/a/d_a_scene_exit2/%.o: rel/d/a/d_a_scene_exit2/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_scene_exit2/%.o: rel/d/a/d_a_scene_exit2/%.cpp $(BUILD_DIR)/rel/d/a/d_a_scene_exit2/%.d @echo [117] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M117_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M117_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M117_D_FILES := $(M117_O_FILES:.o=.d) +$(M117_D_FILES): +include $(wildcard $(M117_D_FILES)) +endif diff --git a/rel/d/a/d_a_set_bgobj/Makefile b/rel/d/a/d_a_set_bgobj/Makefile index 03d439cda4..a98898cb66 100644 --- a/rel/d/a/d_a_set_bgobj/Makefile +++ b/rel/d/a/d_a_set_bgobj/Makefile @@ -38,10 +38,17 @@ $(M25_TARGET): $(M25_O_FILES) $(M25_LIBS) @python3 tools/lcf.py rel 25 --output $(M25_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M25_LDFLAGS) -o $(M25_TARGET) @build/M25_ofiles -$(BUILD_DIR)/rel/d/a/d_a_set_bgobj/%.o: rel/d/a/d_a_set_bgobj/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_set_bgobj/%.o: rel/d/a/d_a_set_bgobj/%.cpp $(BUILD_DIR)/rel/d/a/d_a_set_bgobj/%.d @echo [ 25] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M25_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M25_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M25_D_FILES := $(M25_O_FILES:.o=.d) +$(M25_D_FILES): +include $(wildcard $(M25_D_FILES)) +endif diff --git a/rel/d/a/d_a_shop_item/Makefile b/rel/d/a/d_a_shop_item/Makefile index ae9f57e2b3..c96cc64a1b 100644 --- a/rel/d/a/d_a_shop_item/Makefile +++ b/rel/d/a/d_a_shop_item/Makefile @@ -38,10 +38,17 @@ $(M118_TARGET): $(M118_O_FILES) $(M118_LIBS) @python3 tools/lcf.py rel 118 --output $(M118_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M118_LDFLAGS) -o $(M118_TARGET) @build/M118_ofiles -$(BUILD_DIR)/rel/d/a/d_a_shop_item/%.o: rel/d/a/d_a_shop_item/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_shop_item/%.o: rel/d/a/d_a_shop_item/%.cpp $(BUILD_DIR)/rel/d/a/d_a_shop_item/%.d @echo [118] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M118_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M118_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M118_D_FILES := $(M118_O_FILES:.o=.d) +$(M118_D_FILES): +include $(wildcard $(M118_D_FILES)) +endif diff --git a/rel/d/a/d_a_skip_2D/Makefile b/rel/d/a/d_a_skip_2D/Makefile index 29c9a59173..c24c5f7511 100644 --- a/rel/d/a/d_a_skip_2D/Makefile +++ b/rel/d/a/d_a_skip_2D/Makefile @@ -38,10 +38,17 @@ $(M705_TARGET): $(M705_O_FILES) $(M705_LIBS) @python3 tools/lcf.py rel 705 --output $(M705_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M705_LDFLAGS) -o $(M705_TARGET) @build/M705_ofiles -$(BUILD_DIR)/rel/d/a/d_a_skip_2D/%.o: rel/d/a/d_a_skip_2D/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_skip_2D/%.o: rel/d/a/d_a_skip_2D/%.cpp $(BUILD_DIR)/rel/d/a/d_a_skip_2D/%.d @echo [705] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M705_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M705_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M705_D_FILES := $(M705_O_FILES:.o=.d) +$(M705_D_FILES): +include $(wildcard $(M705_D_FILES)) +endif diff --git a/rel/d/a/d_a_spinner/Makefile b/rel/d/a/d_a_spinner/Makefile index f312183c63..550ec1c8c3 100644 --- a/rel/d/a/d_a_spinner/Makefile +++ b/rel/d/a/d_a_spinner/Makefile @@ -40,10 +40,17 @@ $(M55_TARGET): $(M55_O_FILES) $(M55_LIBS) @python3 tools/lcf.py rel 55 --output $(M55_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M55_LDFLAGS) -o $(M55_TARGET) @build/M55_ofiles -$(BUILD_DIR)/rel/d/a/d_a_spinner/%.o: rel/d/a/d_a_spinner/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_spinner/%.o: rel/d/a/d_a_spinner/%.cpp $(BUILD_DIR)/rel/d/a/d_a_spinner/%.d @echo [ 55] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M55_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M55_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M55_D_FILES := $(M55_O_FILES:.o=.d) +$(M55_D_FILES): +include $(wildcard $(M55_D_FILES)) +endif diff --git a/rel/d/a/d_a_sq/Makefile b/rel/d/a/d_a_sq/Makefile index a5102951e4..21185eb607 100644 --- a/rel/d/a/d_a_sq/Makefile +++ b/rel/d/a/d_a_sq/Makefile @@ -40,10 +40,17 @@ $(M119_TARGET): $(M119_O_FILES) $(M119_LIBS) @python3 tools/lcf.py rel 119 --output $(M119_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M119_LDFLAGS) -o $(M119_TARGET) @build/M119_ofiles -$(BUILD_DIR)/rel/d/a/d_a_sq/%.o: rel/d/a/d_a_sq/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_sq/%.o: rel/d/a/d_a_sq/%.cpp $(BUILD_DIR)/rel/d/a/d_a_sq/%.d @echo [119] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M119_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M119_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M119_D_FILES := $(M119_O_FILES:.o=.d) +$(M119_D_FILES): +include $(wildcard $(M119_D_FILES)) +endif diff --git a/rel/d/a/d_a_startAndGoal/Makefile b/rel/d/a/d_a_startAndGoal/Makefile index 3b66c04b36..bb10e5aecd 100644 --- a/rel/d/a/d_a_startAndGoal/Makefile +++ b/rel/d/a/d_a_startAndGoal/Makefile @@ -38,10 +38,17 @@ $(M706_TARGET): $(M706_O_FILES) $(M706_LIBS) @python3 tools/lcf.py rel 706 --output $(M706_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M706_LDFLAGS) -o $(M706_TARGET) @build/M706_ofiles -$(BUILD_DIR)/rel/d/a/d_a_startAndGoal/%.o: rel/d/a/d_a_startAndGoal/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_startAndGoal/%.o: rel/d/a/d_a_startAndGoal/%.cpp $(BUILD_DIR)/rel/d/a/d_a_startAndGoal/%.d @echo [706] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M706_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M706_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M706_D_FILES := $(M706_O_FILES:.o=.d) +$(M706_D_FILES): +include $(wildcard $(M706_D_FILES)) +endif diff --git a/rel/d/a/d_a_suspend/Makefile b/rel/d/a/d_a_suspend/Makefile index 2c13241b6c..83c634c97b 100644 --- a/rel/d/a/d_a_suspend/Makefile +++ b/rel/d/a/d_a_suspend/Makefile @@ -38,10 +38,17 @@ $(M56_TARGET): $(M56_O_FILES) $(M56_LIBS) @python3 tools/lcf.py rel 56 --output $(M56_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M56_LDFLAGS) -o $(M56_TARGET) @build/M56_ofiles -$(BUILD_DIR)/rel/d/a/d_a_suspend/%.o: rel/d/a/d_a_suspend/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_suspend/%.o: rel/d/a/d_a_suspend/%.cpp $(BUILD_DIR)/rel/d/a/d_a_suspend/%.d @echo [ 56] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M56_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M56_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M56_D_FILES := $(M56_O_FILES:.o=.d) +$(M56_D_FILES): +include $(wildcard $(M56_D_FILES)) +endif diff --git a/rel/d/a/d_a_swBall/Makefile b/rel/d/a/d_a_swBall/Makefile index 996bcb9d8b..9ab1bdebcf 100644 --- a/rel/d/a/d_a_swBall/Makefile +++ b/rel/d/a/d_a_swBall/Makefile @@ -38,10 +38,17 @@ $(M707_TARGET): $(M707_O_FILES) $(M707_LIBS) @python3 tools/lcf.py rel 707 --output $(M707_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M707_LDFLAGS) -o $(M707_TARGET) @build/M707_ofiles -$(BUILD_DIR)/rel/d/a/d_a_swBall/%.o: rel/d/a/d_a_swBall/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_swBall/%.o: rel/d/a/d_a_swBall/%.cpp $(BUILD_DIR)/rel/d/a/d_a_swBall/%.d @echo [707] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M707_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M707_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M707_D_FILES := $(M707_O_FILES:.o=.d) +$(M707_D_FILES): +include $(wildcard $(M707_D_FILES)) +endif diff --git a/rel/d/a/d_a_swLBall/Makefile b/rel/d/a/d_a_swLBall/Makefile index d09527ad9e..68a5e26f50 100644 --- a/rel/d/a/d_a_swLBall/Makefile +++ b/rel/d/a/d_a_swLBall/Makefile @@ -38,10 +38,17 @@ $(M708_TARGET): $(M708_O_FILES) $(M708_LIBS) @python3 tools/lcf.py rel 708 --output $(M708_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M708_LDFLAGS) -o $(M708_TARGET) @build/M708_ofiles -$(BUILD_DIR)/rel/d/a/d_a_swLBall/%.o: rel/d/a/d_a_swLBall/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_swLBall/%.o: rel/d/a/d_a_swLBall/%.cpp $(BUILD_DIR)/rel/d/a/d_a_swLBall/%.d @echo [708] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M708_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M708_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M708_D_FILES := $(M708_O_FILES:.o=.d) +$(M708_D_FILES): +include $(wildcard $(M708_D_FILES)) +endif diff --git a/rel/d/a/d_a_swTime/Makefile b/rel/d/a/d_a_swTime/Makefile index 2aac20a186..33b6d9b423 100644 --- a/rel/d/a/d_a_swTime/Makefile +++ b/rel/d/a/d_a_swTime/Makefile @@ -38,10 +38,17 @@ $(M709_TARGET): $(M709_O_FILES) $(M709_LIBS) @python3 tools/lcf.py rel 709 --output $(M709_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M709_LDFLAGS) -o $(M709_TARGET) @build/M709_ofiles -$(BUILD_DIR)/rel/d/a/d_a_swTime/%.o: rel/d/a/d_a_swTime/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_swTime/%.o: rel/d/a/d_a_swTime/%.cpp $(BUILD_DIR)/rel/d/a/d_a_swTime/%.d @echo [709] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M709_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M709_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M709_D_FILES := $(M709_O_FILES:.o=.d) +$(M709_D_FILES): +include $(wildcard $(M709_D_FILES)) +endif diff --git a/rel/d/a/d_a_swc00/Makefile b/rel/d/a/d_a_swc00/Makefile index 8cf4e6c1de..d98c9f0b33 100644 --- a/rel/d/a/d_a_swc00/Makefile +++ b/rel/d/a/d_a_swc00/Makefile @@ -40,10 +40,17 @@ $(M120_TARGET): $(M120_O_FILES) $(M120_LIBS) @python3 tools/lcf.py rel 120 --output $(M120_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M120_LDFLAGS) -o $(M120_TARGET) @build/M120_ofiles -$(BUILD_DIR)/rel/d/a/d_a_swc00/%.o: rel/d/a/d_a_swc00/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_swc00/%.o: rel/d/a/d_a_swc00/%.cpp $(BUILD_DIR)/rel/d/a/d_a_swc00/%.d @echo [120] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M120_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M120_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M120_D_FILES := $(M120_O_FILES:.o=.d) +$(M120_D_FILES): +include $(wildcard $(M120_D_FILES)) +endif diff --git a/rel/d/a/d_a_swhit0/Makefile b/rel/d/a/d_a_swhit0/Makefile index 8ea12cd71a..252a685d4e 100644 --- a/rel/d/a/d_a_swhit0/Makefile +++ b/rel/d/a/d_a_swhit0/Makefile @@ -38,10 +38,17 @@ $(M26_TARGET): $(M26_O_FILES) $(M26_LIBS) @python3 tools/lcf.py rel 26 --output $(M26_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M26_LDFLAGS) -o $(M26_TARGET) @build/M26_ofiles -$(BUILD_DIR)/rel/d/a/d_a_swhit0/%.o: rel/d/a/d_a_swhit0/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_swhit0/%.o: rel/d/a/d_a_swhit0/%.cpp $(BUILD_DIR)/rel/d/a/d_a_swhit0/%.d @echo [ 26] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M26_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M26_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M26_D_FILES := $(M26_O_FILES:.o=.d) +$(M26_D_FILES): +include $(wildcard $(M26_D_FILES)) +endif diff --git a/rel/d/a/d_a_talk/Makefile b/rel/d/a/d_a_talk/Makefile index 31c6e3a618..a74f75012c 100644 --- a/rel/d/a/d_a_talk/Makefile +++ b/rel/d/a/d_a_talk/Makefile @@ -38,10 +38,17 @@ $(M754_TARGET): $(M754_O_FILES) $(M754_LIBS) @python3 tools/lcf.py rel 754 --output $(M754_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M754_LDFLAGS) -o $(M754_TARGET) @build/M754_ofiles -$(BUILD_DIR)/rel/d/a/d_a_talk/%.o: rel/d/a/d_a_talk/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_talk/%.o: rel/d/a/d_a_talk/%.cpp $(BUILD_DIR)/rel/d/a/d_a_talk/%.d @echo [754] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M754_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M754_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M754_D_FILES := $(M754_O_FILES:.o=.d) +$(M754_D_FILES): +include $(wildcard $(M754_D_FILES)) +endif diff --git a/rel/d/a/d_a_tbox/Makefile b/rel/d/a/d_a_tbox/Makefile index fb0ffce1cd..01f28f29d7 100644 --- a/rel/d/a/d_a_tbox/Makefile +++ b/rel/d/a/d_a_tbox/Makefile @@ -40,10 +40,17 @@ $(M41_TARGET): $(M41_O_FILES) $(M41_LIBS) @python3 tools/lcf.py rel 41 --output $(M41_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M41_LDFLAGS) -o $(M41_TARGET) @build/M41_ofiles -$(BUILD_DIR)/rel/d/a/d_a_tbox/%.o: rel/d/a/d_a_tbox/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_tbox/%.o: rel/d/a/d_a_tbox/%.cpp $(BUILD_DIR)/rel/d/a/d_a_tbox/%.d @echo [ 41] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M41_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M41_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M41_D_FILES := $(M41_O_FILES:.o=.d) +$(M41_D_FILES): +include $(wildcard $(M41_D_FILES)) +endif diff --git a/rel/d/a/d_a_tbox2/Makefile b/rel/d/a/d_a_tbox2/Makefile index 6c20257f4e..06bf4a7e81 100644 --- a/rel/d/a/d_a_tbox2/Makefile +++ b/rel/d/a/d_a_tbox2/Makefile @@ -40,10 +40,17 @@ $(M42_TARGET): $(M42_O_FILES) $(M42_LIBS) @python3 tools/lcf.py rel 42 --output $(M42_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M42_LDFLAGS) -o $(M42_TARGET) @build/M42_ofiles -$(BUILD_DIR)/rel/d/a/d_a_tbox2/%.o: rel/d/a/d_a_tbox2/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_tbox2/%.o: rel/d/a/d_a_tbox2/%.cpp $(BUILD_DIR)/rel/d/a/d_a_tbox2/%.d @echo [ 42] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M42_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M42_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M42_D_FILES := $(M42_O_FILES:.o=.d) +$(M42_D_FILES): +include $(wildcard $(M42_D_FILES)) +endif diff --git a/rel/d/a/d_a_tboxSw/Makefile b/rel/d/a/d_a_tboxSw/Makefile index 95f009a098..da578c693e 100644 --- a/rel/d/a/d_a_tboxSw/Makefile +++ b/rel/d/a/d_a_tboxSw/Makefile @@ -38,10 +38,17 @@ $(M755_TARGET): $(M755_O_FILES) $(M755_LIBS) @python3 tools/lcf.py rel 755 --output $(M755_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M755_LDFLAGS) -o $(M755_TARGET) @build/M755_ofiles -$(BUILD_DIR)/rel/d/a/d_a_tboxSw/%.o: rel/d/a/d_a_tboxSw/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_tboxSw/%.o: rel/d/a/d_a_tboxSw/%.cpp $(BUILD_DIR)/rel/d/a/d_a_tboxSw/%.d @echo [755] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M755_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M755_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M755_D_FILES := $(M755_O_FILES:.o=.d) +$(M755_D_FILES): +include $(wildcard $(M755_D_FILES)) +endif diff --git a/rel/d/a/d_a_title/Makefile b/rel/d/a/d_a_title/Makefile index f181cfde40..c4cf15534e 100644 --- a/rel/d/a/d_a_title/Makefile +++ b/rel/d/a/d_a_title/Makefile @@ -40,10 +40,17 @@ $(M756_TARGET): $(M756_O_FILES) $(M756_LIBS) @python3 tools/lcf.py rel 756 --output $(M756_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M756_LDFLAGS) -o $(M756_TARGET) @build/M756_ofiles -$(BUILD_DIR)/rel/d/a/d_a_title/%.o: rel/d/a/d_a_title/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_title/%.o: rel/d/a/d_a_title/%.cpp $(BUILD_DIR)/rel/d/a/d_a_title/%.d @echo [756] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M756_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M756_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M756_D_FILES := $(M756_O_FILES:.o=.d) +$(M756_D_FILES): +include $(wildcard $(M756_D_FILES)) +endif diff --git a/rel/d/a/d_a_vrbox/Makefile b/rel/d/a/d_a_vrbox/Makefile index 463d51410f..60012c967a 100644 --- a/rel/d/a/d_a_vrbox/Makefile +++ b/rel/d/a/d_a_vrbox/Makefile @@ -38,10 +38,17 @@ $(M43_TARGET): $(M43_O_FILES) $(M43_LIBS) @python3 tools/lcf.py rel 43 --output $(M43_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M43_LDFLAGS) -o $(M43_TARGET) @build/M43_ofiles -$(BUILD_DIR)/rel/d/a/d_a_vrbox/%.o: rel/d/a/d_a_vrbox/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_vrbox/%.o: rel/d/a/d_a_vrbox/%.cpp $(BUILD_DIR)/rel/d/a/d_a_vrbox/%.d @echo [ 43] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M43_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M43_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M43_D_FILES := $(M43_O_FILES:.o=.d) +$(M43_D_FILES): +include $(wildcard $(M43_D_FILES)) +endif diff --git a/rel/d/a/d_a_vrbox2/Makefile b/rel/d/a/d_a_vrbox2/Makefile index ab9b5765f6..d8bf1830bf 100644 --- a/rel/d/a/d_a_vrbox2/Makefile +++ b/rel/d/a/d_a_vrbox2/Makefile @@ -38,10 +38,17 @@ $(M44_TARGET): $(M44_O_FILES) $(M44_LIBS) @python3 tools/lcf.py rel 44 --output $(M44_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M44_LDFLAGS) -o $(M44_TARGET) @build/M44_ofiles -$(BUILD_DIR)/rel/d/a/d_a_vrbox2/%.o: rel/d/a/d_a_vrbox2/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_vrbox2/%.o: rel/d/a/d_a_vrbox2/%.cpp $(BUILD_DIR)/rel/d/a/d_a_vrbox2/%.d @echo [ 44] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M44_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M44_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M44_D_FILES := $(M44_O_FILES:.o=.d) +$(M44_D_FILES): +include $(wildcard $(M44_D_FILES)) +endif diff --git a/rel/d/a/d_a_warp_bug/Makefile b/rel/d/a/d_a_warp_bug/Makefile index 54d8bf11ae..e9d1955364 100644 --- a/rel/d/a/d_a_warp_bug/Makefile +++ b/rel/d/a/d_a_warp_bug/Makefile @@ -38,10 +38,17 @@ $(M757_TARGET): $(M757_O_FILES) $(M757_LIBS) @python3 tools/lcf.py rel 757 --output $(M757_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M757_LDFLAGS) -o $(M757_TARGET) @build/M757_ofiles -$(BUILD_DIR)/rel/d/a/d_a_warp_bug/%.o: rel/d/a/d_a_warp_bug/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_warp_bug/%.o: rel/d/a/d_a_warp_bug/%.cpp $(BUILD_DIR)/rel/d/a/d_a_warp_bug/%.d @echo [757] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M757_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M757_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M757_D_FILES := $(M757_O_FILES:.o=.d) +$(M757_D_FILES): +include $(wildcard $(M757_D_FILES)) +endif diff --git a/rel/d/a/d_a_ykgr/Makefile b/rel/d/a/d_a_ykgr/Makefile index 6bd9a4d8de..6959e5a848 100644 --- a/rel/d/a/d_a_ykgr/Makefile +++ b/rel/d/a/d_a_ykgr/Makefile @@ -40,10 +40,17 @@ $(M134_TARGET): $(M134_O_FILES) $(M134_LIBS) @python3 tools/lcf.py rel 134 --output $(M134_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M134_LDFLAGS) -o $(M134_TARGET) @build/M134_ofiles -$(BUILD_DIR)/rel/d/a/d_a_ykgr/%.o: rel/d/a/d_a_ykgr/%.cpp +$(BUILD_DIR)/rel/d/a/d_a_ykgr/%.o: rel/d/a/d_a_ykgr/%.cpp $(BUILD_DIR)/rel/d/a/d_a_ykgr/%.d @echo [134] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M134_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M134_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M134_D_FILES := $(M134_O_FILES:.o=.d) +$(M134_D_FILES): +include $(wildcard $(M134_D_FILES)) +endif diff --git a/rel/d/a/door/d_a_door_boss/Makefile b/rel/d/a/door/d_a_door_boss/Makefile index 2f10026597..7fd27f1168 100644 --- a/rel/d/a/door/d_a_door_boss/Makefile +++ b/rel/d/a/door/d_a_door_boss/Makefile @@ -40,10 +40,17 @@ $(M166_TARGET): $(M166_O_FILES) $(M166_LIBS) @python3 tools/lcf.py rel 166 --output $(M166_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M166_LDFLAGS) -o $(M166_TARGET) @build/M166_ofiles -$(BUILD_DIR)/rel/d/a/door/d_a_door_boss/%.o: rel/d/a/door/d_a_door_boss/%.cpp +$(BUILD_DIR)/rel/d/a/door/d_a_door_boss/%.o: rel/d/a/door/d_a_door_boss/%.cpp $(BUILD_DIR)/rel/d/a/door/d_a_door_boss/%.d @echo [166] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M166_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M166_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M166_D_FILES := $(M166_O_FILES:.o=.d) +$(M166_D_FILES): +include $(wildcard $(M166_D_FILES)) +endif diff --git a/rel/d/a/door/d_a_door_bossL5/Makefile b/rel/d/a/door/d_a_door_bossL5/Makefile index 74cc2d8c95..52439283c2 100644 --- a/rel/d/a/door/d_a_door_bossL5/Makefile +++ b/rel/d/a/door/d_a_door_bossL5/Makefile @@ -40,10 +40,17 @@ $(M167_TARGET): $(M167_O_FILES) $(M167_LIBS) @python3 tools/lcf.py rel 167 --output $(M167_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M167_LDFLAGS) -o $(M167_TARGET) @build/M167_ofiles -$(BUILD_DIR)/rel/d/a/door/d_a_door_bossL5/%.o: rel/d/a/door/d_a_door_bossL5/%.cpp +$(BUILD_DIR)/rel/d/a/door/d_a_door_bossL5/%.o: rel/d/a/door/d_a_door_bossL5/%.cpp $(BUILD_DIR)/rel/d/a/door/d_a_door_bossL5/%.d @echo [167] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M167_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M167_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M167_D_FILES := $(M167_O_FILES:.o=.d) +$(M167_D_FILES): +include $(wildcard $(M167_D_FILES)) +endif diff --git a/rel/d/a/door/d_a_door_bossl1/Makefile b/rel/d/a/door/d_a_door_bossl1/Makefile index 245ffcd626..33fc5a261c 100644 --- a/rel/d/a/door/d_a_door_bossl1/Makefile +++ b/rel/d/a/door/d_a_door_bossl1/Makefile @@ -40,10 +40,17 @@ $(M64_TARGET): $(M64_O_FILES) $(M64_LIBS) @python3 tools/lcf.py rel 64 --output $(M64_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M64_LDFLAGS) -o $(M64_TARGET) @build/M64_ofiles -$(BUILD_DIR)/rel/d/a/door/d_a_door_bossl1/%.o: rel/d/a/door/d_a_door_bossl1/%.cpp +$(BUILD_DIR)/rel/d/a/door/d_a_door_bossl1/%.o: rel/d/a/door/d_a_door_bossl1/%.cpp $(BUILD_DIR)/rel/d/a/door/d_a_door_bossl1/%.d @echo [ 64] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M64_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M64_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M64_D_FILES := $(M64_O_FILES:.o=.d) +$(M64_D_FILES): +include $(wildcard $(M64_D_FILES)) +endif diff --git a/rel/d/a/door/d_a_door_dbdoor00/Makefile b/rel/d/a/door/d_a_door_dbdoor00/Makefile index f0703b12d8..11c492f5e7 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/Makefile +++ b/rel/d/a/door/d_a_door_dbdoor00/Makefile @@ -38,10 +38,17 @@ $(M6_TARGET): $(M6_O_FILES) $(M6_LIBS) @python3 tools/lcf.py rel 6 --output $(M6_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M6_LDFLAGS) -o $(M6_TARGET) @build/M6_ofiles -$(BUILD_DIR)/rel/d/a/door/d_a_door_dbdoor00/%.o: rel/d/a/door/d_a_door_dbdoor00/%.cpp +$(BUILD_DIR)/rel/d/a/door/d_a_door_dbdoor00/%.o: rel/d/a/door/d_a_door_dbdoor00/%.cpp $(BUILD_DIR)/rel/d/a/door/d_a_door_dbdoor00/%.d @echo [ 6] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M6_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M6_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M6_D_FILES := $(M6_O_FILES:.o=.d) +$(M6_D_FILES): +include $(wildcard $(M6_D_FILES)) +endif diff --git a/rel/d/a/door/d_a_door_knob00/Makefile b/rel/d/a/door/d_a_door_knob00/Makefile index 3ff10f62af..d9e15bfd24 100644 --- a/rel/d/a/door/d_a_door_knob00/Makefile +++ b/rel/d/a/door/d_a_door_knob00/Makefile @@ -38,10 +38,17 @@ $(M7_TARGET): $(M7_O_FILES) $(M7_LIBS) @python3 tools/lcf.py rel 7 --output $(M7_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M7_LDFLAGS) -o $(M7_TARGET) @build/M7_ofiles -$(BUILD_DIR)/rel/d/a/door/d_a_door_knob00/%.o: rel/d/a/door/d_a_door_knob00/%.cpp +$(BUILD_DIR)/rel/d/a/door/d_a_door_knob00/%.o: rel/d/a/door/d_a_door_knob00/%.cpp $(BUILD_DIR)/rel/d/a/door/d_a_door_knob00/%.d @echo [ 7] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M7_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M7_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M7_D_FILES := $(M7_O_FILES:.o=.d) +$(M7_D_FILES): +include $(wildcard $(M7_D_FILES)) +endif diff --git a/rel/d/a/door/d_a_door_mbossL1/Makefile b/rel/d/a/door/d_a_door_mbossL1/Makefile index 6240478eeb..935627c04f 100644 --- a/rel/d/a/door/d_a_door_mbossL1/Makefile +++ b/rel/d/a/door/d_a_door_mbossL1/Makefile @@ -40,10 +40,17 @@ $(M168_TARGET): $(M168_O_FILES) $(M168_LIBS) @python3 tools/lcf.py rel 168 --output $(M168_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M168_LDFLAGS) -o $(M168_TARGET) @build/M168_ofiles -$(BUILD_DIR)/rel/d/a/door/d_a_door_mbossL1/%.o: rel/d/a/door/d_a_door_mbossL1/%.cpp +$(BUILD_DIR)/rel/d/a/door/d_a_door_mbossL1/%.o: rel/d/a/door/d_a_door_mbossL1/%.cpp $(BUILD_DIR)/rel/d/a/door/d_a_door_mbossL1/%.d @echo [168] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M168_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M168_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M168_D_FILES := $(M168_O_FILES:.o=.d) +$(M168_D_FILES): +include $(wildcard $(M168_D_FILES)) +endif diff --git a/rel/d/a/door/d_a_door_push/Makefile b/rel/d/a/door/d_a_door_push/Makefile index e8ebf39407..e440d0a259 100644 --- a/rel/d/a/door/d_a_door_push/Makefile +++ b/rel/d/a/door/d_a_door_push/Makefile @@ -40,10 +40,17 @@ $(M169_TARGET): $(M169_O_FILES) $(M169_LIBS) @python3 tools/lcf.py rel 169 --output $(M169_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M169_LDFLAGS) -o $(M169_TARGET) @build/M169_ofiles -$(BUILD_DIR)/rel/d/a/door/d_a_door_push/%.o: rel/d/a/door/d_a_door_push/%.cpp +$(BUILD_DIR)/rel/d/a/door/d_a_door_push/%.o: rel/d/a/door/d_a_door_push/%.cpp $(BUILD_DIR)/rel/d/a/door/d_a_door_push/%.d @echo [169] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M169_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M169_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M169_D_FILES := $(M169_O_FILES:.o=.d) +$(M169_D_FILES): +include $(wildcard $(M169_D_FILES)) +endif diff --git a/rel/d/a/door/d_a_door_shutter/Makefile b/rel/d/a/door/d_a_door_shutter/Makefile index 5f1f1bec7f..0dab7fbf04 100644 --- a/rel/d/a/door/d_a_door_shutter/Makefile +++ b/rel/d/a/door/d_a_door_shutter/Makefile @@ -38,10 +38,17 @@ $(M8_TARGET): $(M8_O_FILES) $(M8_LIBS) @python3 tools/lcf.py rel 8 --output $(M8_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M8_LDFLAGS) -o $(M8_TARGET) @build/M8_ofiles -$(BUILD_DIR)/rel/d/a/door/d_a_door_shutter/%.o: rel/d/a/door/d_a_door_shutter/%.cpp +$(BUILD_DIR)/rel/d/a/door/d_a_door_shutter/%.o: rel/d/a/door/d_a_door_shutter/%.cpp $(BUILD_DIR)/rel/d/a/door/d_a_door_shutter/%.d @echo [ 8] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M8_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M8_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M8_D_FILES := $(M8_O_FILES:.o=.d) +$(M8_D_FILES): +include $(wildcard $(M8_D_FILES)) +endif diff --git a/rel/d/a/door/d_a_door_spiral/Makefile b/rel/d/a/door/d_a_door_spiral/Makefile index c5df689cbf..e4745c481e 100644 --- a/rel/d/a/door/d_a_door_spiral/Makefile +++ b/rel/d/a/door/d_a_door_spiral/Makefile @@ -38,10 +38,17 @@ $(M9_TARGET): $(M9_O_FILES) $(M9_LIBS) @python3 tools/lcf.py rel 9 --output $(M9_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M9_LDFLAGS) -o $(M9_TARGET) @build/M9_ofiles -$(BUILD_DIR)/rel/d/a/door/d_a_door_spiral/%.o: rel/d/a/door/d_a_door_spiral/%.cpp +$(BUILD_DIR)/rel/d/a/door/d_a_door_spiral/%.o: rel/d/a/door/d_a_door_spiral/%.cpp $(BUILD_DIR)/rel/d/a/door/d_a_door_spiral/%.d @echo [ 9] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M9_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M9_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M9_D_FILES := $(M9_O_FILES:.o=.d) +$(M9_D_FILES): +include $(wildcard $(M9_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ai/Makefile b/rel/d/a/e/d_a_e_ai/Makefile index 43a2ede61d..913eb10dd4 100644 --- a/rel/d/a/e/d_a_e_ai/Makefile +++ b/rel/d/a/e/d_a_e_ai/Makefile @@ -40,10 +40,17 @@ $(M170_TARGET): $(M170_O_FILES) $(M170_LIBS) @python3 tools/lcf.py rel 170 --output $(M170_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M170_LDFLAGS) -o $(M170_TARGET) @build/M170_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ai/%.o: rel/d/a/e/d_a_e_ai/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ai/%.o: rel/d/a/e/d_a_e_ai/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ai/%.d @echo [170] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M170_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M170_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M170_D_FILES := $(M170_O_FILES:.o=.d) +$(M170_D_FILES): +include $(wildcard $(M170_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_arrow/Makefile b/rel/d/a/e/d_a_e_arrow/Makefile index b1a693d2cb..06f8c62525 100644 --- a/rel/d/a/e/d_a_e_arrow/Makefile +++ b/rel/d/a/e/d_a_e_arrow/Makefile @@ -40,10 +40,17 @@ $(M171_TARGET): $(M171_O_FILES) $(M171_LIBS) @python3 tools/lcf.py rel 171 --output $(M171_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M171_LDFLAGS) -o $(M171_TARGET) @build/M171_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_arrow/%.o: rel/d/a/e/d_a_e_arrow/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_arrow/%.o: rel/d/a/e/d_a_e_arrow/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_arrow/%.d @echo [171] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M171_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M171_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M171_D_FILES := $(M171_O_FILES:.o=.d) +$(M171_D_FILES): +include $(wildcard $(M171_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ba/Makefile b/rel/d/a/e/d_a_e_ba/Makefile index 795584cb52..10d837ee80 100644 --- a/rel/d/a/e/d_a_e_ba/Makefile +++ b/rel/d/a/e/d_a_e_ba/Makefile @@ -40,10 +40,17 @@ $(M172_TARGET): $(M172_O_FILES) $(M172_LIBS) @python3 tools/lcf.py rel 172 --output $(M172_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M172_LDFLAGS) -o $(M172_TARGET) @build/M172_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ba/%.o: rel/d/a/e/d_a_e_ba/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ba/%.o: rel/d/a/e/d_a_e_ba/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ba/%.d @echo [172] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M172_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M172_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M172_D_FILES := $(M172_O_FILES:.o=.d) +$(M172_D_FILES): +include $(wildcard $(M172_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_bee/Makefile b/rel/d/a/e/d_a_e_bee/Makefile index ef2c8076d8..6b35d5d1ca 100644 --- a/rel/d/a/e/d_a_e_bee/Makefile +++ b/rel/d/a/e/d_a_e_bee/Makefile @@ -40,10 +40,17 @@ $(M173_TARGET): $(M173_O_FILES) $(M173_LIBS) @python3 tools/lcf.py rel 173 --output $(M173_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M173_LDFLAGS) -o $(M173_TARGET) @build/M173_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_bee/%.o: rel/d/a/e/d_a_e_bee/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_bee/%.o: rel/d/a/e/d_a_e_bee/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_bee/%.d @echo [173] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M173_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M173_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M173_D_FILES := $(M173_O_FILES:.o=.d) +$(M173_D_FILES): +include $(wildcard $(M173_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_bg/Makefile b/rel/d/a/e/d_a_e_bg/Makefile index 2e9908b334..32c02bc9b6 100644 --- a/rel/d/a/e/d_a_e_bg/Makefile +++ b/rel/d/a/e/d_a_e_bg/Makefile @@ -40,10 +40,17 @@ $(M174_TARGET): $(M174_O_FILES) $(M174_LIBS) @python3 tools/lcf.py rel 174 --output $(M174_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M174_LDFLAGS) -o $(M174_TARGET) @build/M174_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_bg/%.o: rel/d/a/e/d_a_e_bg/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_bg/%.o: rel/d/a/e/d_a_e_bg/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_bg/%.d @echo [174] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M174_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M174_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M174_D_FILES := $(M174_O_FILES:.o=.d) +$(M174_D_FILES): +include $(wildcard $(M174_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_bi/Makefile b/rel/d/a/e/d_a_e_bi/Makefile index 648850adcd..342b3d976c 100644 --- a/rel/d/a/e/d_a_e_bi/Makefile +++ b/rel/d/a/e/d_a_e_bi/Makefile @@ -40,10 +40,17 @@ $(M175_TARGET): $(M175_O_FILES) $(M175_LIBS) @python3 tools/lcf.py rel 175 --output $(M175_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M175_LDFLAGS) -o $(M175_TARGET) @build/M175_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_bi/%.o: rel/d/a/e/d_a_e_bi/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_bi/%.o: rel/d/a/e/d_a_e_bi/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_bi/%.d @echo [175] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M175_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M175_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M175_D_FILES := $(M175_O_FILES:.o=.d) +$(M175_D_FILES): +include $(wildcard $(M175_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_bi_leaf/Makefile b/rel/d/a/e/d_a_e_bi_leaf/Makefile index cebcae7615..7da2964328 100644 --- a/rel/d/a/e/d_a_e_bi_leaf/Makefile +++ b/rel/d/a/e/d_a_e_bi_leaf/Makefile @@ -38,10 +38,17 @@ $(M176_TARGET): $(M176_O_FILES) $(M176_LIBS) @python3 tools/lcf.py rel 176 --output $(M176_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M176_LDFLAGS) -o $(M176_TARGET) @build/M176_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_bi_leaf/%.o: rel/d/a/e/d_a_e_bi_leaf/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_bi_leaf/%.o: rel/d/a/e/d_a_e_bi_leaf/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_bi_leaf/%.d @echo [176] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M176_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M176_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M176_D_FILES := $(M176_O_FILES:.o=.d) +$(M176_D_FILES): +include $(wildcard $(M176_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_bs/Makefile b/rel/d/a/e/d_a_e_bs/Makefile index d7ba6157e5..29e78c56a9 100644 --- a/rel/d/a/e/d_a_e_bs/Makefile +++ b/rel/d/a/e/d_a_e_bs/Makefile @@ -40,10 +40,17 @@ $(M177_TARGET): $(M177_O_FILES) $(M177_LIBS) @python3 tools/lcf.py rel 177 --output $(M177_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M177_LDFLAGS) -o $(M177_TARGET) @build/M177_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_bs/%.o: rel/d/a/e/d_a_e_bs/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_bs/%.o: rel/d/a/e/d_a_e_bs/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_bs/%.d @echo [177] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M177_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M177_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M177_D_FILES := $(M177_O_FILES:.o=.d) +$(M177_D_FILES): +include $(wildcard $(M177_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_bu/Makefile b/rel/d/a/e/d_a_e_bu/Makefile index 0ab249f3b6..f5bb228d89 100644 --- a/rel/d/a/e/d_a_e_bu/Makefile +++ b/rel/d/a/e/d_a_e_bu/Makefile @@ -40,10 +40,17 @@ $(M178_TARGET): $(M178_O_FILES) $(M178_LIBS) @python3 tools/lcf.py rel 178 --output $(M178_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M178_LDFLAGS) -o $(M178_TARGET) @build/M178_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_bu/%.o: rel/d/a/e/d_a_e_bu/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_bu/%.o: rel/d/a/e/d_a_e_bu/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_bu/%.d @echo [178] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M178_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M178_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M178_D_FILES := $(M178_O_FILES:.o=.d) +$(M178_D_FILES): +include $(wildcard $(M178_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_bug/Makefile b/rel/d/a/e/d_a_e_bug/Makefile index 3279c0addb..736dfee5ce 100644 --- a/rel/d/a/e/d_a_e_bug/Makefile +++ b/rel/d/a/e/d_a_e_bug/Makefile @@ -40,10 +40,17 @@ $(M179_TARGET): $(M179_O_FILES) $(M179_LIBS) @python3 tools/lcf.py rel 179 --output $(M179_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M179_LDFLAGS) -o $(M179_TARGET) @build/M179_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_bug/%.o: rel/d/a/e/d_a_e_bug/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_bug/%.o: rel/d/a/e/d_a_e_bug/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_bug/%.d @echo [179] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M179_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M179_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M179_D_FILES := $(M179_O_FILES:.o=.d) +$(M179_D_FILES): +include $(wildcard $(M179_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_cr/Makefile b/rel/d/a/e/d_a_e_cr/Makefile index 6448853239..d812ca5dfa 100644 --- a/rel/d/a/e/d_a_e_cr/Makefile +++ b/rel/d/a/e/d_a_e_cr/Makefile @@ -40,10 +40,17 @@ $(M180_TARGET): $(M180_O_FILES) $(M180_LIBS) @python3 tools/lcf.py rel 180 --output $(M180_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M180_LDFLAGS) -o $(M180_TARGET) @build/M180_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_cr/%.o: rel/d/a/e/d_a_e_cr/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_cr/%.o: rel/d/a/e/d_a_e_cr/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_cr/%.d @echo [180] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M180_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M180_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M180_D_FILES := $(M180_O_FILES:.o=.d) +$(M180_D_FILES): +include $(wildcard $(M180_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_cr_egg/Makefile b/rel/d/a/e/d_a_e_cr_egg/Makefile index 065c6571c1..7d4927d24c 100644 --- a/rel/d/a/e/d_a_e_cr_egg/Makefile +++ b/rel/d/a/e/d_a_e_cr_egg/Makefile @@ -38,10 +38,17 @@ $(M181_TARGET): $(M181_O_FILES) $(M181_LIBS) @python3 tools/lcf.py rel 181 --output $(M181_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M181_LDFLAGS) -o $(M181_TARGET) @build/M181_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_cr_egg/%.o: rel/d/a/e/d_a_e_cr_egg/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_cr_egg/%.o: rel/d/a/e/d_a_e_cr_egg/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_cr_egg/%.d @echo [181] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M181_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M181_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M181_D_FILES := $(M181_O_FILES:.o=.d) +$(M181_D_FILES): +include $(wildcard $(M181_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_db/Makefile b/rel/d/a/e/d_a_e_db/Makefile index b6532b20ad..2da0d0ff04 100644 --- a/rel/d/a/e/d_a_e_db/Makefile +++ b/rel/d/a/e/d_a_e_db/Makefile @@ -40,10 +40,17 @@ $(M182_TARGET): $(M182_O_FILES) $(M182_LIBS) @python3 tools/lcf.py rel 182 --output $(M182_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M182_LDFLAGS) -o $(M182_TARGET) @build/M182_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_db/%.o: rel/d/a/e/d_a_e_db/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_db/%.o: rel/d/a/e/d_a_e_db/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_db/%.d @echo [182] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M182_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M182_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M182_D_FILES := $(M182_O_FILES:.o=.d) +$(M182_D_FILES): +include $(wildcard $(M182_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_db_leaf/Makefile b/rel/d/a/e/d_a_e_db_leaf/Makefile index fbdb8a876f..85de7888d1 100644 --- a/rel/d/a/e/d_a_e_db_leaf/Makefile +++ b/rel/d/a/e/d_a_e_db_leaf/Makefile @@ -38,10 +38,17 @@ $(M183_TARGET): $(M183_O_FILES) $(M183_LIBS) @python3 tools/lcf.py rel 183 --output $(M183_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M183_LDFLAGS) -o $(M183_TARGET) @build/M183_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_db_leaf/%.o: rel/d/a/e/d_a_e_db_leaf/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_db_leaf/%.o: rel/d/a/e/d_a_e_db_leaf/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_db_leaf/%.d @echo [183] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M183_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M183_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M183_D_FILES := $(M183_O_FILES:.o=.d) +$(M183_D_FILES): +include $(wildcard $(M183_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_dd/Makefile b/rel/d/a/e/d_a_e_dd/Makefile index 6e0fda40a2..9863e846a6 100644 --- a/rel/d/a/e/d_a_e_dd/Makefile +++ b/rel/d/a/e/d_a_e_dd/Makefile @@ -40,10 +40,17 @@ $(M184_TARGET): $(M184_O_FILES) $(M184_LIBS) @python3 tools/lcf.py rel 184 --output $(M184_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M184_LDFLAGS) -o $(M184_TARGET) @build/M184_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_dd/%.o: rel/d/a/e/d_a_e_dd/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_dd/%.o: rel/d/a/e/d_a_e_dd/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_dd/%.d @echo [184] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M184_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M184_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M184_D_FILES := $(M184_O_FILES:.o=.d) +$(M184_D_FILES): +include $(wildcard $(M184_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_df/Makefile b/rel/d/a/e/d_a_e_df/Makefile index b464b59db2..a170368b72 100644 --- a/rel/d/a/e/d_a_e_df/Makefile +++ b/rel/d/a/e/d_a_e_df/Makefile @@ -40,10 +40,17 @@ $(M185_TARGET): $(M185_O_FILES) $(M185_LIBS) @python3 tools/lcf.py rel 185 --output $(M185_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M185_LDFLAGS) -o $(M185_TARGET) @build/M185_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_df/%.o: rel/d/a/e/d_a_e_df/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_df/%.o: rel/d/a/e/d_a_e_df/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_df/%.d @echo [185] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M185_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M185_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M185_D_FILES := $(M185_O_FILES:.o=.d) +$(M185_D_FILES): +include $(wildcard $(M185_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_dk/Makefile b/rel/d/a/e/d_a_e_dk/Makefile index ea2d670e9a..fa9e270306 100644 --- a/rel/d/a/e/d_a_e_dk/Makefile +++ b/rel/d/a/e/d_a_e_dk/Makefile @@ -40,10 +40,17 @@ $(M186_TARGET): $(M186_O_FILES) $(M186_LIBS) @python3 tools/lcf.py rel 186 --output $(M186_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M186_LDFLAGS) -o $(M186_TARGET) @build/M186_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_dk/%.o: rel/d/a/e/d_a_e_dk/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_dk/%.o: rel/d/a/e/d_a_e_dk/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_dk/%.d @echo [186] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M186_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M186_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M186_D_FILES := $(M186_O_FILES:.o=.d) +$(M186_D_FILES): +include $(wildcard $(M186_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_dn/Makefile b/rel/d/a/e/d_a_e_dn/Makefile index 5e3ff5b598..09fbf4f9d1 100644 --- a/rel/d/a/e/d_a_e_dn/Makefile +++ b/rel/d/a/e/d_a_e_dn/Makefile @@ -40,10 +40,17 @@ $(M65_TARGET): $(M65_O_FILES) $(M65_LIBS) @python3 tools/lcf.py rel 65 --output $(M65_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M65_LDFLAGS) -o $(M65_TARGET) @build/M65_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_dn/%.o: rel/d/a/e/d_a_e_dn/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_dn/%.o: rel/d/a/e/d_a_e_dn/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_dn/%.d @echo [ 65] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M65_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M65_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M65_D_FILES := $(M65_O_FILES:.o=.d) +$(M65_D_FILES): +include $(wildcard $(M65_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_dt/Makefile b/rel/d/a/e/d_a_e_dt/Makefile index 3f56ed3424..9eaf3ab83e 100644 --- a/rel/d/a/e/d_a_e_dt/Makefile +++ b/rel/d/a/e/d_a_e_dt/Makefile @@ -40,10 +40,17 @@ $(M187_TARGET): $(M187_O_FILES) $(M187_LIBS) @python3 tools/lcf.py rel 187 --output $(M187_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M187_LDFLAGS) -o $(M187_TARGET) @build/M187_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_dt/%.o: rel/d/a/e/d_a_e_dt/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_dt/%.o: rel/d/a/e/d_a_e_dt/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_dt/%.d @echo [187] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M187_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M187_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M187_D_FILES := $(M187_O_FILES:.o=.d) +$(M187_D_FILES): +include $(wildcard $(M187_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_fb/Makefile b/rel/d/a/e/d_a_e_fb/Makefile index 2246d5934d..dbea74b886 100644 --- a/rel/d/a/e/d_a_e_fb/Makefile +++ b/rel/d/a/e/d_a_e_fb/Makefile @@ -40,10 +40,17 @@ $(M188_TARGET): $(M188_O_FILES) $(M188_LIBS) @python3 tools/lcf.py rel 188 --output $(M188_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M188_LDFLAGS) -o $(M188_TARGET) @build/M188_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_fb/%.o: rel/d/a/e/d_a_e_fb/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_fb/%.o: rel/d/a/e/d_a_e_fb/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_fb/%.d @echo [188] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M188_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M188_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M188_D_FILES := $(M188_O_FILES:.o=.d) +$(M188_D_FILES): +include $(wildcard $(M188_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_fk/Makefile b/rel/d/a/e/d_a_e_fk/Makefile index 8e10fb756f..8f0e751d52 100644 --- a/rel/d/a/e/d_a_e_fk/Makefile +++ b/rel/d/a/e/d_a_e_fk/Makefile @@ -40,10 +40,17 @@ $(M189_TARGET): $(M189_O_FILES) $(M189_LIBS) @python3 tools/lcf.py rel 189 --output $(M189_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M189_LDFLAGS) -o $(M189_TARGET) @build/M189_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_fk/%.o: rel/d/a/e/d_a_e_fk/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_fk/%.o: rel/d/a/e/d_a_e_fk/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_fk/%.d @echo [189] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M189_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M189_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M189_D_FILES := $(M189_O_FILES:.o=.d) +$(M189_D_FILES): +include $(wildcard $(M189_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_fm/Makefile b/rel/d/a/e/d_a_e_fm/Makefile index 6d36024dda..e3350e6347 100644 --- a/rel/d/a/e/d_a_e_fm/Makefile +++ b/rel/d/a/e/d_a_e_fm/Makefile @@ -40,10 +40,17 @@ $(M66_TARGET): $(M66_O_FILES) $(M66_LIBS) @python3 tools/lcf.py rel 66 --output $(M66_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M66_LDFLAGS) -o $(M66_TARGET) @build/M66_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_fm/%.o: rel/d/a/e/d_a_e_fm/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_fm/%.o: rel/d/a/e/d_a_e_fm/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_fm/%.d @echo [ 66] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M66_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M66_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M66_D_FILES := $(M66_O_FILES:.o=.d) +$(M66_D_FILES): +include $(wildcard $(M66_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_fs/Makefile b/rel/d/a/e/d_a_e_fs/Makefile index 8463fbc1f1..95b02de522 100644 --- a/rel/d/a/e/d_a_e_fs/Makefile +++ b/rel/d/a/e/d_a_e_fs/Makefile @@ -40,10 +40,17 @@ $(M190_TARGET): $(M190_O_FILES) $(M190_LIBS) @python3 tools/lcf.py rel 190 --output $(M190_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M190_LDFLAGS) -o $(M190_TARGET) @build/M190_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_fs/%.o: rel/d/a/e/d_a_e_fs/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_fs/%.o: rel/d/a/e/d_a_e_fs/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_fs/%.d @echo [190] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M190_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M190_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M190_D_FILES := $(M190_O_FILES:.o=.d) +$(M190_D_FILES): +include $(wildcard $(M190_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_fz/Makefile b/rel/d/a/e/d_a_e_fz/Makefile index be1cc9289a..60174c4ae1 100644 --- a/rel/d/a/e/d_a_e_fz/Makefile +++ b/rel/d/a/e/d_a_e_fz/Makefile @@ -40,10 +40,17 @@ $(M191_TARGET): $(M191_O_FILES) $(M191_LIBS) @python3 tools/lcf.py rel 191 --output $(M191_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M191_LDFLAGS) -o $(M191_TARGET) @build/M191_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_fz/%.o: rel/d/a/e/d_a_e_fz/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_fz/%.o: rel/d/a/e/d_a_e_fz/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_fz/%.d @echo [191] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M191_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M191_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M191_D_FILES := $(M191_O_FILES:.o=.d) +$(M191_D_FILES): +include $(wildcard $(M191_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ga/Makefile b/rel/d/a/e/d_a_e_ga/Makefile index 33198e7c7b..242c34e003 100644 --- a/rel/d/a/e/d_a_e_ga/Makefile +++ b/rel/d/a/e/d_a_e_ga/Makefile @@ -40,10 +40,17 @@ $(M67_TARGET): $(M67_O_FILES) $(M67_LIBS) @python3 tools/lcf.py rel 67 --output $(M67_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M67_LDFLAGS) -o $(M67_TARGET) @build/M67_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ga/%.o: rel/d/a/e/d_a_e_ga/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ga/%.o: rel/d/a/e/d_a_e_ga/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ga/%.d @echo [ 67] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M67_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M67_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M67_D_FILES := $(M67_O_FILES:.o=.d) +$(M67_D_FILES): +include $(wildcard $(M67_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_gb/Makefile b/rel/d/a/e/d_a_e_gb/Makefile index f8ea4cbabe..4985179292 100644 --- a/rel/d/a/e/d_a_e_gb/Makefile +++ b/rel/d/a/e/d_a_e_gb/Makefile @@ -40,10 +40,17 @@ $(M192_TARGET): $(M192_O_FILES) $(M192_LIBS) @python3 tools/lcf.py rel 192 --output $(M192_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M192_LDFLAGS) -o $(M192_TARGET) @build/M192_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_gb/%.o: rel/d/a/e/d_a_e_gb/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_gb/%.o: rel/d/a/e/d_a_e_gb/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_gb/%.d @echo [192] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M192_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M192_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M192_D_FILES := $(M192_O_FILES:.o=.d) +$(M192_D_FILES): +include $(wildcard $(M192_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ge/Makefile b/rel/d/a/e/d_a_e_ge/Makefile index d72ac834f3..f9aa9cc5f6 100644 --- a/rel/d/a/e/d_a_e_ge/Makefile +++ b/rel/d/a/e/d_a_e_ge/Makefile @@ -40,10 +40,17 @@ $(M193_TARGET): $(M193_O_FILES) $(M193_LIBS) @python3 tools/lcf.py rel 193 --output $(M193_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M193_LDFLAGS) -o $(M193_TARGET) @build/M193_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ge/%.o: rel/d/a/e/d_a_e_ge/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ge/%.o: rel/d/a/e/d_a_e_ge/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ge/%.d @echo [193] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M193_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M193_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M193_D_FILES := $(M193_O_FILES:.o=.d) +$(M193_D_FILES): +include $(wildcard $(M193_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_gi/Makefile b/rel/d/a/e/d_a_e_gi/Makefile index 7b2748dc00..b83625aa32 100644 --- a/rel/d/a/e/d_a_e_gi/Makefile +++ b/rel/d/a/e/d_a_e_gi/Makefile @@ -40,10 +40,17 @@ $(M194_TARGET): $(M194_O_FILES) $(M194_LIBS) @python3 tools/lcf.py rel 194 --output $(M194_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M194_LDFLAGS) -o $(M194_TARGET) @build/M194_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_gi/%.o: rel/d/a/e/d_a_e_gi/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_gi/%.o: rel/d/a/e/d_a_e_gi/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_gi/%.d @echo [194] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M194_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M194_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M194_D_FILES := $(M194_O_FILES:.o=.d) +$(M194_D_FILES): +include $(wildcard $(M194_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_gm/Makefile b/rel/d/a/e/d_a_e_gm/Makefile index 8333aa9c2f..ec877cee25 100644 --- a/rel/d/a/e/d_a_e_gm/Makefile +++ b/rel/d/a/e/d_a_e_gm/Makefile @@ -40,10 +40,17 @@ $(M195_TARGET): $(M195_O_FILES) $(M195_LIBS) @python3 tools/lcf.py rel 195 --output $(M195_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M195_LDFLAGS) -o $(M195_TARGET) @build/M195_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_gm/%.o: rel/d/a/e/d_a_e_gm/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_gm/%.o: rel/d/a/e/d_a_e_gm/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_gm/%.d @echo [195] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M195_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M195_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M195_D_FILES := $(M195_O_FILES:.o=.d) +$(M195_D_FILES): +include $(wildcard $(M195_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_gob/Makefile b/rel/d/a/e/d_a_e_gob/Makefile index 855a295dba..5dffa7db97 100644 --- a/rel/d/a/e/d_a_e_gob/Makefile +++ b/rel/d/a/e/d_a_e_gob/Makefile @@ -40,10 +40,17 @@ $(M196_TARGET): $(M196_O_FILES) $(M196_LIBS) @python3 tools/lcf.py rel 196 --output $(M196_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M196_LDFLAGS) -o $(M196_TARGET) @build/M196_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_gob/%.o: rel/d/a/e/d_a_e_gob/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_gob/%.o: rel/d/a/e/d_a_e_gob/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_gob/%.d @echo [196] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M196_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M196_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M196_D_FILES := $(M196_O_FILES:.o=.d) +$(M196_D_FILES): +include $(wildcard $(M196_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_gs/Makefile b/rel/d/a/e/d_a_e_gs/Makefile index aaadae072e..772ab6d659 100644 --- a/rel/d/a/e/d_a_e_gs/Makefile +++ b/rel/d/a/e/d_a_e_gs/Makefile @@ -40,10 +40,17 @@ $(M197_TARGET): $(M197_O_FILES) $(M197_LIBS) @python3 tools/lcf.py rel 197 --output $(M197_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M197_LDFLAGS) -o $(M197_TARGET) @build/M197_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_gs/%.o: rel/d/a/e/d_a_e_gs/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_gs/%.o: rel/d/a/e/d_a_e_gs/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_gs/%.d @echo [197] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M197_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M197_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M197_D_FILES := $(M197_O_FILES:.o=.d) +$(M197_D_FILES): +include $(wildcard $(M197_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_hb/Makefile b/rel/d/a/e/d_a_e_hb/Makefile index 234b6dea43..895eaa7161 100644 --- a/rel/d/a/e/d_a_e_hb/Makefile +++ b/rel/d/a/e/d_a_e_hb/Makefile @@ -40,10 +40,17 @@ $(M68_TARGET): $(M68_O_FILES) $(M68_LIBS) @python3 tools/lcf.py rel 68 --output $(M68_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M68_LDFLAGS) -o $(M68_TARGET) @build/M68_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_hb/%.o: rel/d/a/e/d_a_e_hb/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_hb/%.o: rel/d/a/e/d_a_e_hb/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_hb/%.d @echo [ 68] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M68_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M68_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M68_D_FILES := $(M68_O_FILES:.o=.d) +$(M68_D_FILES): +include $(wildcard $(M68_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_hb_leaf/Makefile b/rel/d/a/e/d_a_e_hb_leaf/Makefile index 4503a14038..b6d28bb3b0 100644 --- a/rel/d/a/e/d_a_e_hb_leaf/Makefile +++ b/rel/d/a/e/d_a_e_hb_leaf/Makefile @@ -38,10 +38,17 @@ $(M198_TARGET): $(M198_O_FILES) $(M198_LIBS) @python3 tools/lcf.py rel 198 --output $(M198_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M198_LDFLAGS) -o $(M198_TARGET) @build/M198_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_hb_leaf/%.o: rel/d/a/e/d_a_e_hb_leaf/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_hb_leaf/%.o: rel/d/a/e/d_a_e_hb_leaf/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_hb_leaf/%.d @echo [198] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M198_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M198_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M198_D_FILES := $(M198_O_FILES:.o=.d) +$(M198_D_FILES): +include $(wildcard $(M198_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_hm/Makefile b/rel/d/a/e/d_a_e_hm/Makefile index 397930686d..81cb0d046f 100644 --- a/rel/d/a/e/d_a_e_hm/Makefile +++ b/rel/d/a/e/d_a_e_hm/Makefile @@ -40,10 +40,17 @@ $(M199_TARGET): $(M199_O_FILES) $(M199_LIBS) @python3 tools/lcf.py rel 199 --output $(M199_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M199_LDFLAGS) -o $(M199_TARGET) @build/M199_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_hm/%.o: rel/d/a/e/d_a_e_hm/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_hm/%.o: rel/d/a/e/d_a_e_hm/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_hm/%.d @echo [199] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M199_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M199_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M199_D_FILES := $(M199_O_FILES:.o=.d) +$(M199_D_FILES): +include $(wildcard $(M199_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_hp/Makefile b/rel/d/a/e/d_a_e_hp/Makefile index 7f31d45fd3..02dbaa165e 100644 --- a/rel/d/a/e/d_a_e_hp/Makefile +++ b/rel/d/a/e/d_a_e_hp/Makefile @@ -40,10 +40,17 @@ $(M200_TARGET): $(M200_O_FILES) $(M200_LIBS) @python3 tools/lcf.py rel 200 --output $(M200_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M200_LDFLAGS) -o $(M200_TARGET) @build/M200_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_hp/%.o: rel/d/a/e/d_a_e_hp/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_hp/%.o: rel/d/a/e/d_a_e_hp/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_hp/%.d @echo [200] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M200_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M200_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M200_D_FILES := $(M200_O_FILES:.o=.d) +$(M200_D_FILES): +include $(wildcard $(M200_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_hz/Makefile b/rel/d/a/e/d_a_e_hz/Makefile index fe34706b96..1871e6da64 100644 --- a/rel/d/a/e/d_a_e_hz/Makefile +++ b/rel/d/a/e/d_a_e_hz/Makefile @@ -40,10 +40,17 @@ $(M201_TARGET): $(M201_O_FILES) $(M201_LIBS) @python3 tools/lcf.py rel 201 --output $(M201_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M201_LDFLAGS) -o $(M201_TARGET) @build/M201_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_hz/%.o: rel/d/a/e/d_a_e_hz/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_hz/%.o: rel/d/a/e/d_a_e_hz/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_hz/%.d @echo [201] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M201_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M201_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M201_D_FILES := $(M201_O_FILES:.o=.d) +$(M201_D_FILES): +include $(wildcard $(M201_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_hzelda/Makefile b/rel/d/a/e/d_a_e_hzelda/Makefile index c16199cd08..2ca7d2848f 100644 --- a/rel/d/a/e/d_a_e_hzelda/Makefile +++ b/rel/d/a/e/d_a_e_hzelda/Makefile @@ -40,10 +40,17 @@ $(M202_TARGET): $(M202_O_FILES) $(M202_LIBS) @python3 tools/lcf.py rel 202 --output $(M202_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M202_LDFLAGS) -o $(M202_TARGET) @build/M202_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_hzelda/%.o: rel/d/a/e/d_a_e_hzelda/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_hzelda/%.o: rel/d/a/e/d_a_e_hzelda/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_hzelda/%.d @echo [202] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M202_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M202_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M202_D_FILES := $(M202_O_FILES:.o=.d) +$(M202_D_FILES): +include $(wildcard $(M202_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_is/Makefile b/rel/d/a/e/d_a_e_is/Makefile index aa8d306f8b..f5cca9d9ba 100644 --- a/rel/d/a/e/d_a_e_is/Makefile +++ b/rel/d/a/e/d_a_e_is/Makefile @@ -40,10 +40,17 @@ $(M203_TARGET): $(M203_O_FILES) $(M203_LIBS) @python3 tools/lcf.py rel 203 --output $(M203_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M203_LDFLAGS) -o $(M203_TARGET) @build/M203_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_is/%.o: rel/d/a/e/d_a_e_is/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_is/%.o: rel/d/a/e/d_a_e_is/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_is/%.d @echo [203] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M203_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M203_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M203_D_FILES := $(M203_O_FILES:.o=.d) +$(M203_D_FILES): +include $(wildcard $(M203_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_kg/Makefile b/rel/d/a/e/d_a_e_kg/Makefile index 68323d81bf..4bc1d7ad22 100644 --- a/rel/d/a/e/d_a_e_kg/Makefile +++ b/rel/d/a/e/d_a_e_kg/Makefile @@ -40,10 +40,17 @@ $(M204_TARGET): $(M204_O_FILES) $(M204_LIBS) @python3 tools/lcf.py rel 204 --output $(M204_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M204_LDFLAGS) -o $(M204_TARGET) @build/M204_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_kg/%.o: rel/d/a/e/d_a_e_kg/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_kg/%.o: rel/d/a/e/d_a_e_kg/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_kg/%.d @echo [204] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M204_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M204_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M204_D_FILES := $(M204_O_FILES:.o=.d) +$(M204_D_FILES): +include $(wildcard $(M204_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_kk/Makefile b/rel/d/a/e/d_a_e_kk/Makefile index 9866363c9d..f39fa47b18 100644 --- a/rel/d/a/e/d_a_e_kk/Makefile +++ b/rel/d/a/e/d_a_e_kk/Makefile @@ -40,10 +40,17 @@ $(M205_TARGET): $(M205_O_FILES) $(M205_LIBS) @python3 tools/lcf.py rel 205 --output $(M205_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M205_LDFLAGS) -o $(M205_TARGET) @build/M205_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_kk/%.o: rel/d/a/e/d_a_e_kk/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_kk/%.o: rel/d/a/e/d_a_e_kk/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_kk/%.d @echo [205] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M205_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M205_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M205_D_FILES := $(M205_O_FILES:.o=.d) +$(M205_D_FILES): +include $(wildcard $(M205_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_kr/Makefile b/rel/d/a/e/d_a_e_kr/Makefile index 13e57b6609..2d2ca64103 100644 --- a/rel/d/a/e/d_a_e_kr/Makefile +++ b/rel/d/a/e/d_a_e_kr/Makefile @@ -40,10 +40,17 @@ $(M206_TARGET): $(M206_O_FILES) $(M206_LIBS) @python3 tools/lcf.py rel 206 --output $(M206_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M206_LDFLAGS) -o $(M206_TARGET) @build/M206_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_kr/%.o: rel/d/a/e/d_a_e_kr/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_kr/%.o: rel/d/a/e/d_a_e_kr/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_kr/%.d @echo [206] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M206_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M206_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M206_D_FILES := $(M206_O_FILES:.o=.d) +$(M206_D_FILES): +include $(wildcard $(M206_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_mb/Makefile b/rel/d/a/e/d_a_e_mb/Makefile index 0f0e5a5460..26329b48c5 100644 --- a/rel/d/a/e/d_a_e_mb/Makefile +++ b/rel/d/a/e/d_a_e_mb/Makefile @@ -40,10 +40,17 @@ $(M207_TARGET): $(M207_O_FILES) $(M207_LIBS) @python3 tools/lcf.py rel 207 --output $(M207_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M207_LDFLAGS) -o $(M207_TARGET) @build/M207_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_mb/%.o: rel/d/a/e/d_a_e_mb/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_mb/%.o: rel/d/a/e/d_a_e_mb/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_mb/%.d @echo [207] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M207_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M207_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M207_D_FILES := $(M207_O_FILES:.o=.d) +$(M207_D_FILES): +include $(wildcard $(M207_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_md/Makefile b/rel/d/a/e/d_a_e_md/Makefile index 370145fb56..f3391dcc8f 100644 --- a/rel/d/a/e/d_a_e_md/Makefile +++ b/rel/d/a/e/d_a_e_md/Makefile @@ -38,10 +38,17 @@ $(M208_TARGET): $(M208_O_FILES) $(M208_LIBS) @python3 tools/lcf.py rel 208 --output $(M208_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M208_LDFLAGS) -o $(M208_TARGET) @build/M208_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_md/%.o: rel/d/a/e/d_a_e_md/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_md/%.o: rel/d/a/e/d_a_e_md/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_md/%.d @echo [208] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M208_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M208_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M208_D_FILES := $(M208_O_FILES:.o=.d) +$(M208_D_FILES): +include $(wildcard $(M208_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_mf/Makefile b/rel/d/a/e/d_a_e_mf/Makefile index 329f44872c..540051faec 100644 --- a/rel/d/a/e/d_a_e_mf/Makefile +++ b/rel/d/a/e/d_a_e_mf/Makefile @@ -40,10 +40,17 @@ $(M209_TARGET): $(M209_O_FILES) $(M209_LIBS) @python3 tools/lcf.py rel 209 --output $(M209_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M209_LDFLAGS) -o $(M209_TARGET) @build/M209_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_mf/%.o: rel/d/a/e/d_a_e_mf/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_mf/%.o: rel/d/a/e/d_a_e_mf/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_mf/%.d @echo [209] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M209_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M209_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M209_D_FILES := $(M209_O_FILES:.o=.d) +$(M209_D_FILES): +include $(wildcard $(M209_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_mk/Makefile b/rel/d/a/e/d_a_e_mk/Makefile index 8a7ea84ed0..a8d5048d4d 100644 --- a/rel/d/a/e/d_a_e_mk/Makefile +++ b/rel/d/a/e/d_a_e_mk/Makefile @@ -40,10 +40,17 @@ $(M210_TARGET): $(M210_O_FILES) $(M210_LIBS) @python3 tools/lcf.py rel 210 --output $(M210_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M210_LDFLAGS) -o $(M210_TARGET) @build/M210_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_mk/%.o: rel/d/a/e/d_a_e_mk/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_mk/%.o: rel/d/a/e/d_a_e_mk/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_mk/%.d @echo [210] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M210_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M210_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M210_D_FILES := $(M210_O_FILES:.o=.d) +$(M210_D_FILES): +include $(wildcard $(M210_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_mk_bo/Makefile b/rel/d/a/e/d_a_e_mk_bo/Makefile index ef1cf421c0..1bd3f915e6 100644 --- a/rel/d/a/e/d_a_e_mk_bo/Makefile +++ b/rel/d/a/e/d_a_e_mk_bo/Makefile @@ -40,10 +40,17 @@ $(M211_TARGET): $(M211_O_FILES) $(M211_LIBS) @python3 tools/lcf.py rel 211 --output $(M211_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M211_LDFLAGS) -o $(M211_TARGET) @build/M211_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_mk_bo/%.o: rel/d/a/e/d_a_e_mk_bo/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_mk_bo/%.o: rel/d/a/e/d_a_e_mk_bo/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_mk_bo/%.d @echo [211] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M211_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M211_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M211_D_FILES := $(M211_O_FILES:.o=.d) +$(M211_D_FILES): +include $(wildcard $(M211_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_mm/Makefile b/rel/d/a/e/d_a_e_mm/Makefile index 60b9c62cc6..b878098eff 100644 --- a/rel/d/a/e/d_a_e_mm/Makefile +++ b/rel/d/a/e/d_a_e_mm/Makefile @@ -40,10 +40,17 @@ $(M212_TARGET): $(M212_O_FILES) $(M212_LIBS) @python3 tools/lcf.py rel 212 --output $(M212_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M212_LDFLAGS) -o $(M212_TARGET) @build/M212_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_mm/%.o: rel/d/a/e/d_a_e_mm/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_mm/%.o: rel/d/a/e/d_a_e_mm/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_mm/%.d @echo [212] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M212_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M212_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M212_D_FILES := $(M212_O_FILES:.o=.d) +$(M212_D_FILES): +include $(wildcard $(M212_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_mm_mt/Makefile b/rel/d/a/e/d_a_e_mm_mt/Makefile index 9864d7670a..6651d72f77 100644 --- a/rel/d/a/e/d_a_e_mm_mt/Makefile +++ b/rel/d/a/e/d_a_e_mm_mt/Makefile @@ -38,10 +38,17 @@ $(M213_TARGET): $(M213_O_FILES) $(M213_LIBS) @python3 tools/lcf.py rel 213 --output $(M213_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M213_LDFLAGS) -o $(M213_TARGET) @build/M213_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_mm_mt/%.o: rel/d/a/e/d_a_e_mm_mt/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_mm_mt/%.o: rel/d/a/e/d_a_e_mm_mt/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_mm_mt/%.d @echo [213] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M213_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M213_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M213_D_FILES := $(M213_O_FILES:.o=.d) +$(M213_D_FILES): +include $(wildcard $(M213_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ms/Makefile b/rel/d/a/e/d_a_e_ms/Makefile index 776c39bcb7..74f57b3d3e 100644 --- a/rel/d/a/e/d_a_e_ms/Makefile +++ b/rel/d/a/e/d_a_e_ms/Makefile @@ -40,10 +40,17 @@ $(M214_TARGET): $(M214_O_FILES) $(M214_LIBS) @python3 tools/lcf.py rel 214 --output $(M214_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M214_LDFLAGS) -o $(M214_TARGET) @build/M214_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ms/%.o: rel/d/a/e/d_a_e_ms/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ms/%.o: rel/d/a/e/d_a_e_ms/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ms/%.d @echo [214] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M214_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M214_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M214_D_FILES := $(M214_O_FILES:.o=.d) +$(M214_D_FILES): +include $(wildcard $(M214_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_nest/Makefile b/rel/d/a/e/d_a_e_nest/Makefile index 567c657e33..c80e4e52a8 100644 --- a/rel/d/a/e/d_a_e_nest/Makefile +++ b/rel/d/a/e/d_a_e_nest/Makefile @@ -40,10 +40,17 @@ $(M69_TARGET): $(M69_O_FILES) $(M69_LIBS) @python3 tools/lcf.py rel 69 --output $(M69_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M69_LDFLAGS) -o $(M69_TARGET) @build/M69_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_nest/%.o: rel/d/a/e/d_a_e_nest/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_nest/%.o: rel/d/a/e/d_a_e_nest/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_nest/%.d @echo [ 69] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M69_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M69_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M69_D_FILES := $(M69_O_FILES:.o=.d) +$(M69_D_FILES): +include $(wildcard $(M69_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_nz/Makefile b/rel/d/a/e/d_a_e_nz/Makefile index 5553906f3f..c0186ddd94 100644 --- a/rel/d/a/e/d_a_e_nz/Makefile +++ b/rel/d/a/e/d_a_e_nz/Makefile @@ -40,10 +40,17 @@ $(M215_TARGET): $(M215_O_FILES) $(M215_LIBS) @python3 tools/lcf.py rel 215 --output $(M215_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M215_LDFLAGS) -o $(M215_TARGET) @build/M215_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_nz/%.o: rel/d/a/e/d_a_e_nz/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_nz/%.o: rel/d/a/e/d_a_e_nz/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_nz/%.d @echo [215] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M215_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M215_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M215_D_FILES := $(M215_O_FILES:.o=.d) +$(M215_D_FILES): +include $(wildcard $(M215_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_oc/Makefile b/rel/d/a/e/d_a_e_oc/Makefile index e4b0287264..40f5d62917 100644 --- a/rel/d/a/e/d_a_e_oc/Makefile +++ b/rel/d/a/e/d_a_e_oc/Makefile @@ -40,10 +40,17 @@ $(M216_TARGET): $(M216_O_FILES) $(M216_LIBS) @python3 tools/lcf.py rel 216 --output $(M216_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M216_LDFLAGS) -o $(M216_TARGET) @build/M216_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_oc/%.o: rel/d/a/e/d_a_e_oc/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_oc/%.o: rel/d/a/e/d_a_e_oc/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_oc/%.d @echo [216] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M216_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M216_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M216_D_FILES := $(M216_O_FILES:.o=.d) +$(M216_D_FILES): +include $(wildcard $(M216_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_oct_bg/Makefile b/rel/d/a/e/d_a_e_oct_bg/Makefile index 529c3b04da..9581b1007e 100644 --- a/rel/d/a/e/d_a_e_oct_bg/Makefile +++ b/rel/d/a/e/d_a_e_oct_bg/Makefile @@ -40,10 +40,17 @@ $(M217_TARGET): $(M217_O_FILES) $(M217_LIBS) @python3 tools/lcf.py rel 217 --output $(M217_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M217_LDFLAGS) -o $(M217_TARGET) @build/M217_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_oct_bg/%.o: rel/d/a/e/d_a_e_oct_bg/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_oct_bg/%.o: rel/d/a/e/d_a_e_oct_bg/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_oct_bg/%.d @echo [217] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M217_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M217_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M217_D_FILES := $(M217_O_FILES:.o=.d) +$(M217_D_FILES): +include $(wildcard $(M217_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ot/Makefile b/rel/d/a/e/d_a_e_ot/Makefile index 48c85f5949..f890b6370e 100644 --- a/rel/d/a/e/d_a_e_ot/Makefile +++ b/rel/d/a/e/d_a_e_ot/Makefile @@ -40,10 +40,17 @@ $(M218_TARGET): $(M218_O_FILES) $(M218_LIBS) @python3 tools/lcf.py rel 218 --output $(M218_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M218_LDFLAGS) -o $(M218_TARGET) @build/M218_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ot/%.o: rel/d/a/e/d_a_e_ot/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ot/%.o: rel/d/a/e/d_a_e_ot/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ot/%.d @echo [218] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M218_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M218_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M218_D_FILES := $(M218_O_FILES:.o=.d) +$(M218_D_FILES): +include $(wildcard $(M218_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ph/Makefile b/rel/d/a/e/d_a_e_ph/Makefile index 8db9ab5908..26ab5f8003 100644 --- a/rel/d/a/e/d_a_e_ph/Makefile +++ b/rel/d/a/e/d_a_e_ph/Makefile @@ -40,10 +40,17 @@ $(M219_TARGET): $(M219_O_FILES) $(M219_LIBS) @python3 tools/lcf.py rel 219 --output $(M219_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M219_LDFLAGS) -o $(M219_TARGET) @build/M219_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ph/%.o: rel/d/a/e/d_a_e_ph/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ph/%.o: rel/d/a/e/d_a_e_ph/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ph/%.d @echo [219] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M219_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M219_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M219_D_FILES := $(M219_O_FILES:.o=.d) +$(M219_D_FILES): +include $(wildcard $(M219_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_pm/Makefile b/rel/d/a/e/d_a_e_pm/Makefile index dfad11b9b6..bef5ab5083 100644 --- a/rel/d/a/e/d_a_e_pm/Makefile +++ b/rel/d/a/e/d_a_e_pm/Makefile @@ -40,10 +40,17 @@ $(M220_TARGET): $(M220_O_FILES) $(M220_LIBS) @python3 tools/lcf.py rel 220 --output $(M220_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M220_LDFLAGS) -o $(M220_TARGET) @build/M220_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_pm/%.o: rel/d/a/e/d_a_e_pm/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_pm/%.o: rel/d/a/e/d_a_e_pm/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_pm/%.d @echo [220] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M220_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M220_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M220_D_FILES := $(M220_O_FILES:.o=.d) +$(M220_D_FILES): +include $(wildcard $(M220_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_po/Makefile b/rel/d/a/e/d_a_e_po/Makefile index 03582a6cad..6af3a9a3e8 100644 --- a/rel/d/a/e/d_a_e_po/Makefile +++ b/rel/d/a/e/d_a_e_po/Makefile @@ -40,10 +40,17 @@ $(M221_TARGET): $(M221_O_FILES) $(M221_LIBS) @python3 tools/lcf.py rel 221 --output $(M221_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M221_LDFLAGS) -o $(M221_TARGET) @build/M221_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_po/%.o: rel/d/a/e/d_a_e_po/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_po/%.o: rel/d/a/e/d_a_e_po/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_po/%.d @echo [221] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M221_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M221_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M221_D_FILES := $(M221_O_FILES:.o=.d) +$(M221_D_FILES): +include $(wildcard $(M221_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_pz/Makefile b/rel/d/a/e/d_a_e_pz/Makefile index 54e088910b..29fb74c1a1 100644 --- a/rel/d/a/e/d_a_e_pz/Makefile +++ b/rel/d/a/e/d_a_e_pz/Makefile @@ -40,10 +40,17 @@ $(M222_TARGET): $(M222_O_FILES) $(M222_LIBS) @python3 tools/lcf.py rel 222 --output $(M222_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M222_LDFLAGS) -o $(M222_TARGET) @build/M222_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_pz/%.o: rel/d/a/e/d_a_e_pz/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_pz/%.o: rel/d/a/e/d_a_e_pz/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_pz/%.d @echo [222] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M222_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M222_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M222_D_FILES := $(M222_O_FILES:.o=.d) +$(M222_D_FILES): +include $(wildcard $(M222_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_rb/Makefile b/rel/d/a/e/d_a_e_rb/Makefile index 85cf3414ae..efd17ce447 100644 --- a/rel/d/a/e/d_a_e_rb/Makefile +++ b/rel/d/a/e/d_a_e_rb/Makefile @@ -40,10 +40,17 @@ $(M223_TARGET): $(M223_O_FILES) $(M223_LIBS) @python3 tools/lcf.py rel 223 --output $(M223_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M223_LDFLAGS) -o $(M223_TARGET) @build/M223_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_rb/%.o: rel/d/a/e/d_a_e_rb/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_rb/%.o: rel/d/a/e/d_a_e_rb/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_rb/%.d @echo [223] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M223_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M223_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M223_D_FILES := $(M223_O_FILES:.o=.d) +$(M223_D_FILES): +include $(wildcard $(M223_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_rd/Makefile b/rel/d/a/e/d_a_e_rd/Makefile index ae84743e9b..04be4152ae 100644 --- a/rel/d/a/e/d_a_e_rd/Makefile +++ b/rel/d/a/e/d_a_e_rd/Makefile @@ -40,10 +40,17 @@ $(M70_TARGET): $(M70_O_FILES) $(M70_LIBS) @python3 tools/lcf.py rel 70 --output $(M70_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M70_LDFLAGS) -o $(M70_TARGET) @build/M70_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_rd/%.o: rel/d/a/e/d_a_e_rd/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_rd/%.o: rel/d/a/e/d_a_e_rd/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_rd/%.d @echo [ 70] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M70_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M70_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M70_D_FILES := $(M70_O_FILES:.o=.d) +$(M70_D_FILES): +include $(wildcard $(M70_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_rdb/Makefile b/rel/d/a/e/d_a_e_rdb/Makefile index 1d41b509fd..f49caceca0 100644 --- a/rel/d/a/e/d_a_e_rdb/Makefile +++ b/rel/d/a/e/d_a_e_rdb/Makefile @@ -40,10 +40,17 @@ $(M224_TARGET): $(M224_O_FILES) $(M224_LIBS) @python3 tools/lcf.py rel 224 --output $(M224_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M224_LDFLAGS) -o $(M224_TARGET) @build/M224_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_rdb/%.o: rel/d/a/e/d_a_e_rdb/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_rdb/%.o: rel/d/a/e/d_a_e_rdb/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_rdb/%.d @echo [224] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M224_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M224_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M224_D_FILES := $(M224_O_FILES:.o=.d) +$(M224_D_FILES): +include $(wildcard $(M224_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_rdy/Makefile b/rel/d/a/e/d_a_e_rdy/Makefile index b2fef54db2..084574f3dc 100644 --- a/rel/d/a/e/d_a_e_rdy/Makefile +++ b/rel/d/a/e/d_a_e_rdy/Makefile @@ -40,10 +40,17 @@ $(M225_TARGET): $(M225_O_FILES) $(M225_LIBS) @python3 tools/lcf.py rel 225 --output $(M225_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M225_LDFLAGS) -o $(M225_TARGET) @build/M225_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_rdy/%.o: rel/d/a/e/d_a_e_rdy/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_rdy/%.o: rel/d/a/e/d_a_e_rdy/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_rdy/%.d @echo [225] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M225_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M225_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M225_D_FILES := $(M225_O_FILES:.o=.d) +$(M225_D_FILES): +include $(wildcard $(M225_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_s1/Makefile b/rel/d/a/e/d_a_e_s1/Makefile index 16604a3a0a..b7539c692d 100644 --- a/rel/d/a/e/d_a_e_s1/Makefile +++ b/rel/d/a/e/d_a_e_s1/Makefile @@ -40,10 +40,17 @@ $(M226_TARGET): $(M226_O_FILES) $(M226_LIBS) @python3 tools/lcf.py rel 226 --output $(M226_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M226_LDFLAGS) -o $(M226_TARGET) @build/M226_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_s1/%.o: rel/d/a/e/d_a_e_s1/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_s1/%.o: rel/d/a/e/d_a_e_s1/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_s1/%.d @echo [226] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M226_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M226_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M226_D_FILES := $(M226_O_FILES:.o=.d) +$(M226_D_FILES): +include $(wildcard $(M226_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_sb/Makefile b/rel/d/a/e/d_a_e_sb/Makefile index 446e022e2a..cd8c327b09 100644 --- a/rel/d/a/e/d_a_e_sb/Makefile +++ b/rel/d/a/e/d_a_e_sb/Makefile @@ -40,10 +40,17 @@ $(M227_TARGET): $(M227_O_FILES) $(M227_LIBS) @python3 tools/lcf.py rel 227 --output $(M227_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M227_LDFLAGS) -o $(M227_TARGET) @build/M227_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_sb/%.o: rel/d/a/e/d_a_e_sb/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_sb/%.o: rel/d/a/e/d_a_e_sb/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_sb/%.d @echo [227] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M227_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M227_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M227_D_FILES := $(M227_O_FILES:.o=.d) +$(M227_D_FILES): +include $(wildcard $(M227_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_sf/Makefile b/rel/d/a/e/d_a_e_sf/Makefile index 87a1b75f26..378f195637 100644 --- a/rel/d/a/e/d_a_e_sf/Makefile +++ b/rel/d/a/e/d_a_e_sf/Makefile @@ -40,10 +40,17 @@ $(M228_TARGET): $(M228_O_FILES) $(M228_LIBS) @python3 tools/lcf.py rel 228 --output $(M228_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M228_LDFLAGS) -o $(M228_TARGET) @build/M228_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_sf/%.o: rel/d/a/e/d_a_e_sf/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_sf/%.o: rel/d/a/e/d_a_e_sf/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_sf/%.d @echo [228] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M228_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M228_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M228_D_FILES := $(M228_O_FILES:.o=.d) +$(M228_D_FILES): +include $(wildcard $(M228_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_sg/Makefile b/rel/d/a/e/d_a_e_sg/Makefile index 9be23266c3..cd986efb04 100644 --- a/rel/d/a/e/d_a_e_sg/Makefile +++ b/rel/d/a/e/d_a_e_sg/Makefile @@ -40,10 +40,17 @@ $(M229_TARGET): $(M229_O_FILES) $(M229_LIBS) @python3 tools/lcf.py rel 229 --output $(M229_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M229_LDFLAGS) -o $(M229_TARGET) @build/M229_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_sg/%.o: rel/d/a/e/d_a_e_sg/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_sg/%.o: rel/d/a/e/d_a_e_sg/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_sg/%.d @echo [229] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M229_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M229_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M229_D_FILES := $(M229_O_FILES:.o=.d) +$(M229_D_FILES): +include $(wildcard $(M229_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_sh/Makefile b/rel/d/a/e/d_a_e_sh/Makefile index 63f6bfea2d..3f4a27ac9e 100644 --- a/rel/d/a/e/d_a_e_sh/Makefile +++ b/rel/d/a/e/d_a_e_sh/Makefile @@ -40,10 +40,17 @@ $(M230_TARGET): $(M230_O_FILES) $(M230_LIBS) @python3 tools/lcf.py rel 230 --output $(M230_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M230_LDFLAGS) -o $(M230_TARGET) @build/M230_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_sh/%.o: rel/d/a/e/d_a_e_sh/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_sh/%.o: rel/d/a/e/d_a_e_sh/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_sh/%.d @echo [230] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M230_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M230_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M230_D_FILES := $(M230_O_FILES:.o=.d) +$(M230_D_FILES): +include $(wildcard $(M230_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_sm/Makefile b/rel/d/a/e/d_a_e_sm/Makefile index 160e7e7669..e173f2adf1 100644 --- a/rel/d/a/e/d_a_e_sm/Makefile +++ b/rel/d/a/e/d_a_e_sm/Makefile @@ -40,10 +40,17 @@ $(M231_TARGET): $(M231_O_FILES) $(M231_LIBS) @python3 tools/lcf.py rel 231 --output $(M231_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M231_LDFLAGS) -o $(M231_TARGET) @build/M231_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_sm/%.o: rel/d/a/e/d_a_e_sm/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_sm/%.o: rel/d/a/e/d_a_e_sm/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_sm/%.d @echo [231] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M231_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M231_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M231_D_FILES := $(M231_O_FILES:.o=.d) +$(M231_D_FILES): +include $(wildcard $(M231_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_sm2/Makefile b/rel/d/a/e/d_a_e_sm2/Makefile index 4c0ed55ddc..6f4bfe31e3 100644 --- a/rel/d/a/e/d_a_e_sm2/Makefile +++ b/rel/d/a/e/d_a_e_sm2/Makefile @@ -40,10 +40,17 @@ $(M232_TARGET): $(M232_O_FILES) $(M232_LIBS) @python3 tools/lcf.py rel 232 --output $(M232_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M232_LDFLAGS) -o $(M232_TARGET) @build/M232_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_sm2/%.o: rel/d/a/e/d_a_e_sm2/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_sm2/%.o: rel/d/a/e/d_a_e_sm2/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_sm2/%.d @echo [232] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M232_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M232_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M232_D_FILES := $(M232_O_FILES:.o=.d) +$(M232_D_FILES): +include $(wildcard $(M232_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_st/Makefile b/rel/d/a/e/d_a_e_st/Makefile index 5b1cdd046c..ea54a9553b 100644 --- a/rel/d/a/e/d_a_e_st/Makefile +++ b/rel/d/a/e/d_a_e_st/Makefile @@ -40,10 +40,17 @@ $(M233_TARGET): $(M233_O_FILES) $(M233_LIBS) @python3 tools/lcf.py rel 233 --output $(M233_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M233_LDFLAGS) -o $(M233_TARGET) @build/M233_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_st/%.o: rel/d/a/e/d_a_e_st/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_st/%.o: rel/d/a/e/d_a_e_st/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_st/%.d @echo [233] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M233_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M233_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M233_D_FILES := $(M233_O_FILES:.o=.d) +$(M233_D_FILES): +include $(wildcard $(M233_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_st_line/Makefile b/rel/d/a/e/d_a_e_st_line/Makefile index 7d0fc47e6a..adbe8c4307 100644 --- a/rel/d/a/e/d_a_e_st_line/Makefile +++ b/rel/d/a/e/d_a_e_st_line/Makefile @@ -38,10 +38,17 @@ $(M234_TARGET): $(M234_O_FILES) $(M234_LIBS) @python3 tools/lcf.py rel 234 --output $(M234_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M234_LDFLAGS) -o $(M234_TARGET) @build/M234_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_st_line/%.o: rel/d/a/e/d_a_e_st_line/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_st_line/%.o: rel/d/a/e/d_a_e_st_line/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_st_line/%.d @echo [234] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M234_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M234_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M234_D_FILES := $(M234_O_FILES:.o=.d) +$(M234_D_FILES): +include $(wildcard $(M234_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_sw/Makefile b/rel/d/a/e/d_a_e_sw/Makefile index 23b05abc77..9177b1c1a7 100644 --- a/rel/d/a/e/d_a_e_sw/Makefile +++ b/rel/d/a/e/d_a_e_sw/Makefile @@ -40,10 +40,17 @@ $(M235_TARGET): $(M235_O_FILES) $(M235_LIBS) @python3 tools/lcf.py rel 235 --output $(M235_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M235_LDFLAGS) -o $(M235_TARGET) @build/M235_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_sw/%.o: rel/d/a/e/d_a_e_sw/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_sw/%.o: rel/d/a/e/d_a_e_sw/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_sw/%.d @echo [235] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M235_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M235_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M235_D_FILES := $(M235_O_FILES:.o=.d) +$(M235_D_FILES): +include $(wildcard $(M235_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_th/Makefile b/rel/d/a/e/d_a_e_th/Makefile index 6aabcf56c3..6d9b569637 100644 --- a/rel/d/a/e/d_a_e_th/Makefile +++ b/rel/d/a/e/d_a_e_th/Makefile @@ -40,10 +40,17 @@ $(M236_TARGET): $(M236_O_FILES) $(M236_LIBS) @python3 tools/lcf.py rel 236 --output $(M236_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M236_LDFLAGS) -o $(M236_TARGET) @build/M236_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_th/%.o: rel/d/a/e/d_a_e_th/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_th/%.o: rel/d/a/e/d_a_e_th/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_th/%.d @echo [236] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M236_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M236_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M236_D_FILES := $(M236_O_FILES:.o=.d) +$(M236_D_FILES): +include $(wildcard $(M236_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_th_ball/Makefile b/rel/d/a/e/d_a_e_th_ball/Makefile index 0e1530fe52..3eaec6dca9 100644 --- a/rel/d/a/e/d_a_e_th_ball/Makefile +++ b/rel/d/a/e/d_a_e_th_ball/Makefile @@ -38,10 +38,17 @@ $(M237_TARGET): $(M237_O_FILES) $(M237_LIBS) @python3 tools/lcf.py rel 237 --output $(M237_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M237_LDFLAGS) -o $(M237_TARGET) @build/M237_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_th_ball/%.o: rel/d/a/e/d_a_e_th_ball/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_th_ball/%.o: rel/d/a/e/d_a_e_th_ball/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_th_ball/%.d @echo [237] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M237_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M237_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M237_D_FILES := $(M237_O_FILES:.o=.d) +$(M237_D_FILES): +include $(wildcard $(M237_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_tk/Makefile b/rel/d/a/e/d_a_e_tk/Makefile index 6effd8d78d..5e7743555a 100644 --- a/rel/d/a/e/d_a_e_tk/Makefile +++ b/rel/d/a/e/d_a_e_tk/Makefile @@ -40,10 +40,17 @@ $(M238_TARGET): $(M238_O_FILES) $(M238_LIBS) @python3 tools/lcf.py rel 238 --output $(M238_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M238_LDFLAGS) -o $(M238_TARGET) @build/M238_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_tk/%.o: rel/d/a/e/d_a_e_tk/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_tk/%.o: rel/d/a/e/d_a_e_tk/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_tk/%.d @echo [238] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M238_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M238_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M238_D_FILES := $(M238_O_FILES:.o=.d) +$(M238_D_FILES): +include $(wildcard $(M238_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_tk2/Makefile b/rel/d/a/e/d_a_e_tk2/Makefile index afa58bab68..2e5e08df0f 100644 --- a/rel/d/a/e/d_a_e_tk2/Makefile +++ b/rel/d/a/e/d_a_e_tk2/Makefile @@ -40,10 +40,17 @@ $(M239_TARGET): $(M239_O_FILES) $(M239_LIBS) @python3 tools/lcf.py rel 239 --output $(M239_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M239_LDFLAGS) -o $(M239_TARGET) @build/M239_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_tk2/%.o: rel/d/a/e/d_a_e_tk2/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_tk2/%.o: rel/d/a/e/d_a_e_tk2/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_tk2/%.d @echo [239] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M239_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M239_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M239_D_FILES := $(M239_O_FILES:.o=.d) +$(M239_D_FILES): +include $(wildcard $(M239_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_tk_ball/Makefile b/rel/d/a/e/d_a_e_tk_ball/Makefile index eee541eef7..9df07737ae 100644 --- a/rel/d/a/e/d_a_e_tk_ball/Makefile +++ b/rel/d/a/e/d_a_e_tk_ball/Makefile @@ -38,10 +38,17 @@ $(M240_TARGET): $(M240_O_FILES) $(M240_LIBS) @python3 tools/lcf.py rel 240 --output $(M240_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M240_LDFLAGS) -o $(M240_TARGET) @build/M240_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_tk_ball/%.o: rel/d/a/e/d_a_e_tk_ball/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_tk_ball/%.o: rel/d/a/e/d_a_e_tk_ball/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_tk_ball/%.d @echo [240] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M240_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M240_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M240_D_FILES := $(M240_O_FILES:.o=.d) +$(M240_D_FILES): +include $(wildcard $(M240_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_tt/Makefile b/rel/d/a/e/d_a_e_tt/Makefile index 1c53636ab5..2058dc645e 100644 --- a/rel/d/a/e/d_a_e_tt/Makefile +++ b/rel/d/a/e/d_a_e_tt/Makefile @@ -40,10 +40,17 @@ $(M241_TARGET): $(M241_O_FILES) $(M241_LIBS) @python3 tools/lcf.py rel 241 --output $(M241_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M241_LDFLAGS) -o $(M241_TARGET) @build/M241_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_tt/%.o: rel/d/a/e/d_a_e_tt/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_tt/%.o: rel/d/a/e/d_a_e_tt/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_tt/%.d @echo [241] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M241_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M241_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M241_D_FILES := $(M241_O_FILES:.o=.d) +$(M241_D_FILES): +include $(wildcard $(M241_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_vt/Makefile b/rel/d/a/e/d_a_e_vt/Makefile index 7fcfd43622..71a7f56a7e 100644 --- a/rel/d/a/e/d_a_e_vt/Makefile +++ b/rel/d/a/e/d_a_e_vt/Makefile @@ -40,10 +40,17 @@ $(M242_TARGET): $(M242_O_FILES) $(M242_LIBS) @python3 tools/lcf.py rel 242 --output $(M242_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M242_LDFLAGS) -o $(M242_TARGET) @build/M242_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_vt/%.o: rel/d/a/e/d_a_e_vt/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_vt/%.o: rel/d/a/e/d_a_e_vt/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_vt/%.d @echo [242] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M242_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M242_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M242_D_FILES := $(M242_O_FILES:.o=.d) +$(M242_D_FILES): +include $(wildcard $(M242_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_warpappear/Makefile b/rel/d/a/e/d_a_e_warpappear/Makefile index 7f4ef77628..43b805d5cf 100644 --- a/rel/d/a/e/d_a_e_warpappear/Makefile +++ b/rel/d/a/e/d_a_e_warpappear/Makefile @@ -38,10 +38,17 @@ $(M243_TARGET): $(M243_O_FILES) $(M243_LIBS) @python3 tools/lcf.py rel 243 --output $(M243_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M243_LDFLAGS) -o $(M243_TARGET) @build/M243_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_warpappear/%.o: rel/d/a/e/d_a_e_warpappear/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_warpappear/%.o: rel/d/a/e/d_a_e_warpappear/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_warpappear/%.d @echo [243] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M243_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M243_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M243_D_FILES := $(M243_O_FILES:.o=.d) +$(M243_D_FILES): +include $(wildcard $(M243_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_wb/Makefile b/rel/d/a/e/d_a_e_wb/Makefile index 64a9eb061e..4d10f33ed3 100644 --- a/rel/d/a/e/d_a_e_wb/Makefile +++ b/rel/d/a/e/d_a_e_wb/Makefile @@ -40,10 +40,17 @@ $(M244_TARGET): $(M244_O_FILES) $(M244_LIBS) @python3 tools/lcf.py rel 244 --output $(M244_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M244_LDFLAGS) -o $(M244_TARGET) @build/M244_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_wb/%.o: rel/d/a/e/d_a_e_wb/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_wb/%.o: rel/d/a/e/d_a_e_wb/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_wb/%.d @echo [244] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M244_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M244_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M244_D_FILES := $(M244_O_FILES:.o=.d) +$(M244_D_FILES): +include $(wildcard $(M244_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ws/Makefile b/rel/d/a/e/d_a_e_ws/Makefile index 749fcc0039..fe9254584d 100644 --- a/rel/d/a/e/d_a_e_ws/Makefile +++ b/rel/d/a/e/d_a_e_ws/Makefile @@ -40,10 +40,17 @@ $(M245_TARGET): $(M245_O_FILES) $(M245_LIBS) @python3 tools/lcf.py rel 245 --output $(M245_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M245_LDFLAGS) -o $(M245_TARGET) @build/M245_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ws/%.o: rel/d/a/e/d_a_e_ws/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ws/%.o: rel/d/a/e/d_a_e_ws/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ws/%.d @echo [245] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M245_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M245_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M245_D_FILES := $(M245_O_FILES:.o=.d) +$(M245_D_FILES): +include $(wildcard $(M245_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ww/Makefile b/rel/d/a/e/d_a_e_ww/Makefile index badacf87d9..7ae482d512 100644 --- a/rel/d/a/e/d_a_e_ww/Makefile +++ b/rel/d/a/e/d_a_e_ww/Makefile @@ -40,10 +40,17 @@ $(M246_TARGET): $(M246_O_FILES) $(M246_LIBS) @python3 tools/lcf.py rel 246 --output $(M246_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M246_LDFLAGS) -o $(M246_TARGET) @build/M246_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ww/%.o: rel/d/a/e/d_a_e_ww/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ww/%.o: rel/d/a/e/d_a_e_ww/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ww/%.d @echo [246] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M246_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M246_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M246_D_FILES := $(M246_O_FILES:.o=.d) +$(M246_D_FILES): +include $(wildcard $(M246_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_yc/Makefile b/rel/d/a/e/d_a_e_yc/Makefile index 95d966e6b2..583eaf3ff3 100644 --- a/rel/d/a/e/d_a_e_yc/Makefile +++ b/rel/d/a/e/d_a_e_yc/Makefile @@ -40,10 +40,17 @@ $(M247_TARGET): $(M247_O_FILES) $(M247_LIBS) @python3 tools/lcf.py rel 247 --output $(M247_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M247_LDFLAGS) -o $(M247_TARGET) @build/M247_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_yc/%.o: rel/d/a/e/d_a_e_yc/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_yc/%.o: rel/d/a/e/d_a_e_yc/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_yc/%.d @echo [247] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M247_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M247_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M247_D_FILES := $(M247_O_FILES:.o=.d) +$(M247_D_FILES): +include $(wildcard $(M247_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_yd/Makefile b/rel/d/a/e/d_a_e_yd/Makefile index 09e4b42d2f..487210190b 100644 --- a/rel/d/a/e/d_a_e_yd/Makefile +++ b/rel/d/a/e/d_a_e_yd/Makefile @@ -40,10 +40,17 @@ $(M248_TARGET): $(M248_O_FILES) $(M248_LIBS) @python3 tools/lcf.py rel 248 --output $(M248_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M248_LDFLAGS) -o $(M248_TARGET) @build/M248_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_yd/%.o: rel/d/a/e/d_a_e_yd/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_yd/%.o: rel/d/a/e/d_a_e_yd/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_yd/%.d @echo [248] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M248_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M248_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M248_D_FILES := $(M248_O_FILES:.o=.d) +$(M248_D_FILES): +include $(wildcard $(M248_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_yd_leaf/Makefile b/rel/d/a/e/d_a_e_yd_leaf/Makefile index 71f2efafeb..7a61dc07b8 100644 --- a/rel/d/a/e/d_a_e_yd_leaf/Makefile +++ b/rel/d/a/e/d_a_e_yd_leaf/Makefile @@ -38,10 +38,17 @@ $(M249_TARGET): $(M249_O_FILES) $(M249_LIBS) @python3 tools/lcf.py rel 249 --output $(M249_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M249_LDFLAGS) -o $(M249_TARGET) @build/M249_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_yd_leaf/%.o: rel/d/a/e/d_a_e_yd_leaf/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_yd_leaf/%.o: rel/d/a/e/d_a_e_yd_leaf/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_yd_leaf/%.d @echo [249] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M249_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M249_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M249_D_FILES := $(M249_O_FILES:.o=.d) +$(M249_D_FILES): +include $(wildcard $(M249_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_yg/Makefile b/rel/d/a/e/d_a_e_yg/Makefile index a96e61d48b..d466fe3868 100644 --- a/rel/d/a/e/d_a_e_yg/Makefile +++ b/rel/d/a/e/d_a_e_yg/Makefile @@ -40,10 +40,17 @@ $(M250_TARGET): $(M250_O_FILES) $(M250_LIBS) @python3 tools/lcf.py rel 250 --output $(M250_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M250_LDFLAGS) -o $(M250_TARGET) @build/M250_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_yg/%.o: rel/d/a/e/d_a_e_yg/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_yg/%.o: rel/d/a/e/d_a_e_yg/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_yg/%.d @echo [250] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M250_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M250_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M250_D_FILES := $(M250_O_FILES:.o=.d) +$(M250_D_FILES): +include $(wildcard $(M250_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_yh/Makefile b/rel/d/a/e/d_a_e_yh/Makefile index 5bdc371caf..26e7576c2d 100644 --- a/rel/d/a/e/d_a_e_yh/Makefile +++ b/rel/d/a/e/d_a_e_yh/Makefile @@ -40,10 +40,17 @@ $(M251_TARGET): $(M251_O_FILES) $(M251_LIBS) @python3 tools/lcf.py rel 251 --output $(M251_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M251_LDFLAGS) -o $(M251_TARGET) @build/M251_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_yh/%.o: rel/d/a/e/d_a_e_yh/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_yh/%.o: rel/d/a/e/d_a_e_yh/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_yh/%.d @echo [251] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M251_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M251_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M251_D_FILES := $(M251_O_FILES:.o=.d) +$(M251_D_FILES): +include $(wildcard $(M251_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_yk/Makefile b/rel/d/a/e/d_a_e_yk/Makefile index 0333b56108..9897cc6b13 100644 --- a/rel/d/a/e/d_a_e_yk/Makefile +++ b/rel/d/a/e/d_a_e_yk/Makefile @@ -40,10 +40,17 @@ $(M252_TARGET): $(M252_O_FILES) $(M252_LIBS) @python3 tools/lcf.py rel 252 --output $(M252_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M252_LDFLAGS) -o $(M252_TARGET) @build/M252_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_yk/%.o: rel/d/a/e/d_a_e_yk/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_yk/%.o: rel/d/a/e/d_a_e_yk/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_yk/%.d @echo [252] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M252_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M252_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M252_D_FILES := $(M252_O_FILES:.o=.d) +$(M252_D_FILES): +include $(wildcard $(M252_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ym/Makefile b/rel/d/a/e/d_a_e_ym/Makefile index c636ae1ae5..8eda1a64aa 100644 --- a/rel/d/a/e/d_a_e_ym/Makefile +++ b/rel/d/a/e/d_a_e_ym/Makefile @@ -40,10 +40,17 @@ $(M253_TARGET): $(M253_O_FILES) $(M253_LIBS) @python3 tools/lcf.py rel 253 --output $(M253_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M253_LDFLAGS) -o $(M253_TARGET) @build/M253_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ym/%.o: rel/d/a/e/d_a_e_ym/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ym/%.o: rel/d/a/e/d_a_e_ym/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ym/%.d @echo [253] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M253_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M253_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M253_D_FILES := $(M253_O_FILES:.o=.d) +$(M253_D_FILES): +include $(wildcard $(M253_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ym_tag/Makefile b/rel/d/a/e/d_a_e_ym_tag/Makefile index 64df183ce8..37326f8ace 100644 --- a/rel/d/a/e/d_a_e_ym_tag/Makefile +++ b/rel/d/a/e/d_a_e_ym_tag/Makefile @@ -38,10 +38,17 @@ $(M254_TARGET): $(M254_O_FILES) $(M254_LIBS) @python3 tools/lcf.py rel 254 --output $(M254_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M254_LDFLAGS) -o $(M254_TARGET) @build/M254_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ym_tag/%.o: rel/d/a/e/d_a_e_ym_tag/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ym_tag/%.o: rel/d/a/e/d_a_e_ym_tag/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ym_tag/%.d @echo [254] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M254_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M254_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M254_D_FILES := $(M254_O_FILES:.o=.d) +$(M254_D_FILES): +include $(wildcard $(M254_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_ymb/Makefile b/rel/d/a/e/d_a_e_ymb/Makefile index ff1a062978..a1ba3b00f8 100644 --- a/rel/d/a/e/d_a_e_ymb/Makefile +++ b/rel/d/a/e/d_a_e_ymb/Makefile @@ -40,10 +40,17 @@ $(M255_TARGET): $(M255_O_FILES) $(M255_LIBS) @python3 tools/lcf.py rel 255 --output $(M255_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M255_LDFLAGS) -o $(M255_TARGET) @build/M255_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_ymb/%.o: rel/d/a/e/d_a_e_ymb/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_ymb/%.o: rel/d/a/e/d_a_e_ymb/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_ymb/%.d @echo [255] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M255_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M255_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M255_D_FILES := $(M255_O_FILES:.o=.d) +$(M255_D_FILES): +include $(wildcard $(M255_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_yr/Makefile b/rel/d/a/e/d_a_e_yr/Makefile index 616e03d99d..c3649b1a2a 100644 --- a/rel/d/a/e/d_a_e_yr/Makefile +++ b/rel/d/a/e/d_a_e_yr/Makefile @@ -40,10 +40,17 @@ $(M256_TARGET): $(M256_O_FILES) $(M256_LIBS) @python3 tools/lcf.py rel 256 --output $(M256_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M256_LDFLAGS) -o $(M256_TARGET) @build/M256_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_yr/%.o: rel/d/a/e/d_a_e_yr/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_yr/%.o: rel/d/a/e/d_a_e_yr/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_yr/%.d @echo [256] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M256_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M256_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M256_D_FILES := $(M256_O_FILES:.o=.d) +$(M256_D_FILES): +include $(wildcard $(M256_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_zh/Makefile b/rel/d/a/e/d_a_e_zh/Makefile index 687d62e1b6..07ea47c5c6 100644 --- a/rel/d/a/e/d_a_e_zh/Makefile +++ b/rel/d/a/e/d_a_e_zh/Makefile @@ -40,10 +40,17 @@ $(M257_TARGET): $(M257_O_FILES) $(M257_LIBS) @python3 tools/lcf.py rel 257 --output $(M257_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M257_LDFLAGS) -o $(M257_TARGET) @build/M257_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_zh/%.o: rel/d/a/e/d_a_e_zh/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_zh/%.o: rel/d/a/e/d_a_e_zh/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_zh/%.d @echo [257] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M257_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M257_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M257_D_FILES := $(M257_O_FILES:.o=.d) +$(M257_D_FILES): +include $(wildcard $(M257_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_zm/Makefile b/rel/d/a/e/d_a_e_zm/Makefile index 95b68ef5e5..0a50aa6507 100644 --- a/rel/d/a/e/d_a_e_zm/Makefile +++ b/rel/d/a/e/d_a_e_zm/Makefile @@ -40,10 +40,17 @@ $(M258_TARGET): $(M258_O_FILES) $(M258_LIBS) @python3 tools/lcf.py rel 258 --output $(M258_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M258_LDFLAGS) -o $(M258_TARGET) @build/M258_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_zm/%.o: rel/d/a/e/d_a_e_zm/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_zm/%.o: rel/d/a/e/d_a_e_zm/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_zm/%.d @echo [258] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M258_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M258_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M258_D_FILES := $(M258_O_FILES:.o=.d) +$(M258_D_FILES): +include $(wildcard $(M258_D_FILES)) +endif diff --git a/rel/d/a/e/d_a_e_zs/Makefile b/rel/d/a/e/d_a_e_zs/Makefile index 0c47d76fb6..b43a168997 100644 --- a/rel/d/a/e/d_a_e_zs/Makefile +++ b/rel/d/a/e/d_a_e_zs/Makefile @@ -40,10 +40,17 @@ $(M259_TARGET): $(M259_O_FILES) $(M259_LIBS) @python3 tools/lcf.py rel 259 --output $(M259_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M259_LDFLAGS) -o $(M259_TARGET) @build/M259_ofiles -$(BUILD_DIR)/rel/d/a/e/d_a_e_zs/%.o: rel/d/a/e/d_a_e_zs/%.cpp +$(BUILD_DIR)/rel/d/a/e/d_a_e_zs/%.o: rel/d/a/e/d_a_e_zs/%.cpp $(BUILD_DIR)/rel/d/a/e/d_a_e_zs/%.d @echo [259] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M259_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M259_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M259_D_FILES := $(M259_O_FILES:.o=.d) +$(M259_D_FILES): +include $(wildcard $(M259_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag00/Makefile b/rel/d/a/kytag/d_a_kytag00/Makefile index a93aa1d70d..997b2a2165 100644 --- a/rel/d/a/kytag/d_a_kytag00/Makefile +++ b/rel/d/a/kytag/d_a_kytag00/Makefile @@ -38,10 +38,17 @@ $(M13_TARGET): $(M13_O_FILES) $(M13_LIBS) @python3 tools/lcf.py rel 13 --output $(M13_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M13_LDFLAGS) -o $(M13_TARGET) @build/M13_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag00/%.o: rel/d/a/kytag/d_a_kytag00/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag00/%.o: rel/d/a/kytag/d_a_kytag00/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag00/%.d @echo [ 13] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M13_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M13_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M13_D_FILES := $(M13_O_FILES:.o=.d) +$(M13_D_FILES): +include $(wildcard $(M13_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag01/Makefile b/rel/d/a/kytag/d_a_kytag01/Makefile index 6e73704f13..dded05868a 100644 --- a/rel/d/a/kytag/d_a_kytag01/Makefile +++ b/rel/d/a/kytag/d_a_kytag01/Makefile @@ -38,10 +38,17 @@ $(M266_TARGET): $(M266_O_FILES) $(M266_LIBS) @python3 tools/lcf.py rel 266 --output $(M266_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M266_LDFLAGS) -o $(M266_TARGET) @build/M266_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag01/%.o: rel/d/a/kytag/d_a_kytag01/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag01/%.o: rel/d/a/kytag/d_a_kytag01/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag01/%.d @echo [266] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M266_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M266_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M266_D_FILES := $(M266_O_FILES:.o=.d) +$(M266_D_FILES): +include $(wildcard $(M266_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag02/Makefile b/rel/d/a/kytag/d_a_kytag02/Makefile index a28228608d..3d2ca7c65d 100644 --- a/rel/d/a/kytag/d_a_kytag02/Makefile +++ b/rel/d/a/kytag/d_a_kytag02/Makefile @@ -38,10 +38,17 @@ $(M267_TARGET): $(M267_O_FILES) $(M267_LIBS) @python3 tools/lcf.py rel 267 --output $(M267_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M267_LDFLAGS) -o $(M267_TARGET) @build/M267_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag02/%.o: rel/d/a/kytag/d_a_kytag02/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag02/%.o: rel/d/a/kytag/d_a_kytag02/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag02/%.d @echo [267] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M267_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M267_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M267_D_FILES := $(M267_O_FILES:.o=.d) +$(M267_D_FILES): +include $(wildcard $(M267_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag03/Makefile b/rel/d/a/kytag/d_a_kytag03/Makefile index 524668e919..9d22228f1a 100644 --- a/rel/d/a/kytag/d_a_kytag03/Makefile +++ b/rel/d/a/kytag/d_a_kytag03/Makefile @@ -38,10 +38,17 @@ $(M268_TARGET): $(M268_O_FILES) $(M268_LIBS) @python3 tools/lcf.py rel 268 --output $(M268_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M268_LDFLAGS) -o $(M268_TARGET) @build/M268_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag03/%.o: rel/d/a/kytag/d_a_kytag03/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag03/%.o: rel/d/a/kytag/d_a_kytag03/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag03/%.d @echo [268] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M268_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M268_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M268_D_FILES := $(M268_O_FILES:.o=.d) +$(M268_D_FILES): +include $(wildcard $(M268_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag04/Makefile b/rel/d/a/kytag/d_a_kytag04/Makefile index b683edef17..269109c6a2 100644 --- a/rel/d/a/kytag/d_a_kytag04/Makefile +++ b/rel/d/a/kytag/d_a_kytag04/Makefile @@ -38,10 +38,17 @@ $(M14_TARGET): $(M14_O_FILES) $(M14_LIBS) @python3 tools/lcf.py rel 14 --output $(M14_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M14_LDFLAGS) -o $(M14_TARGET) @build/M14_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag04/%.o: rel/d/a/kytag/d_a_kytag04/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag04/%.o: rel/d/a/kytag/d_a_kytag04/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag04/%.d @echo [ 14] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M14_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M14_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M14_D_FILES := $(M14_O_FILES:.o=.d) +$(M14_D_FILES): +include $(wildcard $(M14_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag05/Makefile b/rel/d/a/kytag/d_a_kytag05/Makefile index 943229b7c6..9570a57148 100644 --- a/rel/d/a/kytag/d_a_kytag05/Makefile +++ b/rel/d/a/kytag/d_a_kytag05/Makefile @@ -38,10 +38,17 @@ $(M74_TARGET): $(M74_O_FILES) $(M74_LIBS) @python3 tools/lcf.py rel 74 --output $(M74_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M74_LDFLAGS) -o $(M74_TARGET) @build/M74_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag05/%.o: rel/d/a/kytag/d_a_kytag05/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag05/%.o: rel/d/a/kytag/d_a_kytag05/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag05/%.d @echo [ 74] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M74_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M74_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M74_D_FILES := $(M74_O_FILES:.o=.d) +$(M74_D_FILES): +include $(wildcard $(M74_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag06/Makefile b/rel/d/a/kytag/d_a_kytag06/Makefile index 5517780355..ae188e9d18 100644 --- a/rel/d/a/kytag/d_a_kytag06/Makefile +++ b/rel/d/a/kytag/d_a_kytag06/Makefile @@ -40,10 +40,17 @@ $(M269_TARGET): $(M269_O_FILES) $(M269_LIBS) @python3 tools/lcf.py rel 269 --output $(M269_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M269_LDFLAGS) -o $(M269_TARGET) @build/M269_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag06/%.o: rel/d/a/kytag/d_a_kytag06/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag06/%.o: rel/d/a/kytag/d_a_kytag06/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag06/%.d @echo [269] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M269_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M269_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M269_D_FILES := $(M269_O_FILES:.o=.d) +$(M269_D_FILES): +include $(wildcard $(M269_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag07/Makefile b/rel/d/a/kytag/d_a_kytag07/Makefile index aa50c6e84a..807dba9af0 100644 --- a/rel/d/a/kytag/d_a_kytag07/Makefile +++ b/rel/d/a/kytag/d_a_kytag07/Makefile @@ -38,10 +38,17 @@ $(M270_TARGET): $(M270_O_FILES) $(M270_LIBS) @python3 tools/lcf.py rel 270 --output $(M270_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M270_LDFLAGS) -o $(M270_TARGET) @build/M270_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag07/%.o: rel/d/a/kytag/d_a_kytag07/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag07/%.o: rel/d/a/kytag/d_a_kytag07/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag07/%.d @echo [270] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M270_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M270_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M270_D_FILES := $(M270_O_FILES:.o=.d) +$(M270_D_FILES): +include $(wildcard $(M270_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag08/Makefile b/rel/d/a/kytag/d_a_kytag08/Makefile index e7b00e0030..5d14e7765f 100644 --- a/rel/d/a/kytag/d_a_kytag08/Makefile +++ b/rel/d/a/kytag/d_a_kytag08/Makefile @@ -38,10 +38,17 @@ $(M271_TARGET): $(M271_O_FILES) $(M271_LIBS) @python3 tools/lcf.py rel 271 --output $(M271_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M271_LDFLAGS) -o $(M271_TARGET) @build/M271_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag08/%.o: rel/d/a/kytag/d_a_kytag08/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag08/%.o: rel/d/a/kytag/d_a_kytag08/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag08/%.d @echo [271] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M271_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M271_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M271_D_FILES := $(M271_O_FILES:.o=.d) +$(M271_D_FILES): +include $(wildcard $(M271_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag09/Makefile b/rel/d/a/kytag/d_a_kytag09/Makefile index 42c54056d9..5b17815e0f 100644 --- a/rel/d/a/kytag/d_a_kytag09/Makefile +++ b/rel/d/a/kytag/d_a_kytag09/Makefile @@ -38,10 +38,17 @@ $(M272_TARGET): $(M272_O_FILES) $(M272_LIBS) @python3 tools/lcf.py rel 272 --output $(M272_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M272_LDFLAGS) -o $(M272_TARGET) @build/M272_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag09/%.o: rel/d/a/kytag/d_a_kytag09/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag09/%.o: rel/d/a/kytag/d_a_kytag09/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag09/%.d @echo [272] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M272_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M272_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M272_D_FILES := $(M272_O_FILES:.o=.d) +$(M272_D_FILES): +include $(wildcard $(M272_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag10/Makefile b/rel/d/a/kytag/d_a_kytag10/Makefile index caac9e9637..8975d7ab9b 100644 --- a/rel/d/a/kytag/d_a_kytag10/Makefile +++ b/rel/d/a/kytag/d_a_kytag10/Makefile @@ -38,10 +38,17 @@ $(M75_TARGET): $(M75_O_FILES) $(M75_LIBS) @python3 tools/lcf.py rel 75 --output $(M75_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M75_LDFLAGS) -o $(M75_TARGET) @build/M75_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag10/%.o: rel/d/a/kytag/d_a_kytag10/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag10/%.o: rel/d/a/kytag/d_a_kytag10/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag10/%.d @echo [ 75] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M75_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M75_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M75_D_FILES := $(M75_O_FILES:.o=.d) +$(M75_D_FILES): +include $(wildcard $(M75_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag11/Makefile b/rel/d/a/kytag/d_a_kytag11/Makefile index fe2ae6e6b8..1606e6c89c 100644 --- a/rel/d/a/kytag/d_a_kytag11/Makefile +++ b/rel/d/a/kytag/d_a_kytag11/Makefile @@ -38,10 +38,17 @@ $(M76_TARGET): $(M76_O_FILES) $(M76_LIBS) @python3 tools/lcf.py rel 76 --output $(M76_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M76_LDFLAGS) -o $(M76_TARGET) @build/M76_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag11/%.o: rel/d/a/kytag/d_a_kytag11/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag11/%.o: rel/d/a/kytag/d_a_kytag11/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag11/%.d @echo [ 76] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M76_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M76_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M76_D_FILES := $(M76_O_FILES:.o=.d) +$(M76_D_FILES): +include $(wildcard $(M76_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag12/Makefile b/rel/d/a/kytag/d_a_kytag12/Makefile index 312487ec43..e479411c74 100644 --- a/rel/d/a/kytag/d_a_kytag12/Makefile +++ b/rel/d/a/kytag/d_a_kytag12/Makefile @@ -38,10 +38,17 @@ $(M273_TARGET): $(M273_O_FILES) $(M273_LIBS) @python3 tools/lcf.py rel 273 --output $(M273_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M273_LDFLAGS) -o $(M273_TARGET) @build/M273_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag12/%.o: rel/d/a/kytag/d_a_kytag12/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag12/%.o: rel/d/a/kytag/d_a_kytag12/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag12/%.d @echo [273] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M273_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M273_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M273_D_FILES := $(M273_O_FILES:.o=.d) +$(M273_D_FILES): +include $(wildcard $(M273_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag13/Makefile b/rel/d/a/kytag/d_a_kytag13/Makefile index f4f6087272..239239b7a3 100644 --- a/rel/d/a/kytag/d_a_kytag13/Makefile +++ b/rel/d/a/kytag/d_a_kytag13/Makefile @@ -38,10 +38,17 @@ $(M274_TARGET): $(M274_O_FILES) $(M274_LIBS) @python3 tools/lcf.py rel 274 --output $(M274_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M274_LDFLAGS) -o $(M274_TARGET) @build/M274_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag13/%.o: rel/d/a/kytag/d_a_kytag13/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag13/%.o: rel/d/a/kytag/d_a_kytag13/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag13/%.d @echo [274] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M274_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M274_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M274_D_FILES := $(M274_O_FILES:.o=.d) +$(M274_D_FILES): +include $(wildcard $(M274_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag14/Makefile b/rel/d/a/kytag/d_a_kytag14/Makefile index 0f1dcfcbae..7a848840f0 100644 --- a/rel/d/a/kytag/d_a_kytag14/Makefile +++ b/rel/d/a/kytag/d_a_kytag14/Makefile @@ -38,10 +38,17 @@ $(M77_TARGET): $(M77_O_FILES) $(M77_LIBS) @python3 tools/lcf.py rel 77 --output $(M77_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M77_LDFLAGS) -o $(M77_TARGET) @build/M77_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag14/%.o: rel/d/a/kytag/d_a_kytag14/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag14/%.o: rel/d/a/kytag/d_a_kytag14/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag14/%.d @echo [ 77] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M77_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M77_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M77_D_FILES := $(M77_O_FILES:.o=.d) +$(M77_D_FILES): +include $(wildcard $(M77_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag15/Makefile b/rel/d/a/kytag/d_a_kytag15/Makefile index 518c5000f9..3d10a3e1a4 100644 --- a/rel/d/a/kytag/d_a_kytag15/Makefile +++ b/rel/d/a/kytag/d_a_kytag15/Makefile @@ -38,10 +38,17 @@ $(M275_TARGET): $(M275_O_FILES) $(M275_LIBS) @python3 tools/lcf.py rel 275 --output $(M275_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M275_LDFLAGS) -o $(M275_TARGET) @build/M275_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag15/%.o: rel/d/a/kytag/d_a_kytag15/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag15/%.o: rel/d/a/kytag/d_a_kytag15/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag15/%.d @echo [275] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M275_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M275_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M275_D_FILES := $(M275_O_FILES:.o=.d) +$(M275_D_FILES): +include $(wildcard $(M275_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag16/Makefile b/rel/d/a/kytag/d_a_kytag16/Makefile index 6929ffc092..d4071fdd25 100644 --- a/rel/d/a/kytag/d_a_kytag16/Makefile +++ b/rel/d/a/kytag/d_a_kytag16/Makefile @@ -38,10 +38,17 @@ $(M276_TARGET): $(M276_O_FILES) $(M276_LIBS) @python3 tools/lcf.py rel 276 --output $(M276_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M276_LDFLAGS) -o $(M276_TARGET) @build/M276_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag16/%.o: rel/d/a/kytag/d_a_kytag16/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag16/%.o: rel/d/a/kytag/d_a_kytag16/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag16/%.d @echo [276] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M276_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M276_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M276_D_FILES := $(M276_O_FILES:.o=.d) +$(M276_D_FILES): +include $(wildcard $(M276_D_FILES)) +endif diff --git a/rel/d/a/kytag/d_a_kytag17/Makefile b/rel/d/a/kytag/d_a_kytag17/Makefile index 701c907241..705b8a1c8c 100644 --- a/rel/d/a/kytag/d_a_kytag17/Makefile +++ b/rel/d/a/kytag/d_a_kytag17/Makefile @@ -38,10 +38,17 @@ $(M15_TARGET): $(M15_O_FILES) $(M15_LIBS) @python3 tools/lcf.py rel 15 --output $(M15_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M15_LDFLAGS) -o $(M15_TARGET) @build/M15_ofiles -$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag17/%.o: rel/d/a/kytag/d_a_kytag17/%.cpp +$(BUILD_DIR)/rel/d/a/kytag/d_a_kytag17/%.o: rel/d/a/kytag/d_a_kytag17/%.cpp $(BUILD_DIR)/rel/d/a/kytag/d_a_kytag17/%.d @echo [ 15] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M15_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M15_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M15_D_FILES := $(M15_O_FILES:.o=.d) +$(M15_D_FILES): +include $(wildcard $(M15_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_aru/Makefile b/rel/d/a/npc/d_a_npc_aru/Makefile index fd39e3da86..1828576a3b 100644 --- a/rel/d/a/npc/d_a_npc_aru/Makefile +++ b/rel/d/a/npc/d_a_npc_aru/Makefile @@ -40,10 +40,17 @@ $(M283_TARGET): $(M283_O_FILES) $(M283_LIBS) @python3 tools/lcf.py rel 283 --output $(M283_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M283_LDFLAGS) -o $(M283_TARGET) @build/M283_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_aru/%.o: rel/d/a/npc/d_a_npc_aru/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_aru/%.o: rel/d/a/npc/d_a_npc_aru/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_aru/%.d @echo [283] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M283_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M283_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M283_D_FILES := $(M283_O_FILES:.o=.d) +$(M283_D_FILES): +include $(wildcard $(M283_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_ash/Makefile b/rel/d/a/npc/d_a_npc_ash/Makefile index 9d14bdd9b8..7dccc7918e 100644 --- a/rel/d/a/npc/d_a_npc_ash/Makefile +++ b/rel/d/a/npc/d_a_npc_ash/Makefile @@ -40,10 +40,17 @@ $(M284_TARGET): $(M284_O_FILES) $(M284_LIBS) @python3 tools/lcf.py rel 284 --output $(M284_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M284_LDFLAGS) -o $(M284_TARGET) @build/M284_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ash/%.o: rel/d/a/npc/d_a_npc_ash/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ash/%.o: rel/d/a/npc/d_a_npc_ash/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_ash/%.d @echo [284] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M284_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M284_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M284_D_FILES := $(M284_O_FILES:.o=.d) +$(M284_D_FILES): +include $(wildcard $(M284_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_ashB/Makefile b/rel/d/a/npc/d_a_npc_ashB/Makefile index 09802841fd..6ad86f3cc2 100644 --- a/rel/d/a/npc/d_a_npc_ashB/Makefile +++ b/rel/d/a/npc/d_a_npc_ashB/Makefile @@ -40,10 +40,17 @@ $(M285_TARGET): $(M285_O_FILES) $(M285_LIBS) @python3 tools/lcf.py rel 285 --output $(M285_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M285_LDFLAGS) -o $(M285_TARGET) @build/M285_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ashB/%.o: rel/d/a/npc/d_a_npc_ashB/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ashB/%.o: rel/d/a/npc/d_a_npc_ashB/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_ashB/%.d @echo [285] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M285_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M285_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M285_D_FILES := $(M285_O_FILES:.o=.d) +$(M285_D_FILES): +include $(wildcard $(M285_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_bans/Makefile b/rel/d/a/npc/d_a_npc_bans/Makefile index 1ed8959ba3..2a3980c6d4 100644 --- a/rel/d/a/npc/d_a_npc_bans/Makefile +++ b/rel/d/a/npc/d_a_npc_bans/Makefile @@ -40,10 +40,17 @@ $(M286_TARGET): $(M286_O_FILES) $(M286_LIBS) @python3 tools/lcf.py rel 286 --output $(M286_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M286_LDFLAGS) -o $(M286_TARGET) @build/M286_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_bans/%.o: rel/d/a/npc/d_a_npc_bans/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_bans/%.o: rel/d/a/npc/d_a_npc_bans/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_bans/%.d @echo [286] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M286_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M286_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M286_D_FILES := $(M286_O_FILES:.o=.d) +$(M286_D_FILES): +include $(wildcard $(M286_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_besu/Makefile b/rel/d/a/npc/d_a_npc_besu/Makefile index 829f2dc489..e60824deb7 100644 --- a/rel/d/a/npc/d_a_npc_besu/Makefile +++ b/rel/d/a/npc/d_a_npc_besu/Makefile @@ -40,10 +40,17 @@ $(M79_TARGET): $(M79_O_FILES) $(M79_LIBS) @python3 tools/lcf.py rel 79 --output $(M79_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M79_LDFLAGS) -o $(M79_TARGET) @build/M79_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_besu/%.o: rel/d/a/npc/d_a_npc_besu/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_besu/%.o: rel/d/a/npc/d_a_npc_besu/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_besu/%.d @echo [ 79] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M79_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M79_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M79_D_FILES := $(M79_O_FILES:.o=.d) +$(M79_D_FILES): +include $(wildcard $(M79_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_blue_ns/Makefile b/rel/d/a/npc/d_a_npc_blue_ns/Makefile index 2fd01897da..bc5157e509 100644 --- a/rel/d/a/npc/d_a_npc_blue_ns/Makefile +++ b/rel/d/a/npc/d_a_npc_blue_ns/Makefile @@ -40,10 +40,17 @@ $(M287_TARGET): $(M287_O_FILES) $(M287_LIBS) @python3 tools/lcf.py rel 287 --output $(M287_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M287_LDFLAGS) -o $(M287_TARGET) @build/M287_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_blue_ns/%.o: rel/d/a/npc/d_a_npc_blue_ns/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_blue_ns/%.o: rel/d/a/npc/d_a_npc_blue_ns/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_blue_ns/%.d @echo [287] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M287_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M287_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M287_D_FILES := $(M287_O_FILES:.o=.d) +$(M287_D_FILES): +include $(wildcard $(M287_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_bou/Makefile b/rel/d/a/npc/d_a_npc_bou/Makefile index 0301141751..a6f314a348 100644 --- a/rel/d/a/npc/d_a_npc_bou/Makefile +++ b/rel/d/a/npc/d_a_npc_bou/Makefile @@ -40,10 +40,17 @@ $(M288_TARGET): $(M288_O_FILES) $(M288_LIBS) @python3 tools/lcf.py rel 288 --output $(M288_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M288_LDFLAGS) -o $(M288_TARGET) @build/M288_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_bou/%.o: rel/d/a/npc/d_a_npc_bou/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_bou/%.o: rel/d/a/npc/d_a_npc_bou/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_bou/%.d @echo [288] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M288_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M288_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M288_D_FILES := $(M288_O_FILES:.o=.d) +$(M288_D_FILES): +include $(wildcard $(M288_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_bouS/Makefile b/rel/d/a/npc/d_a_npc_bouS/Makefile index fda4d3699b..05ae3e256f 100644 --- a/rel/d/a/npc/d_a_npc_bouS/Makefile +++ b/rel/d/a/npc/d_a_npc_bouS/Makefile @@ -40,10 +40,17 @@ $(M289_TARGET): $(M289_O_FILES) $(M289_LIBS) @python3 tools/lcf.py rel 289 --output $(M289_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M289_LDFLAGS) -o $(M289_TARGET) @build/M289_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_bouS/%.o: rel/d/a/npc/d_a_npc_bouS/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_bouS/%.o: rel/d/a/npc/d_a_npc_bouS/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_bouS/%.d @echo [289] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M289_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M289_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M289_D_FILES := $(M289_O_FILES:.o=.d) +$(M289_D_FILES): +include $(wildcard $(M289_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_cdn3/Makefile b/rel/d/a/npc/d_a_npc_cdn3/Makefile index 0b782f1b0a..f83f1dc542 100644 --- a/rel/d/a/npc/d_a_npc_cdn3/Makefile +++ b/rel/d/a/npc/d_a_npc_cdn3/Makefile @@ -38,10 +38,17 @@ $(M290_TARGET): $(M290_O_FILES) $(M290_LIBS) @python3 tools/lcf.py rel 290 --output $(M290_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M290_LDFLAGS) -o $(M290_TARGET) @build/M290_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_cdn3/%.o: rel/d/a/npc/d_a_npc_cdn3/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_cdn3/%.o: rel/d/a/npc/d_a_npc_cdn3/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_cdn3/%.d @echo [290] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M290_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M290_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M290_D_FILES := $(M290_O_FILES:.o=.d) +$(M290_D_FILES): +include $(wildcard $(M290_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_chat/Makefile b/rel/d/a/npc/d_a_npc_chat/Makefile index 602b0a86bd..f149bc2957 100644 --- a/rel/d/a/npc/d_a_npc_chat/Makefile +++ b/rel/d/a/npc/d_a_npc_chat/Makefile @@ -40,10 +40,17 @@ $(M291_TARGET): $(M291_O_FILES) $(M291_LIBS) @python3 tools/lcf.py rel 291 --output $(M291_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M291_LDFLAGS) -o $(M291_TARGET) @build/M291_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_chat/%.o: rel/d/a/npc/d_a_npc_chat/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_chat/%.o: rel/d/a/npc/d_a_npc_chat/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_chat/%.d @echo [291] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M291_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M291_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M291_D_FILES := $(M291_O_FILES:.o=.d) +$(M291_D_FILES): +include $(wildcard $(M291_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_chin/Makefile b/rel/d/a/npc/d_a_npc_chin/Makefile index 0658ab2b20..b3c2505c0f 100644 --- a/rel/d/a/npc/d_a_npc_chin/Makefile +++ b/rel/d/a/npc/d_a_npc_chin/Makefile @@ -40,10 +40,17 @@ $(M292_TARGET): $(M292_O_FILES) $(M292_LIBS) @python3 tools/lcf.py rel 292 --output $(M292_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M292_LDFLAGS) -o $(M292_TARGET) @build/M292_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_chin/%.o: rel/d/a/npc/d_a_npc_chin/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_chin/%.o: rel/d/a/npc/d_a_npc_chin/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_chin/%.d @echo [292] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M292_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M292_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M292_D_FILES := $(M292_O_FILES:.o=.d) +$(M292_D_FILES): +include $(wildcard $(M292_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_clerka/Makefile b/rel/d/a/npc/d_a_npc_clerka/Makefile index d7269c3fc2..871365237d 100644 --- a/rel/d/a/npc/d_a_npc_clerka/Makefile +++ b/rel/d/a/npc/d_a_npc_clerka/Makefile @@ -40,10 +40,17 @@ $(M293_TARGET): $(M293_O_FILES) $(M293_LIBS) @python3 tools/lcf.py rel 293 --output $(M293_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M293_LDFLAGS) -o $(M293_TARGET) @build/M293_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_clerka/%.o: rel/d/a/npc/d_a_npc_clerka/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_clerka/%.o: rel/d/a/npc/d_a_npc_clerka/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_clerka/%.d @echo [293] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M293_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M293_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M293_D_FILES := $(M293_O_FILES:.o=.d) +$(M293_D_FILES): +include $(wildcard $(M293_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_clerkb/Makefile b/rel/d/a/npc/d_a_npc_clerkb/Makefile index 640bb005de..5fc8220ca5 100644 --- a/rel/d/a/npc/d_a_npc_clerkb/Makefile +++ b/rel/d/a/npc/d_a_npc_clerkb/Makefile @@ -40,10 +40,17 @@ $(M294_TARGET): $(M294_O_FILES) $(M294_LIBS) @python3 tools/lcf.py rel 294 --output $(M294_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M294_LDFLAGS) -o $(M294_TARGET) @build/M294_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_clerkb/%.o: rel/d/a/npc/d_a_npc_clerkb/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_clerkb/%.o: rel/d/a/npc/d_a_npc_clerkb/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_clerkb/%.d @echo [294] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M294_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M294_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M294_D_FILES := $(M294_O_FILES:.o=.d) +$(M294_D_FILES): +include $(wildcard $(M294_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_clerkt/Makefile b/rel/d/a/npc/d_a_npc_clerkt/Makefile index 94354deed9..a41ffa4f8c 100644 --- a/rel/d/a/npc/d_a_npc_clerkt/Makefile +++ b/rel/d/a/npc/d_a_npc_clerkt/Makefile @@ -40,10 +40,17 @@ $(M295_TARGET): $(M295_O_FILES) $(M295_LIBS) @python3 tools/lcf.py rel 295 --output $(M295_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M295_LDFLAGS) -o $(M295_TARGET) @build/M295_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_clerkt/%.o: rel/d/a/npc/d_a_npc_clerkt/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_clerkt/%.o: rel/d/a/npc/d_a_npc_clerkt/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_clerkt/%.d @echo [295] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M295_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M295_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M295_D_FILES := $(M295_O_FILES:.o=.d) +$(M295_D_FILES): +include $(wildcard $(M295_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_coach/Makefile b/rel/d/a/npc/d_a_npc_coach/Makefile index d43cd98450..d83b5e7bb7 100644 --- a/rel/d/a/npc/d_a_npc_coach/Makefile +++ b/rel/d/a/npc/d_a_npc_coach/Makefile @@ -38,10 +38,17 @@ $(M296_TARGET): $(M296_O_FILES) $(M296_LIBS) @python3 tools/lcf.py rel 296 --output $(M296_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M296_LDFLAGS) -o $(M296_TARGET) @build/M296_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_coach/%.o: rel/d/a/npc/d_a_npc_coach/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_coach/%.o: rel/d/a/npc/d_a_npc_coach/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_coach/%.d @echo [296] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M296_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M296_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M296_D_FILES := $(M296_O_FILES:.o=.d) +$(M296_D_FILES): +include $(wildcard $(M296_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_df/Makefile b/rel/d/a/npc/d_a_npc_df/Makefile index 41523241bd..b4f4582b57 100644 --- a/rel/d/a/npc/d_a_npc_df/Makefile +++ b/rel/d/a/npc/d_a_npc_df/Makefile @@ -40,10 +40,17 @@ $(M297_TARGET): $(M297_O_FILES) $(M297_LIBS) @python3 tools/lcf.py rel 297 --output $(M297_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M297_LDFLAGS) -o $(M297_TARGET) @build/M297_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_df/%.o: rel/d/a/npc/d_a_npc_df/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_df/%.o: rel/d/a/npc/d_a_npc_df/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_df/%.d @echo [297] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M297_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M297_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M297_D_FILES := $(M297_O_FILES:.o=.d) +$(M297_D_FILES): +include $(wildcard $(M297_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_doc/Makefile b/rel/d/a/npc/d_a_npc_doc/Makefile index 8e25d179a5..e28d8b4a32 100644 --- a/rel/d/a/npc/d_a_npc_doc/Makefile +++ b/rel/d/a/npc/d_a_npc_doc/Makefile @@ -40,10 +40,17 @@ $(M298_TARGET): $(M298_O_FILES) $(M298_LIBS) @python3 tools/lcf.py rel 298 --output $(M298_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M298_LDFLAGS) -o $(M298_TARGET) @build/M298_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_doc/%.o: rel/d/a/npc/d_a_npc_doc/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_doc/%.o: rel/d/a/npc/d_a_npc_doc/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_doc/%.d @echo [298] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M298_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M298_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M298_D_FILES := $(M298_O_FILES:.o=.d) +$(M298_D_FILES): +include $(wildcard $(M298_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_doorboy/Makefile b/rel/d/a/npc/d_a_npc_doorboy/Makefile index cf268a60d8..893ff47340 100644 --- a/rel/d/a/npc/d_a_npc_doorboy/Makefile +++ b/rel/d/a/npc/d_a_npc_doorboy/Makefile @@ -40,10 +40,17 @@ $(M299_TARGET): $(M299_O_FILES) $(M299_LIBS) @python3 tools/lcf.py rel 299 --output $(M299_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M299_LDFLAGS) -o $(M299_TARGET) @build/M299_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_doorboy/%.o: rel/d/a/npc/d_a_npc_doorboy/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_doorboy/%.o: rel/d/a/npc/d_a_npc_doorboy/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_doorboy/%.d @echo [299] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M299_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M299_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M299_D_FILES := $(M299_O_FILES:.o=.d) +$(M299_D_FILES): +include $(wildcard $(M299_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_drainSol/Makefile b/rel/d/a/npc/d_a_npc_drainSol/Makefile index 6e31ee475f..782bf40832 100644 --- a/rel/d/a/npc/d_a_npc_drainSol/Makefile +++ b/rel/d/a/npc/d_a_npc_drainSol/Makefile @@ -40,10 +40,17 @@ $(M300_TARGET): $(M300_O_FILES) $(M300_LIBS) @python3 tools/lcf.py rel 300 --output $(M300_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M300_LDFLAGS) -o $(M300_TARGET) @build/M300_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_drainSol/%.o: rel/d/a/npc/d_a_npc_drainSol/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_drainSol/%.o: rel/d/a/npc/d_a_npc_drainSol/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_drainSol/%.d @echo [300] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M300_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M300_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M300_D_FILES := $(M300_O_FILES:.o=.d) +$(M300_D_FILES): +include $(wildcard $(M300_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_du/Makefile b/rel/d/a/npc/d_a_npc_du/Makefile index ddd3938be6..59ef405666 100644 --- a/rel/d/a/npc/d_a_npc_du/Makefile +++ b/rel/d/a/npc/d_a_npc_du/Makefile @@ -40,10 +40,17 @@ $(M301_TARGET): $(M301_O_FILES) $(M301_LIBS) @python3 tools/lcf.py rel 301 --output $(M301_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M301_LDFLAGS) -o $(M301_TARGET) @build/M301_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_du/%.o: rel/d/a/npc/d_a_npc_du/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_du/%.o: rel/d/a/npc/d_a_npc_du/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_du/%.d @echo [301] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M301_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M301_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M301_D_FILES := $(M301_O_FILES:.o=.d) +$(M301_D_FILES): +include $(wildcard $(M301_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_fairy/Makefile b/rel/d/a/npc/d_a_npc_fairy/Makefile index 41393194c3..e9aa8e5a68 100644 --- a/rel/d/a/npc/d_a_npc_fairy/Makefile +++ b/rel/d/a/npc/d_a_npc_fairy/Makefile @@ -40,10 +40,17 @@ $(M302_TARGET): $(M302_O_FILES) $(M302_LIBS) @python3 tools/lcf.py rel 302 --output $(M302_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M302_LDFLAGS) -o $(M302_TARGET) @build/M302_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_fairy/%.o: rel/d/a/npc/d_a_npc_fairy/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_fairy/%.o: rel/d/a/npc/d_a_npc_fairy/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_fairy/%.d @echo [302] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M302_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M302_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M302_D_FILES := $(M302_O_FILES:.o=.d) +$(M302_D_FILES): +include $(wildcard $(M302_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_fairy_seirei/Makefile b/rel/d/a/npc/d_a_npc_fairy_seirei/Makefile index 6164f9b5cd..408127d9ab 100644 --- a/rel/d/a/npc/d_a_npc_fairy_seirei/Makefile +++ b/rel/d/a/npc/d_a_npc_fairy_seirei/Makefile @@ -40,10 +40,17 @@ $(M80_TARGET): $(M80_O_FILES) $(M80_LIBS) @python3 tools/lcf.py rel 80 --output $(M80_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M80_LDFLAGS) -o $(M80_TARGET) @build/M80_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_fairy_seirei/%.o: rel/d/a/npc/d_a_npc_fairy_seirei/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_fairy_seirei/%.o: rel/d/a/npc/d_a_npc_fairy_seirei/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_fairy_seirei/%.d @echo [ 80] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M80_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M80_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M80_D_FILES := $(M80_O_FILES:.o=.d) +$(M80_D_FILES): +include $(wildcard $(M80_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_fguard/Makefile b/rel/d/a/npc/d_a_npc_fguard/Makefile index 424955ded0..5e237a3d40 100644 --- a/rel/d/a/npc/d_a_npc_fguard/Makefile +++ b/rel/d/a/npc/d_a_npc_fguard/Makefile @@ -38,10 +38,17 @@ $(M303_TARGET): $(M303_O_FILES) $(M303_LIBS) @python3 tools/lcf.py rel 303 --output $(M303_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M303_LDFLAGS) -o $(M303_TARGET) @build/M303_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_fguard/%.o: rel/d/a/npc/d_a_npc_fguard/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_fguard/%.o: rel/d/a/npc/d_a_npc_fguard/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_fguard/%.d @echo [303] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M303_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M303_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M303_D_FILES := $(M303_O_FILES:.o=.d) +$(M303_D_FILES): +include $(wildcard $(M303_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_fish/Makefile b/rel/d/a/npc/d_a_npc_fish/Makefile index d9c137ecca..e78658f43e 100644 --- a/rel/d/a/npc/d_a_npc_fish/Makefile +++ b/rel/d/a/npc/d_a_npc_fish/Makefile @@ -38,10 +38,17 @@ $(M81_TARGET): $(M81_O_FILES) $(M81_LIBS) @python3 tools/lcf.py rel 81 --output $(M81_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M81_LDFLAGS) -o $(M81_TARGET) @build/M81_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_fish/%.o: rel/d/a/npc/d_a_npc_fish/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_fish/%.o: rel/d/a/npc/d_a_npc_fish/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_fish/%.d @echo [ 81] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M81_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M81_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M81_D_FILES := $(M81_O_FILES:.o=.d) +$(M81_D_FILES): +include $(wildcard $(M81_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_gnd/Makefile b/rel/d/a/npc/d_a_npc_gnd/Makefile index a7be477c61..0220010acf 100644 --- a/rel/d/a/npc/d_a_npc_gnd/Makefile +++ b/rel/d/a/npc/d_a_npc_gnd/Makefile @@ -40,10 +40,17 @@ $(M304_TARGET): $(M304_O_FILES) $(M304_LIBS) @python3 tools/lcf.py rel 304 --output $(M304_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M304_LDFLAGS) -o $(M304_TARGET) @build/M304_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_gnd/%.o: rel/d/a/npc/d_a_npc_gnd/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_gnd/%.o: rel/d/a/npc/d_a_npc_gnd/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_gnd/%.d @echo [304] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M304_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M304_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M304_D_FILES := $(M304_O_FILES:.o=.d) +$(M304_D_FILES): +include $(wildcard $(M304_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_gra/Makefile b/rel/d/a/npc/d_a_npc_gra/Makefile index 0d9e3cde02..42bc58af20 100644 --- a/rel/d/a/npc/d_a_npc_gra/Makefile +++ b/rel/d/a/npc/d_a_npc_gra/Makefile @@ -40,10 +40,17 @@ $(M305_TARGET): $(M305_O_FILES) $(M305_LIBS) @python3 tools/lcf.py rel 305 --output $(M305_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M305_LDFLAGS) -o $(M305_TARGET) @build/M305_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_gra/%.o: rel/d/a/npc/d_a_npc_gra/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_gra/%.o: rel/d/a/npc/d_a_npc_gra/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_gra/%.d @echo [305] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M305_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M305_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M305_D_FILES := $(M305_O_FILES:.o=.d) +$(M305_D_FILES): +include $(wildcard $(M305_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_grc/Makefile b/rel/d/a/npc/d_a_npc_grc/Makefile index ff3b3fbf37..692cdfa741 100644 --- a/rel/d/a/npc/d_a_npc_grc/Makefile +++ b/rel/d/a/npc/d_a_npc_grc/Makefile @@ -40,10 +40,17 @@ $(M306_TARGET): $(M306_O_FILES) $(M306_LIBS) @python3 tools/lcf.py rel 306 --output $(M306_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M306_LDFLAGS) -o $(M306_TARGET) @build/M306_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grc/%.o: rel/d/a/npc/d_a_npc_grc/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grc/%.o: rel/d/a/npc/d_a_npc_grc/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_grc/%.d @echo [306] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M306_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M306_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M306_D_FILES := $(M306_O_FILES:.o=.d) +$(M306_D_FILES): +include $(wildcard $(M306_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_grd/Makefile b/rel/d/a/npc/d_a_npc_grd/Makefile index 7aeed65e5b..ed8fd19af5 100644 --- a/rel/d/a/npc/d_a_npc_grd/Makefile +++ b/rel/d/a/npc/d_a_npc_grd/Makefile @@ -40,10 +40,17 @@ $(M307_TARGET): $(M307_O_FILES) $(M307_LIBS) @python3 tools/lcf.py rel 307 --output $(M307_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M307_LDFLAGS) -o $(M307_TARGET) @build/M307_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grd/%.o: rel/d/a/npc/d_a_npc_grd/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grd/%.o: rel/d/a/npc/d_a_npc_grd/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_grd/%.d @echo [307] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M307_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M307_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M307_D_FILES := $(M307_O_FILES:.o=.d) +$(M307_D_FILES): +include $(wildcard $(M307_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_grm/Makefile b/rel/d/a/npc/d_a_npc_grm/Makefile index faecdcab5d..7b3ce6d659 100644 --- a/rel/d/a/npc/d_a_npc_grm/Makefile +++ b/rel/d/a/npc/d_a_npc_grm/Makefile @@ -40,10 +40,17 @@ $(M308_TARGET): $(M308_O_FILES) $(M308_LIBS) @python3 tools/lcf.py rel 308 --output $(M308_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M308_LDFLAGS) -o $(M308_TARGET) @build/M308_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grm/%.o: rel/d/a/npc/d_a_npc_grm/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grm/%.o: rel/d/a/npc/d_a_npc_grm/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_grm/%.d @echo [308] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M308_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M308_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M308_D_FILES := $(M308_O_FILES:.o=.d) +$(M308_D_FILES): +include $(wildcard $(M308_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_grmc/Makefile b/rel/d/a/npc/d_a_npc_grmc/Makefile index 0325212cc2..b4000d5a0d 100644 --- a/rel/d/a/npc/d_a_npc_grmc/Makefile +++ b/rel/d/a/npc/d_a_npc_grmc/Makefile @@ -40,10 +40,17 @@ $(M309_TARGET): $(M309_O_FILES) $(M309_LIBS) @python3 tools/lcf.py rel 309 --output $(M309_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M309_LDFLAGS) -o $(M309_TARGET) @build/M309_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grmc/%.o: rel/d/a/npc/d_a_npc_grmc/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grmc/%.o: rel/d/a/npc/d_a_npc_grmc/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_grmc/%.d @echo [309] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M309_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M309_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M309_D_FILES := $(M309_O_FILES:.o=.d) +$(M309_D_FILES): +include $(wildcard $(M309_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_gro/Makefile b/rel/d/a/npc/d_a_npc_gro/Makefile index fe4d2acef2..7c9f8c9c45 100644 --- a/rel/d/a/npc/d_a_npc_gro/Makefile +++ b/rel/d/a/npc/d_a_npc_gro/Makefile @@ -40,10 +40,17 @@ $(M310_TARGET): $(M310_O_FILES) $(M310_LIBS) @python3 tools/lcf.py rel 310 --output $(M310_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M310_LDFLAGS) -o $(M310_TARGET) @build/M310_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_gro/%.o: rel/d/a/npc/d_a_npc_gro/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_gro/%.o: rel/d/a/npc/d_a_npc_gro/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_gro/%.d @echo [310] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M310_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M310_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M310_D_FILES := $(M310_O_FILES:.o=.d) +$(M310_D_FILES): +include $(wildcard $(M310_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_grr/Makefile b/rel/d/a/npc/d_a_npc_grr/Makefile index 35250322e6..dda52274cb 100644 --- a/rel/d/a/npc/d_a_npc_grr/Makefile +++ b/rel/d/a/npc/d_a_npc_grr/Makefile @@ -40,10 +40,17 @@ $(M311_TARGET): $(M311_O_FILES) $(M311_LIBS) @python3 tools/lcf.py rel 311 --output $(M311_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M311_LDFLAGS) -o $(M311_TARGET) @build/M311_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grr/%.o: rel/d/a/npc/d_a_npc_grr/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grr/%.o: rel/d/a/npc/d_a_npc_grr/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_grr/%.d @echo [311] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M311_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M311_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M311_D_FILES := $(M311_O_FILES:.o=.d) +$(M311_D_FILES): +include $(wildcard $(M311_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_grs/Makefile b/rel/d/a/npc/d_a_npc_grs/Makefile index f452bb7ac6..4c29c82588 100644 --- a/rel/d/a/npc/d_a_npc_grs/Makefile +++ b/rel/d/a/npc/d_a_npc_grs/Makefile @@ -40,10 +40,17 @@ $(M312_TARGET): $(M312_O_FILES) $(M312_LIBS) @python3 tools/lcf.py rel 312 --output $(M312_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M312_LDFLAGS) -o $(M312_TARGET) @build/M312_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grs/%.o: rel/d/a/npc/d_a_npc_grs/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grs/%.o: rel/d/a/npc/d_a_npc_grs/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_grs/%.d @echo [312] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M312_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M312_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M312_D_FILES := $(M312_O_FILES:.o=.d) +$(M312_D_FILES): +include $(wildcard $(M312_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_grz/Makefile b/rel/d/a/npc/d_a_npc_grz/Makefile index d8ab788809..58beba45e0 100644 --- a/rel/d/a/npc/d_a_npc_grz/Makefile +++ b/rel/d/a/npc/d_a_npc_grz/Makefile @@ -40,10 +40,17 @@ $(M313_TARGET): $(M313_O_FILES) $(M313_LIBS) @python3 tools/lcf.py rel 313 --output $(M313_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M313_LDFLAGS) -o $(M313_TARGET) @build/M313_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grz/%.o: rel/d/a/npc/d_a_npc_grz/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_grz/%.o: rel/d/a/npc/d_a_npc_grz/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_grz/%.d @echo [313] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M313_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M313_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M313_D_FILES := $(M313_O_FILES:.o=.d) +$(M313_D_FILES): +include $(wildcard $(M313_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_guard/Makefile b/rel/d/a/npc/d_a_npc_guard/Makefile index 5cd897055e..a9c6ce2e22 100644 --- a/rel/d/a/npc/d_a_npc_guard/Makefile +++ b/rel/d/a/npc/d_a_npc_guard/Makefile @@ -38,10 +38,17 @@ $(M314_TARGET): $(M314_O_FILES) $(M314_LIBS) @python3 tools/lcf.py rel 314 --output $(M314_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M314_LDFLAGS) -o $(M314_TARGET) @build/M314_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_guard/%.o: rel/d/a/npc/d_a_npc_guard/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_guard/%.o: rel/d/a/npc/d_a_npc_guard/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_guard/%.d @echo [314] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M314_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M314_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M314_D_FILES := $(M314_O_FILES:.o=.d) +$(M314_D_FILES): +include $(wildcard $(M314_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_gwolf/Makefile b/rel/d/a/npc/d_a_npc_gwolf/Makefile index 5d90c3fdb3..87bd616fb2 100644 --- a/rel/d/a/npc/d_a_npc_gwolf/Makefile +++ b/rel/d/a/npc/d_a_npc_gwolf/Makefile @@ -40,10 +40,17 @@ $(M315_TARGET): $(M315_O_FILES) $(M315_LIBS) @python3 tools/lcf.py rel 315 --output $(M315_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M315_LDFLAGS) -o $(M315_TARGET) @build/M315_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_gwolf/%.o: rel/d/a/npc/d_a_npc_gwolf/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_gwolf/%.o: rel/d/a/npc/d_a_npc_gwolf/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_gwolf/%.d @echo [315] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M315_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M315_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M315_D_FILES := $(M315_O_FILES:.o=.d) +$(M315_D_FILES): +include $(wildcard $(M315_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_hanjo/Makefile b/rel/d/a/npc/d_a_npc_hanjo/Makefile index 1be029e954..ebcc5ef81b 100644 --- a/rel/d/a/npc/d_a_npc_hanjo/Makefile +++ b/rel/d/a/npc/d_a_npc_hanjo/Makefile @@ -40,10 +40,17 @@ $(M316_TARGET): $(M316_O_FILES) $(M316_LIBS) @python3 tools/lcf.py rel 316 --output $(M316_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M316_LDFLAGS) -o $(M316_TARGET) @build/M316_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_hanjo/%.o: rel/d/a/npc/d_a_npc_hanjo/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_hanjo/%.o: rel/d/a/npc/d_a_npc_hanjo/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_hanjo/%.d @echo [316] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M316_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M316_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M316_D_FILES := $(M316_O_FILES:.o=.d) +$(M316_D_FILES): +include $(wildcard $(M316_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_henna/Makefile b/rel/d/a/npc/d_a_npc_henna/Makefile index 6a2be44385..a5e9841523 100644 --- a/rel/d/a/npc/d_a_npc_henna/Makefile +++ b/rel/d/a/npc/d_a_npc_henna/Makefile @@ -40,10 +40,17 @@ $(M82_TARGET): $(M82_O_FILES) $(M82_LIBS) @python3 tools/lcf.py rel 82 --output $(M82_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M82_LDFLAGS) -o $(M82_TARGET) @build/M82_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_henna/%.o: rel/d/a/npc/d_a_npc_henna/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_henna/%.o: rel/d/a/npc/d_a_npc_henna/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_henna/%.d @echo [ 82] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M82_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M82_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M82_D_FILES := $(M82_O_FILES:.o=.d) +$(M82_D_FILES): +include $(wildcard $(M82_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_henna0/Makefile b/rel/d/a/npc/d_a_npc_henna0/Makefile index 872563dec6..180bb56b16 100644 --- a/rel/d/a/npc/d_a_npc_henna0/Makefile +++ b/rel/d/a/npc/d_a_npc_henna0/Makefile @@ -38,10 +38,17 @@ $(M317_TARGET): $(M317_O_FILES) $(M317_LIBS) @python3 tools/lcf.py rel 317 --output $(M317_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M317_LDFLAGS) -o $(M317_TARGET) @build/M317_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_henna0/%.o: rel/d/a/npc/d_a_npc_henna0/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_henna0/%.o: rel/d/a/npc/d_a_npc_henna0/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_henna0/%.d @echo [317] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M317_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M317_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M317_D_FILES := $(M317_O_FILES:.o=.d) +$(M317_D_FILES): +include $(wildcard $(M317_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_hoz/Makefile b/rel/d/a/npc/d_a_npc_hoz/Makefile index 111d4ed552..94e2ee791a 100644 --- a/rel/d/a/npc/d_a_npc_hoz/Makefile +++ b/rel/d/a/npc/d_a_npc_hoz/Makefile @@ -40,10 +40,17 @@ $(M318_TARGET): $(M318_O_FILES) $(M318_LIBS) @python3 tools/lcf.py rel 318 --output $(M318_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M318_LDFLAGS) -o $(M318_TARGET) @build/M318_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_hoz/%.o: rel/d/a/npc/d_a_npc_hoz/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_hoz/%.o: rel/d/a/npc/d_a_npc_hoz/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_hoz/%.d @echo [318] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M318_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M318_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M318_D_FILES := $(M318_O_FILES:.o=.d) +$(M318_D_FILES): +include $(wildcard $(M318_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_impal/Makefile b/rel/d/a/npc/d_a_npc_impal/Makefile index 16818c80c1..174b9298a9 100644 --- a/rel/d/a/npc/d_a_npc_impal/Makefile +++ b/rel/d/a/npc/d_a_npc_impal/Makefile @@ -40,10 +40,17 @@ $(M319_TARGET): $(M319_O_FILES) $(M319_LIBS) @python3 tools/lcf.py rel 319 --output $(M319_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M319_LDFLAGS) -o $(M319_TARGET) @build/M319_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_impal/%.o: rel/d/a/npc/d_a_npc_impal/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_impal/%.o: rel/d/a/npc/d_a_npc_impal/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_impal/%.d @echo [319] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M319_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M319_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M319_D_FILES := $(M319_O_FILES:.o=.d) +$(M319_D_FILES): +include $(wildcard $(M319_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_inko/Makefile b/rel/d/a/npc/d_a_npc_inko/Makefile index 3bac773061..0f965eb61c 100644 --- a/rel/d/a/npc/d_a_npc_inko/Makefile +++ b/rel/d/a/npc/d_a_npc_inko/Makefile @@ -38,10 +38,17 @@ $(M320_TARGET): $(M320_O_FILES) $(M320_LIBS) @python3 tools/lcf.py rel 320 --output $(M320_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M320_LDFLAGS) -o $(M320_TARGET) @build/M320_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_inko/%.o: rel/d/a/npc/d_a_npc_inko/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_inko/%.o: rel/d/a/npc/d_a_npc_inko/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_inko/%.d @echo [320] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M320_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M320_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M320_D_FILES := $(M320_O_FILES:.o=.d) +$(M320_D_FILES): +include $(wildcard $(M320_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_ins/Makefile b/rel/d/a/npc/d_a_npc_ins/Makefile index 4c277da986..279a944eda 100644 --- a/rel/d/a/npc/d_a_npc_ins/Makefile +++ b/rel/d/a/npc/d_a_npc_ins/Makefile @@ -40,10 +40,17 @@ $(M321_TARGET): $(M321_O_FILES) $(M321_LIBS) @python3 tools/lcf.py rel 321 --output $(M321_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M321_LDFLAGS) -o $(M321_TARGET) @build/M321_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ins/%.o: rel/d/a/npc/d_a_npc_ins/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ins/%.o: rel/d/a/npc/d_a_npc_ins/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_ins/%.d @echo [321] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M321_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M321_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M321_D_FILES := $(M321_O_FILES:.o=.d) +$(M321_D_FILES): +include $(wildcard $(M321_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_jagar/Makefile b/rel/d/a/npc/d_a_npc_jagar/Makefile index 54a0e75ae7..189518bc2b 100644 --- a/rel/d/a/npc/d_a_npc_jagar/Makefile +++ b/rel/d/a/npc/d_a_npc_jagar/Makefile @@ -40,10 +40,17 @@ $(M322_TARGET): $(M322_O_FILES) $(M322_LIBS) @python3 tools/lcf.py rel 322 --output $(M322_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M322_LDFLAGS) -o $(M322_TARGET) @build/M322_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_jagar/%.o: rel/d/a/npc/d_a_npc_jagar/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_jagar/%.o: rel/d/a/npc/d_a_npc_jagar/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_jagar/%.d @echo [322] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M322_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M322_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M322_D_FILES := $(M322_O_FILES:.o=.d) +$(M322_D_FILES): +include $(wildcard $(M322_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kakashi/Makefile b/rel/d/a/npc/d_a_npc_kakashi/Makefile index fdbf022823..bd44a9a0b9 100644 --- a/rel/d/a/npc/d_a_npc_kakashi/Makefile +++ b/rel/d/a/npc/d_a_npc_kakashi/Makefile @@ -40,10 +40,17 @@ $(M83_TARGET): $(M83_O_FILES) $(M83_LIBS) @python3 tools/lcf.py rel 83 --output $(M83_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M83_LDFLAGS) -o $(M83_TARGET) @build/M83_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kakashi/%.o: rel/d/a/npc/d_a_npc_kakashi/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kakashi/%.o: rel/d/a/npc/d_a_npc_kakashi/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kakashi/%.d @echo [ 83] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M83_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M83_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M83_D_FILES := $(M83_O_FILES:.o=.d) +$(M83_D_FILES): +include $(wildcard $(M83_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kasi_hana/Makefile b/rel/d/a/npc/d_a_npc_kasi_hana/Makefile index 0cb1c37e6f..02129f25c0 100644 --- a/rel/d/a/npc/d_a_npc_kasi_hana/Makefile +++ b/rel/d/a/npc/d_a_npc_kasi_hana/Makefile @@ -40,10 +40,17 @@ $(M323_TARGET): $(M323_O_FILES) $(M323_LIBS) @python3 tools/lcf.py rel 323 --output $(M323_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M323_LDFLAGS) -o $(M323_TARGET) @build/M323_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kasi_hana/%.o: rel/d/a/npc/d_a_npc_kasi_hana/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kasi_hana/%.o: rel/d/a/npc/d_a_npc_kasi_hana/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kasi_hana/%.d @echo [323] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M323_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M323_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M323_D_FILES := $(M323_O_FILES:.o=.d) +$(M323_D_FILES): +include $(wildcard $(M323_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kasi_kyu/Makefile b/rel/d/a/npc/d_a_npc_kasi_kyu/Makefile index 2ceb55e5e7..19c46c3cfc 100644 --- a/rel/d/a/npc/d_a_npc_kasi_kyu/Makefile +++ b/rel/d/a/npc/d_a_npc_kasi_kyu/Makefile @@ -40,10 +40,17 @@ $(M324_TARGET): $(M324_O_FILES) $(M324_LIBS) @python3 tools/lcf.py rel 324 --output $(M324_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M324_LDFLAGS) -o $(M324_TARGET) @build/M324_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kasi_kyu/%.o: rel/d/a/npc/d_a_npc_kasi_kyu/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kasi_kyu/%.o: rel/d/a/npc/d_a_npc_kasi_kyu/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kasi_kyu/%.d @echo [324] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M324_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M324_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M324_D_FILES := $(M324_O_FILES:.o=.d) +$(M324_D_FILES): +include $(wildcard $(M324_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kasi_mich/Makefile b/rel/d/a/npc/d_a_npc_kasi_mich/Makefile index 60c779085a..98404ae728 100644 --- a/rel/d/a/npc/d_a_npc_kasi_mich/Makefile +++ b/rel/d/a/npc/d_a_npc_kasi_mich/Makefile @@ -40,10 +40,17 @@ $(M325_TARGET): $(M325_O_FILES) $(M325_LIBS) @python3 tools/lcf.py rel 325 --output $(M325_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M325_LDFLAGS) -o $(M325_TARGET) @build/M325_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kasi_mich/%.o: rel/d/a/npc/d_a_npc_kasi_mich/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kasi_mich/%.o: rel/d/a/npc/d_a_npc_kasi_mich/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kasi_mich/%.d @echo [325] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M325_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M325_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M325_D_FILES := $(M325_O_FILES:.o=.d) +$(M325_D_FILES): +include $(wildcard $(M325_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kdk/Makefile b/rel/d/a/npc/d_a_npc_kdk/Makefile index e7b1a4085d..646a40bd5f 100644 --- a/rel/d/a/npc/d_a_npc_kdk/Makefile +++ b/rel/d/a/npc/d_a_npc_kdk/Makefile @@ -38,10 +38,17 @@ $(M326_TARGET): $(M326_O_FILES) $(M326_LIBS) @python3 tools/lcf.py rel 326 --output $(M326_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M326_LDFLAGS) -o $(M326_TARGET) @build/M326_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kdk/%.o: rel/d/a/npc/d_a_npc_kdk/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kdk/%.o: rel/d/a/npc/d_a_npc_kdk/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kdk/%.d @echo [326] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M326_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M326_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M326_D_FILES := $(M326_O_FILES:.o=.d) +$(M326_D_FILES): +include $(wildcard $(M326_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kkri/Makefile b/rel/d/a/npc/d_a_npc_kkri/Makefile index 27e4111d14..029c7ef0cd 100644 --- a/rel/d/a/npc/d_a_npc_kkri/Makefile +++ b/rel/d/a/npc/d_a_npc_kkri/Makefile @@ -40,10 +40,17 @@ $(M84_TARGET): $(M84_O_FILES) $(M84_LIBS) @python3 tools/lcf.py rel 84 --output $(M84_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M84_LDFLAGS) -o $(M84_TARGET) @build/M84_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kkri/%.o: rel/d/a/npc/d_a_npc_kkri/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kkri/%.o: rel/d/a/npc/d_a_npc_kkri/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kkri/%.d @echo [ 84] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M84_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M84_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M84_D_FILES := $(M84_O_FILES:.o=.d) +$(M84_D_FILES): +include $(wildcard $(M84_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kn/Makefile b/rel/d/a/npc/d_a_npc_kn/Makefile index 7938ffe0f9..f05c15426c 100644 --- a/rel/d/a/npc/d_a_npc_kn/Makefile +++ b/rel/d/a/npc/d_a_npc_kn/Makefile @@ -40,10 +40,17 @@ $(M327_TARGET): $(M327_O_FILES) $(M327_LIBS) @python3 tools/lcf.py rel 327 --output $(M327_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M327_LDFLAGS) -o $(M327_TARGET) @build/M327_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kn/%.o: rel/d/a/npc/d_a_npc_kn/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kn/%.o: rel/d/a/npc/d_a_npc_kn/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kn/%.d @echo [327] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M327_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M327_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M327_D_FILES := $(M327_O_FILES:.o=.d) +$(M327_D_FILES): +include $(wildcard $(M327_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_knj/Makefile b/rel/d/a/npc/d_a_npc_knj/Makefile index 1037e4805d..7cfd07c673 100644 --- a/rel/d/a/npc/d_a_npc_knj/Makefile +++ b/rel/d/a/npc/d_a_npc_knj/Makefile @@ -40,10 +40,17 @@ $(M328_TARGET): $(M328_O_FILES) $(M328_LIBS) @python3 tools/lcf.py rel 328 --output $(M328_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M328_LDFLAGS) -o $(M328_TARGET) @build/M328_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_knj/%.o: rel/d/a/npc/d_a_npc_knj/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_knj/%.o: rel/d/a/npc/d_a_npc_knj/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_knj/%.d @echo [328] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M328_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M328_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M328_D_FILES := $(M328_O_FILES:.o=.d) +$(M328_D_FILES): +include $(wildcard $(M328_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kolin/Makefile b/rel/d/a/npc/d_a_npc_kolin/Makefile index 6eba2944d4..1fa04c6a1f 100644 --- a/rel/d/a/npc/d_a_npc_kolin/Makefile +++ b/rel/d/a/npc/d_a_npc_kolin/Makefile @@ -40,10 +40,17 @@ $(M85_TARGET): $(M85_O_FILES) $(M85_LIBS) @python3 tools/lcf.py rel 85 --output $(M85_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M85_LDFLAGS) -o $(M85_TARGET) @build/M85_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kolin/%.o: rel/d/a/npc/d_a_npc_kolin/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kolin/%.o: rel/d/a/npc/d_a_npc_kolin/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kolin/%.d @echo [ 85] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M85_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M85_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M85_D_FILES := $(M85_O_FILES:.o=.d) +$(M85_D_FILES): +include $(wildcard $(M85_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kolinb/Makefile b/rel/d/a/npc/d_a_npc_kolinb/Makefile index 29d63baf25..03580ff45a 100644 --- a/rel/d/a/npc/d_a_npc_kolinb/Makefile +++ b/rel/d/a/npc/d_a_npc_kolinb/Makefile @@ -40,10 +40,17 @@ $(M329_TARGET): $(M329_O_FILES) $(M329_LIBS) @python3 tools/lcf.py rel 329 --output $(M329_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M329_LDFLAGS) -o $(M329_TARGET) @build/M329_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kolinb/%.o: rel/d/a/npc/d_a_npc_kolinb/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kolinb/%.o: rel/d/a/npc/d_a_npc_kolinb/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kolinb/%.d @echo [329] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M329_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M329_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M329_D_FILES := $(M329_O_FILES:.o=.d) +$(M329_D_FILES): +include $(wildcard $(M329_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_ks/Makefile b/rel/d/a/npc/d_a_npc_ks/Makefile index 4c772348ea..66be99653a 100644 --- a/rel/d/a/npc/d_a_npc_ks/Makefile +++ b/rel/d/a/npc/d_a_npc_ks/Makefile @@ -40,10 +40,17 @@ $(M330_TARGET): $(M330_O_FILES) $(M330_LIBS) @python3 tools/lcf.py rel 330 --output $(M330_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M330_LDFLAGS) -o $(M330_TARGET) @build/M330_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ks/%.o: rel/d/a/npc/d_a_npc_ks/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ks/%.o: rel/d/a/npc/d_a_npc_ks/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_ks/%.d @echo [330] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M330_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M330_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M330_D_FILES := $(M330_O_FILES:.o=.d) +$(M330_D_FILES): +include $(wildcard $(M330_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_kyury/Makefile b/rel/d/a/npc/d_a_npc_kyury/Makefile index 1556137112..0e8b223f91 100644 --- a/rel/d/a/npc/d_a_npc_kyury/Makefile +++ b/rel/d/a/npc/d_a_npc_kyury/Makefile @@ -40,10 +40,17 @@ $(M331_TARGET): $(M331_O_FILES) $(M331_LIBS) @python3 tools/lcf.py rel 331 --output $(M331_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M331_LDFLAGS) -o $(M331_TARGET) @build/M331_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kyury/%.o: rel/d/a/npc/d_a_npc_kyury/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_kyury/%.o: rel/d/a/npc/d_a_npc_kyury/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_kyury/%.d @echo [331] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M331_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M331_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M331_D_FILES := $(M331_O_FILES:.o=.d) +$(M331_D_FILES): +include $(wildcard $(M331_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_len/Makefile b/rel/d/a/npc/d_a_npc_len/Makefile index d998d7fa72..ba1c991ce2 100644 --- a/rel/d/a/npc/d_a_npc_len/Makefile +++ b/rel/d/a/npc/d_a_npc_len/Makefile @@ -40,10 +40,17 @@ $(M332_TARGET): $(M332_O_FILES) $(M332_LIBS) @python3 tools/lcf.py rel 332 --output $(M332_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M332_LDFLAGS) -o $(M332_TARGET) @build/M332_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_len/%.o: rel/d/a/npc/d_a_npc_len/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_len/%.o: rel/d/a/npc/d_a_npc_len/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_len/%.d @echo [332] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M332_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M332_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M332_D_FILES := $(M332_O_FILES:.o=.d) +$(M332_D_FILES): +include $(wildcard $(M332_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_lf/Makefile b/rel/d/a/npc/d_a_npc_lf/Makefile index 92c235f4e5..463c623d0a 100644 --- a/rel/d/a/npc/d_a_npc_lf/Makefile +++ b/rel/d/a/npc/d_a_npc_lf/Makefile @@ -40,10 +40,17 @@ $(M333_TARGET): $(M333_O_FILES) $(M333_LIBS) @python3 tools/lcf.py rel 333 --output $(M333_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M333_LDFLAGS) -o $(M333_TARGET) @build/M333_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_lf/%.o: rel/d/a/npc/d_a_npc_lf/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_lf/%.o: rel/d/a/npc/d_a_npc_lf/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_lf/%.d @echo [333] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M333_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M333_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M333_D_FILES := $(M333_O_FILES:.o=.d) +$(M333_D_FILES): +include $(wildcard $(M333_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_lud/Makefile b/rel/d/a/npc/d_a_npc_lud/Makefile index 3971b76ed5..7c6fceee61 100644 --- a/rel/d/a/npc/d_a_npc_lud/Makefile +++ b/rel/d/a/npc/d_a_npc_lud/Makefile @@ -40,10 +40,17 @@ $(M334_TARGET): $(M334_O_FILES) $(M334_LIBS) @python3 tools/lcf.py rel 334 --output $(M334_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M334_LDFLAGS) -o $(M334_TARGET) @build/M334_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_lud/%.o: rel/d/a/npc/d_a_npc_lud/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_lud/%.o: rel/d/a/npc/d_a_npc_lud/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_lud/%.d @echo [334] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M334_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M334_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M334_D_FILES := $(M334_O_FILES:.o=.d) +$(M334_D_FILES): +include $(wildcard $(M334_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_maro/Makefile b/rel/d/a/npc/d_a_npc_maro/Makefile index 18b2fb1256..e2bad4f0f8 100644 --- a/rel/d/a/npc/d_a_npc_maro/Makefile +++ b/rel/d/a/npc/d_a_npc_maro/Makefile @@ -40,10 +40,17 @@ $(M86_TARGET): $(M86_O_FILES) $(M86_LIBS) @python3 tools/lcf.py rel 86 --output $(M86_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M86_LDFLAGS) -o $(M86_TARGET) @build/M86_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_maro/%.o: rel/d/a/npc/d_a_npc_maro/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_maro/%.o: rel/d/a/npc/d_a_npc_maro/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_maro/%.d @echo [ 86] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M86_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M86_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M86_D_FILES := $(M86_O_FILES:.o=.d) +$(M86_D_FILES): +include $(wildcard $(M86_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_midp/Makefile b/rel/d/a/npc/d_a_npc_midp/Makefile index b1c0325983..2d51ef4c10 100644 --- a/rel/d/a/npc/d_a_npc_midp/Makefile +++ b/rel/d/a/npc/d_a_npc_midp/Makefile @@ -40,10 +40,17 @@ $(M335_TARGET): $(M335_O_FILES) $(M335_LIBS) @python3 tools/lcf.py rel 335 --output $(M335_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M335_LDFLAGS) -o $(M335_TARGET) @build/M335_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_midp/%.o: rel/d/a/npc/d_a_npc_midp/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_midp/%.o: rel/d/a/npc/d_a_npc_midp/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_midp/%.d @echo [335] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M335_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M335_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M335_D_FILES := $(M335_O_FILES:.o=.d) +$(M335_D_FILES): +include $(wildcard $(M335_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_mk/Makefile b/rel/d/a/npc/d_a_npc_mk/Makefile index c296c67876..a042303e86 100644 --- a/rel/d/a/npc/d_a_npc_mk/Makefile +++ b/rel/d/a/npc/d_a_npc_mk/Makefile @@ -38,10 +38,17 @@ $(M336_TARGET): $(M336_O_FILES) $(M336_LIBS) @python3 tools/lcf.py rel 336 --output $(M336_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M336_LDFLAGS) -o $(M336_TARGET) @build/M336_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_mk/%.o: rel/d/a/npc/d_a_npc_mk/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_mk/%.o: rel/d/a/npc/d_a_npc_mk/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_mk/%.d @echo [336] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M336_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M336_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M336_D_FILES := $(M336_O_FILES:.o=.d) +$(M336_D_FILES): +include $(wildcard $(M336_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_moi/Makefile b/rel/d/a/npc/d_a_npc_moi/Makefile index 8166253628..4184241d16 100644 --- a/rel/d/a/npc/d_a_npc_moi/Makefile +++ b/rel/d/a/npc/d_a_npc_moi/Makefile @@ -40,10 +40,17 @@ $(M337_TARGET): $(M337_O_FILES) $(M337_LIBS) @python3 tools/lcf.py rel 337 --output $(M337_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M337_LDFLAGS) -o $(M337_TARGET) @build/M337_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_moi/%.o: rel/d/a/npc/d_a_npc_moi/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_moi/%.o: rel/d/a/npc/d_a_npc_moi/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_moi/%.d @echo [337] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M337_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M337_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M337_D_FILES := $(M337_O_FILES:.o=.d) +$(M337_D_FILES): +include $(wildcard $(M337_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_moir/Makefile b/rel/d/a/npc/d_a_npc_moir/Makefile index 550a233847..69a5dfb012 100644 --- a/rel/d/a/npc/d_a_npc_moir/Makefile +++ b/rel/d/a/npc/d_a_npc_moir/Makefile @@ -40,10 +40,17 @@ $(M338_TARGET): $(M338_O_FILES) $(M338_LIBS) @python3 tools/lcf.py rel 338 --output $(M338_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M338_LDFLAGS) -o $(M338_TARGET) @build/M338_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_moir/%.o: rel/d/a/npc/d_a_npc_moir/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_moir/%.o: rel/d/a/npc/d_a_npc_moir/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_moir/%.d @echo [338] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M338_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M338_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M338_D_FILES := $(M338_O_FILES:.o=.d) +$(M338_D_FILES): +include $(wildcard $(M338_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_myna2/Makefile b/rel/d/a/npc/d_a_npc_myna2/Makefile index bb938fefb0..3411d2b4d4 100644 --- a/rel/d/a/npc/d_a_npc_myna2/Makefile +++ b/rel/d/a/npc/d_a_npc_myna2/Makefile @@ -40,10 +40,17 @@ $(M339_TARGET): $(M339_O_FILES) $(M339_LIBS) @python3 tools/lcf.py rel 339 --output $(M339_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M339_LDFLAGS) -o $(M339_TARGET) @build/M339_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_myna2/%.o: rel/d/a/npc/d_a_npc_myna2/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_myna2/%.o: rel/d/a/npc/d_a_npc_myna2/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_myna2/%.d @echo [339] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M339_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M339_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M339_D_FILES := $(M339_O_FILES:.o=.d) +$(M339_D_FILES): +include $(wildcard $(M339_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_ne/Makefile b/rel/d/a/npc/d_a_npc_ne/Makefile index b64ea7a32c..a6e294b6be 100644 --- a/rel/d/a/npc/d_a_npc_ne/Makefile +++ b/rel/d/a/npc/d_a_npc_ne/Makefile @@ -40,10 +40,17 @@ $(M340_TARGET): $(M340_O_FILES) $(M340_LIBS) @python3 tools/lcf.py rel 340 --output $(M340_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M340_LDFLAGS) -o $(M340_TARGET) @build/M340_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ne/%.o: rel/d/a/npc/d_a_npc_ne/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ne/%.o: rel/d/a/npc/d_a_npc_ne/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_ne/%.d @echo [340] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M340_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M340_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M340_D_FILES := $(M340_O_FILES:.o=.d) +$(M340_D_FILES): +include $(wildcard $(M340_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_p2/Makefile b/rel/d/a/npc/d_a_npc_p2/Makefile index 4b1098a90e..cc39d13814 100644 --- a/rel/d/a/npc/d_a_npc_p2/Makefile +++ b/rel/d/a/npc/d_a_npc_p2/Makefile @@ -38,10 +38,17 @@ $(M341_TARGET): $(M341_O_FILES) $(M341_LIBS) @python3 tools/lcf.py rel 341 --output $(M341_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M341_LDFLAGS) -o $(M341_TARGET) @build/M341_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_p2/%.o: rel/d/a/npc/d_a_npc_p2/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_p2/%.o: rel/d/a/npc/d_a_npc_p2/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_p2/%.d @echo [341] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M341_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M341_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M341_D_FILES := $(M341_O_FILES:.o=.d) +$(M341_D_FILES): +include $(wildcard $(M341_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_pachi_besu/Makefile b/rel/d/a/npc/d_a_npc_pachi_besu/Makefile index 122b17b081..4c563b8088 100644 --- a/rel/d/a/npc/d_a_npc_pachi_besu/Makefile +++ b/rel/d/a/npc/d_a_npc_pachi_besu/Makefile @@ -40,10 +40,17 @@ $(M342_TARGET): $(M342_O_FILES) $(M342_LIBS) @python3 tools/lcf.py rel 342 --output $(M342_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M342_LDFLAGS) -o $(M342_TARGET) @build/M342_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_pachi_besu/%.o: rel/d/a/npc/d_a_npc_pachi_besu/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_pachi_besu/%.o: rel/d/a/npc/d_a_npc_pachi_besu/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_pachi_besu/%.d @echo [342] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M342_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M342_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M342_D_FILES := $(M342_O_FILES:.o=.d) +$(M342_D_FILES): +include $(wildcard $(M342_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_pachi_maro/Makefile b/rel/d/a/npc/d_a_npc_pachi_maro/Makefile index da4a68ba23..8dbcf92799 100644 --- a/rel/d/a/npc/d_a_npc_pachi_maro/Makefile +++ b/rel/d/a/npc/d_a_npc_pachi_maro/Makefile @@ -40,10 +40,17 @@ $(M343_TARGET): $(M343_O_FILES) $(M343_LIBS) @python3 tools/lcf.py rel 343 --output $(M343_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M343_LDFLAGS) -o $(M343_TARGET) @build/M343_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_pachi_maro/%.o: rel/d/a/npc/d_a_npc_pachi_maro/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_pachi_maro/%.o: rel/d/a/npc/d_a_npc_pachi_maro/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_pachi_maro/%.d @echo [343] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M343_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M343_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M343_D_FILES := $(M343_O_FILES:.o=.d) +$(M343_D_FILES): +include $(wildcard $(M343_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_pachi_taro/Makefile b/rel/d/a/npc/d_a_npc_pachi_taro/Makefile index 11863d636e..3b4ba061f1 100644 --- a/rel/d/a/npc/d_a_npc_pachi_taro/Makefile +++ b/rel/d/a/npc/d_a_npc_pachi_taro/Makefile @@ -40,10 +40,17 @@ $(M344_TARGET): $(M344_O_FILES) $(M344_LIBS) @python3 tools/lcf.py rel 344 --output $(M344_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M344_LDFLAGS) -o $(M344_TARGET) @build/M344_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_pachi_taro/%.o: rel/d/a/npc/d_a_npc_pachi_taro/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_pachi_taro/%.o: rel/d/a/npc/d_a_npc_pachi_taro/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_pachi_taro/%.d @echo [344] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M344_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M344_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M344_D_FILES := $(M344_O_FILES:.o=.d) +$(M344_D_FILES): +include $(wildcard $(M344_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_passer/Makefile b/rel/d/a/npc/d_a_npc_passer/Makefile index 9fe91e1d28..b12e00b2c9 100644 --- a/rel/d/a/npc/d_a_npc_passer/Makefile +++ b/rel/d/a/npc/d_a_npc_passer/Makefile @@ -38,10 +38,17 @@ $(M345_TARGET): $(M345_O_FILES) $(M345_LIBS) @python3 tools/lcf.py rel 345 --output $(M345_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M345_LDFLAGS) -o $(M345_TARGET) @build/M345_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_passer/%.o: rel/d/a/npc/d_a_npc_passer/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_passer/%.o: rel/d/a/npc/d_a_npc_passer/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_passer/%.d @echo [345] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M345_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M345_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M345_D_FILES := $(M345_O_FILES:.o=.d) +$(M345_D_FILES): +include $(wildcard $(M345_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_passer2/Makefile b/rel/d/a/npc/d_a_npc_passer2/Makefile index 3351fc770c..13d0d27d3c 100644 --- a/rel/d/a/npc/d_a_npc_passer2/Makefile +++ b/rel/d/a/npc/d_a_npc_passer2/Makefile @@ -38,10 +38,17 @@ $(M346_TARGET): $(M346_O_FILES) $(M346_LIBS) @python3 tools/lcf.py rel 346 --output $(M346_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M346_LDFLAGS) -o $(M346_TARGET) @build/M346_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_passer2/%.o: rel/d/a/npc/d_a_npc_passer2/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_passer2/%.o: rel/d/a/npc/d_a_npc_passer2/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_passer2/%.d @echo [346] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M346_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M346_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M346_D_FILES := $(M346_O_FILES:.o=.d) +$(M346_D_FILES): +include $(wildcard $(M346_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_post/Makefile b/rel/d/a/npc/d_a_npc_post/Makefile index 55be014b81..4e7dc9b7af 100644 --- a/rel/d/a/npc/d_a_npc_post/Makefile +++ b/rel/d/a/npc/d_a_npc_post/Makefile @@ -40,10 +40,17 @@ $(M347_TARGET): $(M347_O_FILES) $(M347_LIBS) @python3 tools/lcf.py rel 347 --output $(M347_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M347_LDFLAGS) -o $(M347_TARGET) @build/M347_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_post/%.o: rel/d/a/npc/d_a_npc_post/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_post/%.o: rel/d/a/npc/d_a_npc_post/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_post/%.d @echo [347] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M347_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M347_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M347_D_FILES := $(M347_O_FILES:.o=.d) +$(M347_D_FILES): +include $(wildcard $(M347_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_pouya/Makefile b/rel/d/a/npc/d_a_npc_pouya/Makefile index 355803f956..f988efdfc6 100644 --- a/rel/d/a/npc/d_a_npc_pouya/Makefile +++ b/rel/d/a/npc/d_a_npc_pouya/Makefile @@ -40,10 +40,17 @@ $(M348_TARGET): $(M348_O_FILES) $(M348_LIBS) @python3 tools/lcf.py rel 348 --output $(M348_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M348_LDFLAGS) -o $(M348_TARGET) @build/M348_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_pouya/%.o: rel/d/a/npc/d_a_npc_pouya/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_pouya/%.o: rel/d/a/npc/d_a_npc_pouya/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_pouya/%.d @echo [348] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M348_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M348_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M348_D_FILES := $(M348_O_FILES:.o=.d) +$(M348_D_FILES): +include $(wildcard $(M348_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_prayer/Makefile b/rel/d/a/npc/d_a_npc_prayer/Makefile index a49411a153..f9f1ae59cd 100644 --- a/rel/d/a/npc/d_a_npc_prayer/Makefile +++ b/rel/d/a/npc/d_a_npc_prayer/Makefile @@ -40,10 +40,17 @@ $(M349_TARGET): $(M349_O_FILES) $(M349_LIBS) @python3 tools/lcf.py rel 349 --output $(M349_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M349_LDFLAGS) -o $(M349_TARGET) @build/M349_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_prayer/%.o: rel/d/a/npc/d_a_npc_prayer/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_prayer/%.o: rel/d/a/npc/d_a_npc_prayer/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_prayer/%.d @echo [349] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M349_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M349_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M349_D_FILES := $(M349_O_FILES:.o=.d) +$(M349_D_FILES): +include $(wildcard $(M349_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_raca/Makefile b/rel/d/a/npc/d_a_npc_raca/Makefile index 133397cdfd..db34e21e8f 100644 --- a/rel/d/a/npc/d_a_npc_raca/Makefile +++ b/rel/d/a/npc/d_a_npc_raca/Makefile @@ -40,10 +40,17 @@ $(M350_TARGET): $(M350_O_FILES) $(M350_LIBS) @python3 tools/lcf.py rel 350 --output $(M350_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M350_LDFLAGS) -o $(M350_TARGET) @build/M350_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_raca/%.o: rel/d/a/npc/d_a_npc_raca/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_raca/%.o: rel/d/a/npc/d_a_npc_raca/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_raca/%.d @echo [350] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M350_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M350_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M350_D_FILES := $(M350_O_FILES:.o=.d) +$(M350_D_FILES): +include $(wildcard $(M350_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_rafrel/Makefile b/rel/d/a/npc/d_a_npc_rafrel/Makefile index ac5b4939ce..d95c071006 100644 --- a/rel/d/a/npc/d_a_npc_rafrel/Makefile +++ b/rel/d/a/npc/d_a_npc_rafrel/Makefile @@ -40,10 +40,17 @@ $(M351_TARGET): $(M351_O_FILES) $(M351_LIBS) @python3 tools/lcf.py rel 351 --output $(M351_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M351_LDFLAGS) -o $(M351_TARGET) @build/M351_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_rafrel/%.o: rel/d/a/npc/d_a_npc_rafrel/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_rafrel/%.o: rel/d/a/npc/d_a_npc_rafrel/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_rafrel/%.d @echo [351] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M351_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M351_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M351_D_FILES := $(M351_O_FILES:.o=.d) +$(M351_D_FILES): +include $(wildcard $(M351_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_saru/Makefile b/rel/d/a/npc/d_a_npc_saru/Makefile index 200d45da47..b66ddaac49 100644 --- a/rel/d/a/npc/d_a_npc_saru/Makefile +++ b/rel/d/a/npc/d_a_npc_saru/Makefile @@ -40,10 +40,17 @@ $(M352_TARGET): $(M352_O_FILES) $(M352_LIBS) @python3 tools/lcf.py rel 352 --output $(M352_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M352_LDFLAGS) -o $(M352_TARGET) @build/M352_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_saru/%.o: rel/d/a/npc/d_a_npc_saru/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_saru/%.o: rel/d/a/npc/d_a_npc_saru/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_saru/%.d @echo [352] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M352_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M352_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M352_D_FILES := $(M352_O_FILES:.o=.d) +$(M352_D_FILES): +include $(wildcard $(M352_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_seib/Makefile b/rel/d/a/npc/d_a_npc_seib/Makefile index 99a59e0b2e..bfce8ae1fd 100644 --- a/rel/d/a/npc/d_a_npc_seib/Makefile +++ b/rel/d/a/npc/d_a_npc_seib/Makefile @@ -40,10 +40,17 @@ $(M353_TARGET): $(M353_O_FILES) $(M353_LIBS) @python3 tools/lcf.py rel 353 --output $(M353_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M353_LDFLAGS) -o $(M353_TARGET) @build/M353_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seib/%.o: rel/d/a/npc/d_a_npc_seib/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seib/%.o: rel/d/a/npc/d_a_npc_seib/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_seib/%.d @echo [353] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M353_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M353_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M353_D_FILES := $(M353_O_FILES:.o=.d) +$(M353_D_FILES): +include $(wildcard $(M353_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_seic/Makefile b/rel/d/a/npc/d_a_npc_seic/Makefile index 9059963770..66666dcde4 100644 --- a/rel/d/a/npc/d_a_npc_seic/Makefile +++ b/rel/d/a/npc/d_a_npc_seic/Makefile @@ -40,10 +40,17 @@ $(M354_TARGET): $(M354_O_FILES) $(M354_LIBS) @python3 tools/lcf.py rel 354 --output $(M354_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M354_LDFLAGS) -o $(M354_TARGET) @build/M354_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seic/%.o: rel/d/a/npc/d_a_npc_seic/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seic/%.o: rel/d/a/npc/d_a_npc_seic/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_seic/%.d @echo [354] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M354_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M354_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M354_D_FILES := $(M354_O_FILES:.o=.d) +$(M354_D_FILES): +include $(wildcard $(M354_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_seid/Makefile b/rel/d/a/npc/d_a_npc_seid/Makefile index 3635778c02..900dbe4437 100644 --- a/rel/d/a/npc/d_a_npc_seid/Makefile +++ b/rel/d/a/npc/d_a_npc_seid/Makefile @@ -40,10 +40,17 @@ $(M355_TARGET): $(M355_O_FILES) $(M355_LIBS) @python3 tools/lcf.py rel 355 --output $(M355_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M355_LDFLAGS) -o $(M355_TARGET) @build/M355_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seid/%.o: rel/d/a/npc/d_a_npc_seid/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seid/%.o: rel/d/a/npc/d_a_npc_seid/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_seid/%.d @echo [355] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M355_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M355_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M355_D_FILES := $(M355_O_FILES:.o=.d) +$(M355_D_FILES): +include $(wildcard $(M355_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_seira/Makefile b/rel/d/a/npc/d_a_npc_seira/Makefile index cdad83c88c..8ef44701af 100644 --- a/rel/d/a/npc/d_a_npc_seira/Makefile +++ b/rel/d/a/npc/d_a_npc_seira/Makefile @@ -40,10 +40,17 @@ $(M356_TARGET): $(M356_O_FILES) $(M356_LIBS) @python3 tools/lcf.py rel 356 --output $(M356_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M356_LDFLAGS) -o $(M356_TARGET) @build/M356_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seira/%.o: rel/d/a/npc/d_a_npc_seira/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seira/%.o: rel/d/a/npc/d_a_npc_seira/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_seira/%.d @echo [356] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M356_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M356_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M356_D_FILES := $(M356_O_FILES:.o=.d) +$(M356_D_FILES): +include $(wildcard $(M356_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_seira2/Makefile b/rel/d/a/npc/d_a_npc_seira2/Makefile index 8b5b2d8d0a..7ba68a081d 100644 --- a/rel/d/a/npc/d_a_npc_seira2/Makefile +++ b/rel/d/a/npc/d_a_npc_seira2/Makefile @@ -40,10 +40,17 @@ $(M357_TARGET): $(M357_O_FILES) $(M357_LIBS) @python3 tools/lcf.py rel 357 --output $(M357_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M357_LDFLAGS) -o $(M357_TARGET) @build/M357_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seira2/%.o: rel/d/a/npc/d_a_npc_seira2/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seira2/%.o: rel/d/a/npc/d_a_npc_seira2/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_seira2/%.d @echo [357] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M357_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M357_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M357_D_FILES := $(M357_O_FILES:.o=.d) +$(M357_D_FILES): +include $(wildcard $(M357_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_seirei/Makefile b/rel/d/a/npc/d_a_npc_seirei/Makefile index 0acde178bd..f8fc4bd359 100644 --- a/rel/d/a/npc/d_a_npc_seirei/Makefile +++ b/rel/d/a/npc/d_a_npc_seirei/Makefile @@ -40,10 +40,17 @@ $(M358_TARGET): $(M358_O_FILES) $(M358_LIBS) @python3 tools/lcf.py rel 358 --output $(M358_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M358_LDFLAGS) -o $(M358_TARGET) @build/M358_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seirei/%.o: rel/d/a/npc/d_a_npc_seirei/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_seirei/%.o: rel/d/a/npc/d_a_npc_seirei/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_seirei/%.d @echo [358] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M358_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M358_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M358_D_FILES := $(M358_O_FILES:.o=.d) +$(M358_D_FILES): +include $(wildcard $(M358_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_shad/Makefile b/rel/d/a/npc/d_a_npc_shad/Makefile index 884f39a530..4d4e8400cc 100644 --- a/rel/d/a/npc/d_a_npc_shad/Makefile +++ b/rel/d/a/npc/d_a_npc_shad/Makefile @@ -40,10 +40,17 @@ $(M359_TARGET): $(M359_O_FILES) $(M359_LIBS) @python3 tools/lcf.py rel 359 --output $(M359_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M359_LDFLAGS) -o $(M359_TARGET) @build/M359_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shad/%.o: rel/d/a/npc/d_a_npc_shad/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shad/%.o: rel/d/a/npc/d_a_npc_shad/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_shad/%.d @echo [359] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M359_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M359_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M359_D_FILES := $(M359_O_FILES:.o=.d) +$(M359_D_FILES): +include $(wildcard $(M359_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_shaman/Makefile b/rel/d/a/npc/d_a_npc_shaman/Makefile index 8a59d9bd35..02fc3930fc 100644 --- a/rel/d/a/npc/d_a_npc_shaman/Makefile +++ b/rel/d/a/npc/d_a_npc_shaman/Makefile @@ -40,10 +40,17 @@ $(M360_TARGET): $(M360_O_FILES) $(M360_LIBS) @python3 tools/lcf.py rel 360 --output $(M360_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M360_LDFLAGS) -o $(M360_TARGET) @build/M360_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shaman/%.o: rel/d/a/npc/d_a_npc_shaman/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shaman/%.o: rel/d/a/npc/d_a_npc_shaman/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_shaman/%.d @echo [360] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M360_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M360_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M360_D_FILES := $(M360_O_FILES:.o=.d) +$(M360_D_FILES): +include $(wildcard $(M360_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_shoe/Makefile b/rel/d/a/npc/d_a_npc_shoe/Makefile index 21dda020b3..a4bde75856 100644 --- a/rel/d/a/npc/d_a_npc_shoe/Makefile +++ b/rel/d/a/npc/d_a_npc_shoe/Makefile @@ -40,10 +40,17 @@ $(M361_TARGET): $(M361_O_FILES) $(M361_LIBS) @python3 tools/lcf.py rel 361 --output $(M361_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M361_LDFLAGS) -o $(M361_TARGET) @build/M361_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shoe/%.o: rel/d/a/npc/d_a_npc_shoe/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shoe/%.o: rel/d/a/npc/d_a_npc_shoe/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_shoe/%.d @echo [361] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M361_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M361_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M361_D_FILES := $(M361_O_FILES:.o=.d) +$(M361_D_FILES): +include $(wildcard $(M361_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_shop0/Makefile b/rel/d/a/npc/d_a_npc_shop0/Makefile index 0a20171a10..d5bfdabf61 100644 --- a/rel/d/a/npc/d_a_npc_shop0/Makefile +++ b/rel/d/a/npc/d_a_npc_shop0/Makefile @@ -38,10 +38,17 @@ $(M362_TARGET): $(M362_O_FILES) $(M362_LIBS) @python3 tools/lcf.py rel 362 --output $(M362_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M362_LDFLAGS) -o $(M362_TARGET) @build/M362_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shop0/%.o: rel/d/a/npc/d_a_npc_shop0/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shop0/%.o: rel/d/a/npc/d_a_npc_shop0/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_shop0/%.d @echo [362] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M362_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M362_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M362_D_FILES := $(M362_O_FILES:.o=.d) +$(M362_D_FILES): +include $(wildcard $(M362_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_shop_maro/Makefile b/rel/d/a/npc/d_a_npc_shop_maro/Makefile index 2638e4c108..d4743683e4 100644 --- a/rel/d/a/npc/d_a_npc_shop_maro/Makefile +++ b/rel/d/a/npc/d_a_npc_shop_maro/Makefile @@ -38,10 +38,17 @@ $(M363_TARGET): $(M363_O_FILES) $(M363_LIBS) @python3 tools/lcf.py rel 363 --output $(M363_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M363_LDFLAGS) -o $(M363_TARGET) @build/M363_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shop_maro/%.o: rel/d/a/npc/d_a_npc_shop_maro/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_shop_maro/%.o: rel/d/a/npc/d_a_npc_shop_maro/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_shop_maro/%.d @echo [363] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M363_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M363_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M363_D_FILES := $(M363_O_FILES:.o=.d) +$(M363_D_FILES): +include $(wildcard $(M363_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_sola/Makefile b/rel/d/a/npc/d_a_npc_sola/Makefile index d6650c37db..05ede7590f 100644 --- a/rel/d/a/npc/d_a_npc_sola/Makefile +++ b/rel/d/a/npc/d_a_npc_sola/Makefile @@ -40,10 +40,17 @@ $(M364_TARGET): $(M364_O_FILES) $(M364_LIBS) @python3 tools/lcf.py rel 364 --output $(M364_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M364_LDFLAGS) -o $(M364_TARGET) @build/M364_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_sola/%.o: rel/d/a/npc/d_a_npc_sola/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_sola/%.o: rel/d/a/npc/d_a_npc_sola/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_sola/%.d @echo [364] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M364_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M364_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M364_D_FILES := $(M364_O_FILES:.o=.d) +$(M364_D_FILES): +include $(wildcard $(M364_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_soldierA/Makefile b/rel/d/a/npc/d_a_npc_soldierA/Makefile index e76e3e4f66..6f6560cea8 100644 --- a/rel/d/a/npc/d_a_npc_soldierA/Makefile +++ b/rel/d/a/npc/d_a_npc_soldierA/Makefile @@ -40,10 +40,17 @@ $(M365_TARGET): $(M365_O_FILES) $(M365_LIBS) @python3 tools/lcf.py rel 365 --output $(M365_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M365_LDFLAGS) -o $(M365_TARGET) @build/M365_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_soldierA/%.o: rel/d/a/npc/d_a_npc_soldierA/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_soldierA/%.o: rel/d/a/npc/d_a_npc_soldierA/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_soldierA/%.d @echo [365] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M365_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M365_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M365_D_FILES := $(M365_O_FILES:.o=.d) +$(M365_D_FILES): +include $(wildcard $(M365_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_soldierB/Makefile b/rel/d/a/npc/d_a_npc_soldierB/Makefile index ba7e11ed99..78373a0705 100644 --- a/rel/d/a/npc/d_a_npc_soldierB/Makefile +++ b/rel/d/a/npc/d_a_npc_soldierB/Makefile @@ -40,10 +40,17 @@ $(M366_TARGET): $(M366_O_FILES) $(M366_LIBS) @python3 tools/lcf.py rel 366 --output $(M366_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M366_LDFLAGS) -o $(M366_TARGET) @build/M366_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_soldierB/%.o: rel/d/a/npc/d_a_npc_soldierB/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_soldierB/%.o: rel/d/a/npc/d_a_npc_soldierB/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_soldierB/%.d @echo [366] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M366_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M366_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M366_D_FILES := $(M366_O_FILES:.o=.d) +$(M366_D_FILES): +include $(wildcard $(M366_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_sq/Makefile b/rel/d/a/npc/d_a_npc_sq/Makefile index 5154879287..74e8d06830 100644 --- a/rel/d/a/npc/d_a_npc_sq/Makefile +++ b/rel/d/a/npc/d_a_npc_sq/Makefile @@ -40,10 +40,17 @@ $(M367_TARGET): $(M367_O_FILES) $(M367_LIBS) @python3 tools/lcf.py rel 367 --output $(M367_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M367_LDFLAGS) -o $(M367_TARGET) @build/M367_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_sq/%.o: rel/d/a/npc/d_a_npc_sq/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_sq/%.o: rel/d/a/npc/d_a_npc_sq/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_sq/%.d @echo [367] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M367_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M367_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M367_D_FILES := $(M367_O_FILES:.o=.d) +$(M367_D_FILES): +include $(wildcard $(M367_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_taro/Makefile b/rel/d/a/npc/d_a_npc_taro/Makefile index a98db32257..d00b53ac93 100644 --- a/rel/d/a/npc/d_a_npc_taro/Makefile +++ b/rel/d/a/npc/d_a_npc_taro/Makefile @@ -40,10 +40,17 @@ $(M87_TARGET): $(M87_O_FILES) $(M87_LIBS) @python3 tools/lcf.py rel 87 --output $(M87_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M87_LDFLAGS) -o $(M87_TARGET) @build/M87_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_taro/%.o: rel/d/a/npc/d_a_npc_taro/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_taro/%.o: rel/d/a/npc/d_a_npc_taro/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_taro/%.d @echo [ 87] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M87_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M87_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M87_D_FILES := $(M87_O_FILES:.o=.d) +$(M87_D_FILES): +include $(wildcard $(M87_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_the/Makefile b/rel/d/a/npc/d_a_npc_the/Makefile index 45b290abb3..de0fbfac4a 100644 --- a/rel/d/a/npc/d_a_npc_the/Makefile +++ b/rel/d/a/npc/d_a_npc_the/Makefile @@ -40,10 +40,17 @@ $(M368_TARGET): $(M368_O_FILES) $(M368_LIBS) @python3 tools/lcf.py rel 368 --output $(M368_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M368_LDFLAGS) -o $(M368_TARGET) @build/M368_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_the/%.o: rel/d/a/npc/d_a_npc_the/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_the/%.o: rel/d/a/npc/d_a_npc_the/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_the/%.d @echo [368] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M368_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M368_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M368_D_FILES := $(M368_O_FILES:.o=.d) +$(M368_D_FILES): +include $(wildcard $(M368_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_theB/Makefile b/rel/d/a/npc/d_a_npc_theB/Makefile index e588939872..64d569f279 100644 --- a/rel/d/a/npc/d_a_npc_theB/Makefile +++ b/rel/d/a/npc/d_a_npc_theB/Makefile @@ -40,10 +40,17 @@ $(M369_TARGET): $(M369_O_FILES) $(M369_LIBS) @python3 tools/lcf.py rel 369 --output $(M369_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M369_LDFLAGS) -o $(M369_TARGET) @build/M369_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_theB/%.o: rel/d/a/npc/d_a_npc_theB/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_theB/%.o: rel/d/a/npc/d_a_npc_theB/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_theB/%.d @echo [369] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M369_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M369_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M369_D_FILES := $(M369_O_FILES:.o=.d) +$(M369_D_FILES): +include $(wildcard $(M369_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_tk/Makefile b/rel/d/a/npc/d_a_npc_tk/Makefile index f24a6dcb09..f3ecff88d2 100644 --- a/rel/d/a/npc/d_a_npc_tk/Makefile +++ b/rel/d/a/npc/d_a_npc_tk/Makefile @@ -40,10 +40,17 @@ $(M370_TARGET): $(M370_O_FILES) $(M370_LIBS) @python3 tools/lcf.py rel 370 --output $(M370_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M370_LDFLAGS) -o $(M370_TARGET) @build/M370_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tk/%.o: rel/d/a/npc/d_a_npc_tk/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tk/%.o: rel/d/a/npc/d_a_npc_tk/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_tk/%.d @echo [370] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M370_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M370_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M370_D_FILES := $(M370_O_FILES:.o=.d) +$(M370_D_FILES): +include $(wildcard $(M370_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_tkc/Makefile b/rel/d/a/npc/d_a_npc_tkc/Makefile index 0478f0b7cb..de2d0c91d2 100644 --- a/rel/d/a/npc/d_a_npc_tkc/Makefile +++ b/rel/d/a/npc/d_a_npc_tkc/Makefile @@ -40,10 +40,17 @@ $(M371_TARGET): $(M371_O_FILES) $(M371_LIBS) @python3 tools/lcf.py rel 371 --output $(M371_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M371_LDFLAGS) -o $(M371_TARGET) @build/M371_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tkc/%.o: rel/d/a/npc/d_a_npc_tkc/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tkc/%.o: rel/d/a/npc/d_a_npc_tkc/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_tkc/%.d @echo [371] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M371_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M371_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M371_D_FILES := $(M371_O_FILES:.o=.d) +$(M371_D_FILES): +include $(wildcard $(M371_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_tkj/Makefile b/rel/d/a/npc/d_a_npc_tkj/Makefile index e501048c7f..01e7102f47 100644 --- a/rel/d/a/npc/d_a_npc_tkj/Makefile +++ b/rel/d/a/npc/d_a_npc_tkj/Makefile @@ -40,10 +40,17 @@ $(M88_TARGET): $(M88_O_FILES) $(M88_LIBS) @python3 tools/lcf.py rel 88 --output $(M88_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M88_LDFLAGS) -o $(M88_TARGET) @build/M88_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tkj/%.o: rel/d/a/npc/d_a_npc_tkj/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tkj/%.o: rel/d/a/npc/d_a_npc_tkj/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_tkj/%.d @echo [ 88] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M88_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M88_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M88_D_FILES := $(M88_O_FILES:.o=.d) +$(M88_D_FILES): +include $(wildcard $(M88_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_tkj2/Makefile b/rel/d/a/npc/d_a_npc_tkj2/Makefile index 97069e45dd..c1b0a5d7e1 100644 --- a/rel/d/a/npc/d_a_npc_tkj2/Makefile +++ b/rel/d/a/npc/d_a_npc_tkj2/Makefile @@ -40,10 +40,17 @@ $(M372_TARGET): $(M372_O_FILES) $(M372_LIBS) @python3 tools/lcf.py rel 372 --output $(M372_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M372_LDFLAGS) -o $(M372_TARGET) @build/M372_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tkj2/%.o: rel/d/a/npc/d_a_npc_tkj2/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tkj2/%.o: rel/d/a/npc/d_a_npc_tkj2/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_tkj2/%.d @echo [372] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M372_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M372_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M372_D_FILES := $(M372_O_FILES:.o=.d) +$(M372_D_FILES): +include $(wildcard $(M372_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_tks/Makefile b/rel/d/a/npc/d_a_npc_tks/Makefile index 9f8c24ca6e..74fbf09756 100644 --- a/rel/d/a/npc/d_a_npc_tks/Makefile +++ b/rel/d/a/npc/d_a_npc_tks/Makefile @@ -40,10 +40,17 @@ $(M373_TARGET): $(M373_O_FILES) $(M373_LIBS) @python3 tools/lcf.py rel 373 --output $(M373_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M373_LDFLAGS) -o $(M373_TARGET) @build/M373_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tks/%.o: rel/d/a/npc/d_a_npc_tks/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tks/%.o: rel/d/a/npc/d_a_npc_tks/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_tks/%.d @echo [373] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M373_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M373_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M373_D_FILES := $(M373_O_FILES:.o=.d) +$(M373_D_FILES): +include $(wildcard $(M373_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_toby/Makefile b/rel/d/a/npc/d_a_npc_toby/Makefile index 259f457c3a..69b5c05acf 100644 --- a/rel/d/a/npc/d_a_npc_toby/Makefile +++ b/rel/d/a/npc/d_a_npc_toby/Makefile @@ -40,10 +40,17 @@ $(M374_TARGET): $(M374_O_FILES) $(M374_LIBS) @python3 tools/lcf.py rel 374 --output $(M374_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M374_LDFLAGS) -o $(M374_TARGET) @build/M374_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_toby/%.o: rel/d/a/npc/d_a_npc_toby/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_toby/%.o: rel/d/a/npc/d_a_npc_toby/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_toby/%.d @echo [374] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M374_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M374_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M374_D_FILES := $(M374_O_FILES:.o=.d) +$(M374_D_FILES): +include $(wildcard $(M374_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_tr/Makefile b/rel/d/a/npc/d_a_npc_tr/Makefile index 1f0543dcb7..4338e01cef 100644 --- a/rel/d/a/npc/d_a_npc_tr/Makefile +++ b/rel/d/a/npc/d_a_npc_tr/Makefile @@ -40,10 +40,17 @@ $(M375_TARGET): $(M375_O_FILES) $(M375_LIBS) @python3 tools/lcf.py rel 375 --output $(M375_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M375_LDFLAGS) -o $(M375_TARGET) @build/M375_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tr/%.o: rel/d/a/npc/d_a_npc_tr/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_tr/%.o: rel/d/a/npc/d_a_npc_tr/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_tr/%.d @echo [375] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M375_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M375_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M375_D_FILES := $(M375_O_FILES:.o=.d) +$(M375_D_FILES): +include $(wildcard $(M375_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_uri/Makefile b/rel/d/a/npc/d_a_npc_uri/Makefile index 64d4908f9d..bea2f34219 100644 --- a/rel/d/a/npc/d_a_npc_uri/Makefile +++ b/rel/d/a/npc/d_a_npc_uri/Makefile @@ -40,10 +40,17 @@ $(M376_TARGET): $(M376_O_FILES) $(M376_LIBS) @python3 tools/lcf.py rel 376 --output $(M376_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M376_LDFLAGS) -o $(M376_TARGET) @build/M376_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_uri/%.o: rel/d/a/npc/d_a_npc_uri/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_uri/%.o: rel/d/a/npc/d_a_npc_uri/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_uri/%.d @echo [376] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M376_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M376_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M376_D_FILES := $(M376_O_FILES:.o=.d) +$(M376_D_FILES): +include $(wildcard $(M376_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_worm/Makefile b/rel/d/a/npc/d_a_npc_worm/Makefile index 5b4d7392a6..8cb82a96db 100644 --- a/rel/d/a/npc/d_a_npc_worm/Makefile +++ b/rel/d/a/npc/d_a_npc_worm/Makefile @@ -38,10 +38,17 @@ $(M377_TARGET): $(M377_O_FILES) $(M377_LIBS) @python3 tools/lcf.py rel 377 --output $(M377_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M377_LDFLAGS) -o $(M377_TARGET) @build/M377_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_worm/%.o: rel/d/a/npc/d_a_npc_worm/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_worm/%.o: rel/d/a/npc/d_a_npc_worm/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_worm/%.d @echo [377] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M377_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M377_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M377_D_FILES := $(M377_O_FILES:.o=.d) +$(M377_D_FILES): +include $(wildcard $(M377_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_wrestler/Makefile b/rel/d/a/npc/d_a_npc_wrestler/Makefile index 42b505ef96..23be0bb40f 100644 --- a/rel/d/a/npc/d_a_npc_wrestler/Makefile +++ b/rel/d/a/npc/d_a_npc_wrestler/Makefile @@ -40,10 +40,17 @@ $(M378_TARGET): $(M378_O_FILES) $(M378_LIBS) @python3 tools/lcf.py rel 378 --output $(M378_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M378_LDFLAGS) -o $(M378_TARGET) @build/M378_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_wrestler/%.o: rel/d/a/npc/d_a_npc_wrestler/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_wrestler/%.o: rel/d/a/npc/d_a_npc_wrestler/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_wrestler/%.d @echo [378] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M378_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M378_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M378_D_FILES := $(M378_O_FILES:.o=.d) +$(M378_D_FILES): +include $(wildcard $(M378_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_yamid/Makefile b/rel/d/a/npc/d_a_npc_yamid/Makefile index 9a389460bd..0d08f5e3b0 100644 --- a/rel/d/a/npc/d_a_npc_yamid/Makefile +++ b/rel/d/a/npc/d_a_npc_yamid/Makefile @@ -40,10 +40,17 @@ $(M379_TARGET): $(M379_O_FILES) $(M379_LIBS) @python3 tools/lcf.py rel 379 --output $(M379_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M379_LDFLAGS) -o $(M379_TARGET) @build/M379_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_yamid/%.o: rel/d/a/npc/d_a_npc_yamid/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_yamid/%.o: rel/d/a/npc/d_a_npc_yamid/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_yamid/%.d @echo [379] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M379_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M379_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M379_D_FILES := $(M379_O_FILES:.o=.d) +$(M379_D_FILES): +include $(wildcard $(M379_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_yamis/Makefile b/rel/d/a/npc/d_a_npc_yamis/Makefile index 5045b57a4c..18ccaf7d15 100644 --- a/rel/d/a/npc/d_a_npc_yamis/Makefile +++ b/rel/d/a/npc/d_a_npc_yamis/Makefile @@ -40,10 +40,17 @@ $(M380_TARGET): $(M380_O_FILES) $(M380_LIBS) @python3 tools/lcf.py rel 380 --output $(M380_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M380_LDFLAGS) -o $(M380_TARGET) @build/M380_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_yamis/%.o: rel/d/a/npc/d_a_npc_yamis/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_yamis/%.o: rel/d/a/npc/d_a_npc_yamis/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_yamis/%.d @echo [380] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M380_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M380_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M380_D_FILES := $(M380_O_FILES:.o=.d) +$(M380_D_FILES): +include $(wildcard $(M380_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_yamit/Makefile b/rel/d/a/npc/d_a_npc_yamit/Makefile index 5d231931eb..f6404589ee 100644 --- a/rel/d/a/npc/d_a_npc_yamit/Makefile +++ b/rel/d/a/npc/d_a_npc_yamit/Makefile @@ -40,10 +40,17 @@ $(M381_TARGET): $(M381_O_FILES) $(M381_LIBS) @python3 tools/lcf.py rel 381 --output $(M381_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M381_LDFLAGS) -o $(M381_TARGET) @build/M381_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_yamit/%.o: rel/d/a/npc/d_a_npc_yamit/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_yamit/%.o: rel/d/a/npc/d_a_npc_yamit/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_yamit/%.d @echo [381] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M381_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M381_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M381_D_FILES := $(M381_O_FILES:.o=.d) +$(M381_D_FILES): +include $(wildcard $(M381_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_yelia/Makefile b/rel/d/a/npc/d_a_npc_yelia/Makefile index 153b452679..7334c36b49 100644 --- a/rel/d/a/npc/d_a_npc_yelia/Makefile +++ b/rel/d/a/npc/d_a_npc_yelia/Makefile @@ -40,10 +40,17 @@ $(M382_TARGET): $(M382_O_FILES) $(M382_LIBS) @python3 tools/lcf.py rel 382 --output $(M382_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M382_LDFLAGS) -o $(M382_TARGET) @build/M382_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_yelia/%.o: rel/d/a/npc/d_a_npc_yelia/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_yelia/%.o: rel/d/a/npc/d_a_npc_yelia/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_yelia/%.d @echo [382] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M382_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M382_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M382_D_FILES := $(M382_O_FILES:.o=.d) +$(M382_D_FILES): +include $(wildcard $(M382_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_ykm/Makefile b/rel/d/a/npc/d_a_npc_ykm/Makefile index d73749a4b6..dfecb51325 100644 --- a/rel/d/a/npc/d_a_npc_ykm/Makefile +++ b/rel/d/a/npc/d_a_npc_ykm/Makefile @@ -40,10 +40,17 @@ $(M383_TARGET): $(M383_O_FILES) $(M383_LIBS) @python3 tools/lcf.py rel 383 --output $(M383_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M383_LDFLAGS) -o $(M383_TARGET) @build/M383_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ykm/%.o: rel/d/a/npc/d_a_npc_ykm/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ykm/%.o: rel/d/a/npc/d_a_npc_ykm/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_ykm/%.d @echo [383] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M383_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M383_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M383_D_FILES := $(M383_O_FILES:.o=.d) +$(M383_D_FILES): +include $(wildcard $(M383_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_ykw/Makefile b/rel/d/a/npc/d_a_npc_ykw/Makefile index 206e002126..c74d0297db 100644 --- a/rel/d/a/npc/d_a_npc_ykw/Makefile +++ b/rel/d/a/npc/d_a_npc_ykw/Makefile @@ -40,10 +40,17 @@ $(M384_TARGET): $(M384_O_FILES) $(M384_LIBS) @python3 tools/lcf.py rel 384 --output $(M384_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M384_LDFLAGS) -o $(M384_TARGET) @build/M384_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ykw/%.o: rel/d/a/npc/d_a_npc_ykw/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_ykw/%.o: rel/d/a/npc/d_a_npc_ykw/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_ykw/%.d @echo [384] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M384_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M384_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M384_D_FILES := $(M384_O_FILES:.o=.d) +$(M384_D_FILES): +include $(wildcard $(M384_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_zanb/Makefile b/rel/d/a/npc/d_a_npc_zanb/Makefile index 7c0403a2ed..7d1830318b 100644 --- a/rel/d/a/npc/d_a_npc_zanb/Makefile +++ b/rel/d/a/npc/d_a_npc_zanb/Makefile @@ -40,10 +40,17 @@ $(M385_TARGET): $(M385_O_FILES) $(M385_LIBS) @python3 tools/lcf.py rel 385 --output $(M385_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M385_LDFLAGS) -o $(M385_TARGET) @build/M385_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zanb/%.o: rel/d/a/npc/d_a_npc_zanb/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zanb/%.o: rel/d/a/npc/d_a_npc_zanb/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_zanb/%.d @echo [385] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M385_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M385_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M385_D_FILES := $(M385_O_FILES:.o=.d) +$(M385_D_FILES): +include $(wildcard $(M385_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_zant/Makefile b/rel/d/a/npc/d_a_npc_zant/Makefile index cffb585531..3bc83143ed 100644 --- a/rel/d/a/npc/d_a_npc_zant/Makefile +++ b/rel/d/a/npc/d_a_npc_zant/Makefile @@ -40,10 +40,17 @@ $(M386_TARGET): $(M386_O_FILES) $(M386_LIBS) @python3 tools/lcf.py rel 386 --output $(M386_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M386_LDFLAGS) -o $(M386_TARGET) @build/M386_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zant/%.o: rel/d/a/npc/d_a_npc_zant/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zant/%.o: rel/d/a/npc/d_a_npc_zant/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_zant/%.d @echo [386] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M386_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M386_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M386_D_FILES := $(M386_O_FILES:.o=.d) +$(M386_D_FILES): +include $(wildcard $(M386_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_zelR/Makefile b/rel/d/a/npc/d_a_npc_zelR/Makefile index d766e238a0..3ab872c64f 100644 --- a/rel/d/a/npc/d_a_npc_zelR/Makefile +++ b/rel/d/a/npc/d_a_npc_zelR/Makefile @@ -40,10 +40,17 @@ $(M387_TARGET): $(M387_O_FILES) $(M387_LIBS) @python3 tools/lcf.py rel 387 --output $(M387_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M387_LDFLAGS) -o $(M387_TARGET) @build/M387_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zelR/%.o: rel/d/a/npc/d_a_npc_zelR/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zelR/%.o: rel/d/a/npc/d_a_npc_zelR/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_zelR/%.d @echo [387] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M387_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M387_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M387_D_FILES := $(M387_O_FILES:.o=.d) +$(M387_D_FILES): +include $(wildcard $(M387_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_zelRo/Makefile b/rel/d/a/npc/d_a_npc_zelRo/Makefile index 0f8d367b3d..ec34fb9649 100644 --- a/rel/d/a/npc/d_a_npc_zelRo/Makefile +++ b/rel/d/a/npc/d_a_npc_zelRo/Makefile @@ -40,10 +40,17 @@ $(M388_TARGET): $(M388_O_FILES) $(M388_LIBS) @python3 tools/lcf.py rel 388 --output $(M388_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M388_LDFLAGS) -o $(M388_TARGET) @build/M388_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zelRo/%.o: rel/d/a/npc/d_a_npc_zelRo/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zelRo/%.o: rel/d/a/npc/d_a_npc_zelRo/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_zelRo/%.d @echo [388] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M388_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M388_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M388_D_FILES := $(M388_O_FILES:.o=.d) +$(M388_D_FILES): +include $(wildcard $(M388_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_zelda/Makefile b/rel/d/a/npc/d_a_npc_zelda/Makefile index 24ff93f24c..7d746c7006 100644 --- a/rel/d/a/npc/d_a_npc_zelda/Makefile +++ b/rel/d/a/npc/d_a_npc_zelda/Makefile @@ -40,10 +40,17 @@ $(M389_TARGET): $(M389_O_FILES) $(M389_LIBS) @python3 tools/lcf.py rel 389 --output $(M389_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M389_LDFLAGS) -o $(M389_TARGET) @build/M389_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zelda/%.o: rel/d/a/npc/d_a_npc_zelda/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zelda/%.o: rel/d/a/npc/d_a_npc_zelda/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_zelda/%.d @echo [389] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M389_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M389_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M389_D_FILES := $(M389_O_FILES:.o=.d) +$(M389_D_FILES): +include $(wildcard $(M389_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_zra/Makefile b/rel/d/a/npc/d_a_npc_zra/Makefile index 1878f5bae9..9102293dbf 100644 --- a/rel/d/a/npc/d_a_npc_zra/Makefile +++ b/rel/d/a/npc/d_a_npc_zra/Makefile @@ -40,10 +40,17 @@ $(M390_TARGET): $(M390_O_FILES) $(M390_LIBS) @python3 tools/lcf.py rel 390 --output $(M390_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M390_LDFLAGS) -o $(M390_TARGET) @build/M390_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zra/%.o: rel/d/a/npc/d_a_npc_zra/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zra/%.o: rel/d/a/npc/d_a_npc_zra/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_zra/%.d @echo [390] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M390_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M390_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M390_D_FILES := $(M390_O_FILES:.o=.d) +$(M390_D_FILES): +include $(wildcard $(M390_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_zrc/Makefile b/rel/d/a/npc/d_a_npc_zrc/Makefile index 56bcf2c454..c3fcfc117e 100644 --- a/rel/d/a/npc/d_a_npc_zrc/Makefile +++ b/rel/d/a/npc/d_a_npc_zrc/Makefile @@ -40,10 +40,17 @@ $(M391_TARGET): $(M391_O_FILES) $(M391_LIBS) @python3 tools/lcf.py rel 391 --output $(M391_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M391_LDFLAGS) -o $(M391_TARGET) @build/M391_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zrc/%.o: rel/d/a/npc/d_a_npc_zrc/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zrc/%.o: rel/d/a/npc/d_a_npc_zrc/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_zrc/%.d @echo [391] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M391_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M391_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M391_D_FILES := $(M391_O_FILES:.o=.d) +$(M391_D_FILES): +include $(wildcard $(M391_D_FILES)) +endif diff --git a/rel/d/a/npc/d_a_npc_zrz/Makefile b/rel/d/a/npc/d_a_npc_zrz/Makefile index de6a81eb3c..f558669361 100644 --- a/rel/d/a/npc/d_a_npc_zrz/Makefile +++ b/rel/d/a/npc/d_a_npc_zrz/Makefile @@ -40,10 +40,17 @@ $(M392_TARGET): $(M392_O_FILES) $(M392_LIBS) @python3 tools/lcf.py rel 392 --output $(M392_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M392_LDFLAGS) -o $(M392_TARGET) @build/M392_ofiles -$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zrz/%.o: rel/d/a/npc/d_a_npc_zrz/%.cpp +$(BUILD_DIR)/rel/d/a/npc/d_a_npc_zrz/%.o: rel/d/a/npc/d_a_npc_zrz/%.cpp $(BUILD_DIR)/rel/d/a/npc/d_a_npc_zrz/%.d @echo [392] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M392_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M392_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M392_D_FILES := $(M392_O_FILES:.o=.d) +$(M392_D_FILES): +include $(wildcard $(M392_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/Makefile b/rel/d/a/obj/d_a_obj_Lv5Key/Makefile index 61bcbbae2e..e3985ed178 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/Makefile +++ b/rel/d/a/obj/d_a_obj_Lv5Key/Makefile @@ -38,10 +38,17 @@ $(M393_TARGET): $(M393_O_FILES) $(M393_LIBS) @python3 tools/lcf.py rel 393 --output $(M393_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M393_LDFLAGS) -o $(M393_TARGET) @build/M393_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_Lv5Key/%.o: rel/d/a/obj/d_a_obj_Lv5Key/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_Lv5Key/%.o: rel/d/a/obj/d_a_obj_Lv5Key/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_Lv5Key/%.d @echo [393] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M393_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M393_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M393_D_FILES := $(M393_O_FILES:.o=.d) +$(M393_D_FILES): +include $(wildcard $(M393_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_Turara/Makefile b/rel/d/a/obj/d_a_obj_Turara/Makefile index 1e1830a44d..66df571da3 100644 --- a/rel/d/a/obj/d_a_obj_Turara/Makefile +++ b/rel/d/a/obj/d_a_obj_Turara/Makefile @@ -40,10 +40,17 @@ $(M394_TARGET): $(M394_O_FILES) $(M394_LIBS) @python3 tools/lcf.py rel 394 --output $(M394_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M394_LDFLAGS) -o $(M394_TARGET) @build/M394_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_Turara/%.o: rel/d/a/obj/d_a_obj_Turara/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_Turara/%.o: rel/d/a/obj/d_a_obj_Turara/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_Turara/%.d @echo [394] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M394_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M394_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M394_D_FILES := $(M394_O_FILES:.o=.d) +$(M394_D_FILES): +include $(wildcard $(M394_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_TvCdlst/Makefile b/rel/d/a/obj/d_a_obj_TvCdlst/Makefile index 19ae47dd6c..1b1c386b16 100644 --- a/rel/d/a/obj/d_a_obj_TvCdlst/Makefile +++ b/rel/d/a/obj/d_a_obj_TvCdlst/Makefile @@ -40,10 +40,17 @@ $(M395_TARGET): $(M395_O_FILES) $(M395_LIBS) @python3 tools/lcf.py rel 395 --output $(M395_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M395_LDFLAGS) -o $(M395_TARGET) @build/M395_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_TvCdlst/%.o: rel/d/a/obj/d_a_obj_TvCdlst/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_TvCdlst/%.o: rel/d/a/obj/d_a_obj_TvCdlst/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_TvCdlst/%.d @echo [395] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M395_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M395_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M395_D_FILES := $(M395_O_FILES:.o=.d) +$(M395_D_FILES): +include $(wildcard $(M395_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_Y_taihou/Makefile b/rel/d/a/obj/d_a_obj_Y_taihou/Makefile index 0d6cd63657..d0ee5c1efc 100644 --- a/rel/d/a/obj/d_a_obj_Y_taihou/Makefile +++ b/rel/d/a/obj/d_a_obj_Y_taihou/Makefile @@ -40,10 +40,17 @@ $(M396_TARGET): $(M396_O_FILES) $(M396_LIBS) @python3 tools/lcf.py rel 396 --output $(M396_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M396_LDFLAGS) -o $(M396_TARGET) @build/M396_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_Y_taihou/%.o: rel/d/a/obj/d_a_obj_Y_taihou/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_Y_taihou/%.o: rel/d/a/obj/d_a_obj_Y_taihou/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_Y_taihou/%.d @echo [396] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M396_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M396_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M396_D_FILES := $(M396_O_FILES:.o=.d) +$(M396_D_FILES): +include $(wildcard $(M396_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_amiShutter/Makefile b/rel/d/a/obj/d_a_obj_amiShutter/Makefile index 1bef70308a..e43f53dd24 100644 --- a/rel/d/a/obj/d_a_obj_amiShutter/Makefile +++ b/rel/d/a/obj/d_a_obj_amiShutter/Makefile @@ -40,10 +40,17 @@ $(M397_TARGET): $(M397_O_FILES) $(M397_LIBS) @python3 tools/lcf.py rel 397 --output $(M397_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M397_LDFLAGS) -o $(M397_TARGET) @build/M397_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_amiShutter/%.o: rel/d/a/obj/d_a_obj_amiShutter/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_amiShutter/%.o: rel/d/a/obj/d_a_obj_amiShutter/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_amiShutter/%.d @echo [397] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M397_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M397_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M397_D_FILES := $(M397_O_FILES:.o=.d) +$(M397_D_FILES): +include $(wildcard $(M397_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ari/Makefile b/rel/d/a/obj/d_a_obj_ari/Makefile index d7a50b66f5..61fe7d2148 100644 --- a/rel/d/a/obj/d_a_obj_ari/Makefile +++ b/rel/d/a/obj/d_a_obj_ari/Makefile @@ -40,10 +40,17 @@ $(M398_TARGET): $(M398_O_FILES) $(M398_LIBS) @python3 tools/lcf.py rel 398 --output $(M398_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M398_LDFLAGS) -o $(M398_TARGET) @build/M398_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ari/%.o: rel/d/a/obj/d_a_obj_ari/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ari/%.o: rel/d/a/obj/d_a_obj_ari/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ari/%.d @echo [398] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M398_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M398_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M398_D_FILES := $(M398_O_FILES:.o=.d) +$(M398_D_FILES): +include $(wildcard $(M398_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_automata/Makefile b/rel/d/a/obj/d_a_obj_automata/Makefile index 498c8b29af..3af9454742 100644 --- a/rel/d/a/obj/d_a_obj_automata/Makefile +++ b/rel/d/a/obj/d_a_obj_automata/Makefile @@ -40,10 +40,17 @@ $(M399_TARGET): $(M399_O_FILES) $(M399_LIBS) @python3 tools/lcf.py rel 399 --output $(M399_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M399_LDFLAGS) -o $(M399_TARGET) @build/M399_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_automata/%.o: rel/d/a/obj/d_a_obj_automata/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_automata/%.o: rel/d/a/obj/d_a_obj_automata/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_automata/%.d @echo [399] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M399_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M399_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M399_D_FILES := $(M399_O_FILES:.o=.d) +$(M399_D_FILES): +include $(wildcard $(M399_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_avalanche/Makefile b/rel/d/a/obj/d_a_obj_avalanche/Makefile index dc29321961..fac5979703 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/Makefile +++ b/rel/d/a/obj/d_a_obj_avalanche/Makefile @@ -40,10 +40,17 @@ $(M400_TARGET): $(M400_O_FILES) $(M400_LIBS) @python3 tools/lcf.py rel 400 --output $(M400_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M400_LDFLAGS) -o $(M400_TARGET) @build/M400_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_avalanche/%.o: rel/d/a/obj/d_a_obj_avalanche/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_avalanche/%.o: rel/d/a/obj/d_a_obj_avalanche/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_avalanche/%.d @echo [400] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M400_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M400_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M400_D_FILES := $(M400_O_FILES:.o=.d) +$(M400_D_FILES): +include $(wildcard $(M400_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_balloon/Makefile b/rel/d/a/obj/d_a_obj_balloon/Makefile index 6c46039e0d..ac8f2ca648 100644 --- a/rel/d/a/obj/d_a_obj_balloon/Makefile +++ b/rel/d/a/obj/d_a_obj_balloon/Makefile @@ -40,10 +40,17 @@ $(M401_TARGET): $(M401_O_FILES) $(M401_LIBS) @python3 tools/lcf.py rel 401 --output $(M401_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M401_LDFLAGS) -o $(M401_TARGET) @build/M401_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_balloon/%.o: rel/d/a/obj/d_a_obj_balloon/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_balloon/%.o: rel/d/a/obj/d_a_obj_balloon/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_balloon/%.d @echo [401] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M401_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M401_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M401_D_FILES := $(M401_O_FILES:.o=.d) +$(M401_D_FILES): +include $(wildcard $(M401_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_barDesk/Makefile b/rel/d/a/obj/d_a_obj_barDesk/Makefile index 86699c2d5e..c5f758ebca 100644 --- a/rel/d/a/obj/d_a_obj_barDesk/Makefile +++ b/rel/d/a/obj/d_a_obj_barDesk/Makefile @@ -40,10 +40,17 @@ $(M402_TARGET): $(M402_O_FILES) $(M402_LIBS) @python3 tools/lcf.py rel 402 --output $(M402_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M402_LDFLAGS) -o $(M402_TARGET) @build/M402_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_barDesk/%.o: rel/d/a/obj/d_a_obj_barDesk/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_barDesk/%.o: rel/d/a/obj/d_a_obj_barDesk/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_barDesk/%.d @echo [402] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M402_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M402_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M402_D_FILES := $(M402_O_FILES:.o=.d) +$(M402_D_FILES): +include $(wildcard $(M402_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_batta/Makefile b/rel/d/a/obj/d_a_obj_batta/Makefile index 450a7e201a..e465e79a41 100644 --- a/rel/d/a/obj/d_a_obj_batta/Makefile +++ b/rel/d/a/obj/d_a_obj_batta/Makefile @@ -40,10 +40,17 @@ $(M403_TARGET): $(M403_O_FILES) $(M403_LIBS) @python3 tools/lcf.py rel 403 --output $(M403_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M403_LDFLAGS) -o $(M403_TARGET) @build/M403_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_batta/%.o: rel/d/a/obj/d_a_obj_batta/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_batta/%.o: rel/d/a/obj/d_a_obj_batta/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_batta/%.d @echo [403] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M403_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M403_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M403_D_FILES := $(M403_O_FILES:.o=.d) +$(M403_D_FILES): +include $(wildcard $(M403_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bbox/Makefile b/rel/d/a/obj/d_a_obj_bbox/Makefile index d25b29fe73..af4a75f0b5 100644 --- a/rel/d/a/obj/d_a_obj_bbox/Makefile +++ b/rel/d/a/obj/d_a_obj_bbox/Makefile @@ -38,10 +38,17 @@ $(M404_TARGET): $(M404_O_FILES) $(M404_LIBS) @python3 tools/lcf.py rel 404 --output $(M404_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M404_LDFLAGS) -o $(M404_TARGET) @build/M404_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bbox/%.o: rel/d/a/obj/d_a_obj_bbox/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bbox/%.o: rel/d/a/obj/d_a_obj_bbox/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bbox/%.d @echo [404] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M404_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M404_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M404_D_FILES := $(M404_O_FILES:.o=.d) +$(M404_D_FILES): +include $(wildcard $(M404_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bed/Makefile b/rel/d/a/obj/d_a_obj_bed/Makefile index 9fdc68cb97..914d020ddb 100644 --- a/rel/d/a/obj/d_a_obj_bed/Makefile +++ b/rel/d/a/obj/d_a_obj_bed/Makefile @@ -40,10 +40,17 @@ $(M405_TARGET): $(M405_O_FILES) $(M405_LIBS) @python3 tools/lcf.py rel 405 --output $(M405_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M405_LDFLAGS) -o $(M405_TARGET) @build/M405_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bed/%.o: rel/d/a/obj/d_a_obj_bed/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bed/%.o: rel/d/a/obj/d_a_obj_bed/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bed/%.d @echo [405] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M405_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M405_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M405_D_FILES := $(M405_O_FILES:.o=.d) +$(M405_D_FILES): +include $(wildcard $(M405_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bemos/Makefile b/rel/d/a/obj/d_a_obj_bemos/Makefile index 1c9770ec61..de6259fab8 100644 --- a/rel/d/a/obj/d_a_obj_bemos/Makefile +++ b/rel/d/a/obj/d_a_obj_bemos/Makefile @@ -40,10 +40,17 @@ $(M406_TARGET): $(M406_O_FILES) $(M406_LIBS) @python3 tools/lcf.py rel 406 --output $(M406_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M406_LDFLAGS) -o $(M406_TARGET) @build/M406_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bemos/%.o: rel/d/a/obj/d_a_obj_bemos/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bemos/%.o: rel/d/a/obj/d_a_obj_bemos/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bemos/%.d @echo [406] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M406_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M406_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M406_D_FILES := $(M406_O_FILES:.o=.d) +$(M406_D_FILES): +include $(wildcard $(M406_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bhashi/Makefile b/rel/d/a/obj/d_a_obj_bhashi/Makefile index b4061e8269..afa7d215ff 100644 --- a/rel/d/a/obj/d_a_obj_bhashi/Makefile +++ b/rel/d/a/obj/d_a_obj_bhashi/Makefile @@ -38,10 +38,17 @@ $(M89_TARGET): $(M89_O_FILES) $(M89_LIBS) @python3 tools/lcf.py rel 89 --output $(M89_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M89_LDFLAGS) -o $(M89_TARGET) @build/M89_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bhashi/%.o: rel/d/a/obj/d_a_obj_bhashi/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bhashi/%.o: rel/d/a/obj/d_a_obj_bhashi/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bhashi/%.d @echo [ 89] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M89_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M89_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M89_D_FILES := $(M89_O_FILES:.o=.d) +$(M89_D_FILES): +include $(wildcard $(M89_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bhbridge/Makefile b/rel/d/a/obj/d_a_obj_bhbridge/Makefile index bed9ede5b7..0199216c5f 100644 --- a/rel/d/a/obj/d_a_obj_bhbridge/Makefile +++ b/rel/d/a/obj/d_a_obj_bhbridge/Makefile @@ -38,10 +38,17 @@ $(M407_TARGET): $(M407_O_FILES) $(M407_LIBS) @python3 tools/lcf.py rel 407 --output $(M407_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M407_LDFLAGS) -o $(M407_TARGET) @build/M407_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bhbridge/%.o: rel/d/a/obj/d_a_obj_bhbridge/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bhbridge/%.o: rel/d/a/obj/d_a_obj_bhbridge/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bhbridge/%.d @echo [407] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M407_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M407_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M407_D_FILES := $(M407_O_FILES:.o=.d) +$(M407_D_FILES): +include $(wildcard $(M407_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bk_leaf/Makefile b/rel/d/a/obj/d_a_obj_bk_leaf/Makefile index ee66dfddb3..bc44009649 100644 --- a/rel/d/a/obj/d_a_obj_bk_leaf/Makefile +++ b/rel/d/a/obj/d_a_obj_bk_leaf/Makefile @@ -38,10 +38,17 @@ $(M408_TARGET): $(M408_O_FILES) $(M408_LIBS) @python3 tools/lcf.py rel 408 --output $(M408_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M408_LDFLAGS) -o $(M408_TARGET) @build/M408_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bk_leaf/%.o: rel/d/a/obj/d_a_obj_bk_leaf/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bk_leaf/%.o: rel/d/a/obj/d_a_obj_bk_leaf/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bk_leaf/%.d @echo [408] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M408_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M408_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M408_D_FILES := $(M408_O_FILES:.o=.d) +$(M408_D_FILES): +include $(wildcard $(M408_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bkdoor/Makefile b/rel/d/a/obj/d_a_obj_bkdoor/Makefile index e3e31bfadb..af59aebdf6 100644 --- a/rel/d/a/obj/d_a_obj_bkdoor/Makefile +++ b/rel/d/a/obj/d_a_obj_bkdoor/Makefile @@ -38,10 +38,17 @@ $(M90_TARGET): $(M90_O_FILES) $(M90_LIBS) @python3 tools/lcf.py rel 90 --output $(M90_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M90_LDFLAGS) -o $(M90_TARGET) @build/M90_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bkdoor/%.o: rel/d/a/obj/d_a_obj_bkdoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bkdoor/%.o: rel/d/a/obj/d_a_obj_bkdoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bkdoor/%.d @echo [ 90] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M90_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M90_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M90_D_FILES := $(M90_O_FILES:.o=.d) +$(M90_D_FILES): +include $(wildcard $(M90_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bky_rock/Makefile b/rel/d/a/obj/d_a_obj_bky_rock/Makefile index 947e7b6a3d..64a8b51781 100644 --- a/rel/d/a/obj/d_a_obj_bky_rock/Makefile +++ b/rel/d/a/obj/d_a_obj_bky_rock/Makefile @@ -38,10 +38,17 @@ $(M409_TARGET): $(M409_O_FILES) $(M409_LIBS) @python3 tools/lcf.py rel 409 --output $(M409_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M409_LDFLAGS) -o $(M409_TARGET) @build/M409_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bky_rock/%.o: rel/d/a/obj/d_a_obj_bky_rock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bky_rock/%.o: rel/d/a/obj/d_a_obj_bky_rock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bky_rock/%.d @echo [409] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M409_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M409_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M409_D_FILES := $(M409_O_FILES:.o=.d) +$(M409_D_FILES): +include $(wildcard $(M409_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bmWindow/Makefile b/rel/d/a/obj/d_a_obj_bmWindow/Makefile index 8acf507be2..dbcda7134d 100644 --- a/rel/d/a/obj/d_a_obj_bmWindow/Makefile +++ b/rel/d/a/obj/d_a_obj_bmWindow/Makefile @@ -40,10 +40,17 @@ $(M410_TARGET): $(M410_O_FILES) $(M410_LIBS) @python3 tools/lcf.py rel 410 --output $(M410_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M410_LDFLAGS) -o $(M410_TARGET) @build/M410_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bmWindow/%.o: rel/d/a/obj/d_a_obj_bmWindow/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bmWindow/%.o: rel/d/a/obj/d_a_obj_bmWindow/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bmWindow/%.d @echo [410] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M410_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M410_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M410_D_FILES := $(M410_O_FILES:.o=.d) +$(M410_D_FILES): +include $(wildcard $(M410_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bmshutter/Makefile b/rel/d/a/obj/d_a_obj_bmshutter/Makefile index fc66ab17a1..90b8f1993b 100644 --- a/rel/d/a/obj/d_a_obj_bmshutter/Makefile +++ b/rel/d/a/obj/d_a_obj_bmshutter/Makefile @@ -40,10 +40,17 @@ $(M411_TARGET): $(M411_O_FILES) $(M411_LIBS) @python3 tools/lcf.py rel 411 --output $(M411_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M411_LDFLAGS) -o $(M411_TARGET) @build/M411_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bmshutter/%.o: rel/d/a/obj/d_a_obj_bmshutter/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bmshutter/%.o: rel/d/a/obj/d_a_obj_bmshutter/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bmshutter/%.d @echo [411] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M411_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M411_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M411_D_FILES := $(M411_O_FILES:.o=.d) +$(M411_D_FILES): +include $(wildcard $(M411_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bombf/Makefile b/rel/d/a/obj/d_a_obj_bombf/Makefile index 5296e0f885..d2be1012d0 100644 --- a/rel/d/a/obj/d_a_obj_bombf/Makefile +++ b/rel/d/a/obj/d_a_obj_bombf/Makefile @@ -38,10 +38,17 @@ $(M412_TARGET): $(M412_O_FILES) $(M412_LIBS) @python3 tools/lcf.py rel 412 --output $(M412_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M412_LDFLAGS) -o $(M412_TARGET) @build/M412_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bombf/%.o: rel/d/a/obj/d_a_obj_bombf/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bombf/%.o: rel/d/a/obj/d_a_obj_bombf/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bombf/%.d @echo [412] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M412_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M412_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M412_D_FILES := $(M412_O_FILES:.o=.d) +$(M412_D_FILES): +include $(wildcard $(M412_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bosswarp/Makefile b/rel/d/a/obj/d_a_obj_bosswarp/Makefile index e52942e221..d587c88c93 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/Makefile +++ b/rel/d/a/obj/d_a_obj_bosswarp/Makefile @@ -40,10 +40,17 @@ $(M91_TARGET): $(M91_O_FILES) $(M91_LIBS) @python3 tools/lcf.py rel 91 --output $(M91_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M91_LDFLAGS) -o $(M91_TARGET) @build/M91_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bosswarp/%.o: rel/d/a/obj/d_a_obj_bosswarp/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bosswarp/%.o: rel/d/a/obj/d_a_obj_bosswarp/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bosswarp/%.d @echo [ 91] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M91_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M91_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M91_D_FILES := $(M91_O_FILES:.o=.d) +$(M91_D_FILES): +include $(wildcard $(M91_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_boumato/Makefile b/rel/d/a/obj/d_a_obj_boumato/Makefile index 5642af07b3..530dc17c6b 100644 --- a/rel/d/a/obj/d_a_obj_boumato/Makefile +++ b/rel/d/a/obj/d_a_obj_boumato/Makefile @@ -40,10 +40,17 @@ $(M413_TARGET): $(M413_O_FILES) $(M413_LIBS) @python3 tools/lcf.py rel 413 --output $(M413_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M413_LDFLAGS) -o $(M413_TARGET) @build/M413_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_boumato/%.o: rel/d/a/obj/d_a_obj_boumato/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_boumato/%.o: rel/d/a/obj/d_a_obj_boumato/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_boumato/%.d @echo [413] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M413_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M413_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M413_D_FILES := $(M413_O_FILES:.o=.d) +$(M413_D_FILES): +include $(wildcard $(M413_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_brakeeff/Makefile b/rel/d/a/obj/d_a_obj_brakeeff/Makefile index b3f979729f..b38a174e88 100644 --- a/rel/d/a/obj/d_a_obj_brakeeff/Makefile +++ b/rel/d/a/obj/d_a_obj_brakeeff/Makefile @@ -38,10 +38,17 @@ $(M16_TARGET): $(M16_O_FILES) $(M16_LIBS) @python3 tools/lcf.py rel 16 --output $(M16_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M16_LDFLAGS) -o $(M16_TARGET) @build/M16_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_brakeeff/%.o: rel/d/a/obj/d_a_obj_brakeeff/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_brakeeff/%.o: rel/d/a/obj/d_a_obj_brakeeff/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_brakeeff/%.d @echo [ 16] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M16_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M16_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M16_D_FILES := $(M16_O_FILES:.o=.d) +$(M16_D_FILES): +include $(wildcard $(M16_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_brg/Makefile b/rel/d/a/obj/d_a_obj_brg/Makefile index 65468c8748..1bc2ef782e 100644 --- a/rel/d/a/obj/d_a_obj_brg/Makefile +++ b/rel/d/a/obj/d_a_obj_brg/Makefile @@ -40,10 +40,17 @@ $(M414_TARGET): $(M414_O_FILES) $(M414_LIBS) @python3 tools/lcf.py rel 414 --output $(M414_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M414_LDFLAGS) -o $(M414_TARGET) @build/M414_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_brg/%.o: rel/d/a/obj/d_a_obj_brg/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_brg/%.o: rel/d/a/obj/d_a_obj_brg/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_brg/%.d @echo [414] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M414_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M414_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M414_D_FILES := $(M414_O_FILES:.o=.d) +$(M414_D_FILES): +include $(wildcard $(M414_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bsGate/Makefile b/rel/d/a/obj/d_a_obj_bsGate/Makefile index add4054c52..d29ecf6f79 100644 --- a/rel/d/a/obj/d_a_obj_bsGate/Makefile +++ b/rel/d/a/obj/d_a_obj_bsGate/Makefile @@ -40,10 +40,17 @@ $(M415_TARGET): $(M415_O_FILES) $(M415_LIBS) @python3 tools/lcf.py rel 415 --output $(M415_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M415_LDFLAGS) -o $(M415_TARGET) @build/M415_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bsGate/%.o: rel/d/a/obj/d_a_obj_bsGate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bsGate/%.o: rel/d/a/obj/d_a_obj_bsGate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bsGate/%.d @echo [415] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M415_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M415_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M415_D_FILES := $(M415_O_FILES:.o=.d) +$(M415_D_FILES): +include $(wildcard $(M415_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_bubblePilar/Makefile b/rel/d/a/obj/d_a_obj_bubblePilar/Makefile index 09e991b3f2..f600095e65 100644 --- a/rel/d/a/obj/d_a_obj_bubblePilar/Makefile +++ b/rel/d/a/obj/d_a_obj_bubblePilar/Makefile @@ -40,10 +40,17 @@ $(M416_TARGET): $(M416_O_FILES) $(M416_LIBS) @python3 tools/lcf.py rel 416 --output $(M416_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M416_LDFLAGS) -o $(M416_TARGET) @build/M416_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bubblePilar/%.o: rel/d/a/obj/d_a_obj_bubblePilar/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_bubblePilar/%.o: rel/d/a/obj/d_a_obj_bubblePilar/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_bubblePilar/%.d @echo [416] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M416_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M416_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M416_D_FILES := $(M416_O_FILES:.o=.d) +$(M416_D_FILES): +include $(wildcard $(M416_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_burnbox/Makefile b/rel/d/a/obj/d_a_obj_burnbox/Makefile index 291d10548e..c720cc2108 100644 --- a/rel/d/a/obj/d_a_obj_burnbox/Makefile +++ b/rel/d/a/obj/d_a_obj_burnbox/Makefile @@ -38,10 +38,17 @@ $(M17_TARGET): $(M17_O_FILES) $(M17_LIBS) @python3 tools/lcf.py rel 17 --output $(M17_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M17_LDFLAGS) -o $(M17_TARGET) @build/M17_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_burnbox/%.o: rel/d/a/obj/d_a_obj_burnbox/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_burnbox/%.o: rel/d/a/obj/d_a_obj_burnbox/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_burnbox/%.d @echo [ 17] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M17_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M17_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M17_D_FILES := $(M17_O_FILES:.o=.d) +$(M17_D_FILES): +include $(wildcard $(M17_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_carry/Makefile b/rel/d/a/obj/d_a_obj_carry/Makefile index 262e897771..083ab704c4 100644 --- a/rel/d/a/obj/d_a_obj_carry/Makefile +++ b/rel/d/a/obj/d_a_obj_carry/Makefile @@ -38,10 +38,17 @@ $(M18_TARGET): $(M18_O_FILES) $(M18_LIBS) @python3 tools/lcf.py rel 18 --output $(M18_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M18_LDFLAGS) -o $(M18_TARGET) @build/M18_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_carry/%.o: rel/d/a/obj/d_a_obj_carry/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_carry/%.o: rel/d/a/obj/d_a_obj_carry/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_carry/%.d @echo [ 18] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M18_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M18_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M18_D_FILES := $(M18_O_FILES:.o=.d) +$(M18_D_FILES): +include $(wildcard $(M18_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_catdoor/Makefile b/rel/d/a/obj/d_a_obj_catdoor/Makefile index 66bc29ac40..79cf7750f2 100644 --- a/rel/d/a/obj/d_a_obj_catdoor/Makefile +++ b/rel/d/a/obj/d_a_obj_catdoor/Makefile @@ -38,10 +38,17 @@ $(M417_TARGET): $(M417_O_FILES) $(M417_LIBS) @python3 tools/lcf.py rel 417 --output $(M417_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M417_LDFLAGS) -o $(M417_TARGET) @build/M417_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_catdoor/%.o: rel/d/a/obj/d_a_obj_catdoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_catdoor/%.o: rel/d/a/obj/d_a_obj_catdoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_catdoor/%.d @echo [417] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M417_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M417_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M417_D_FILES := $(M417_O_FILES:.o=.d) +$(M417_D_FILES): +include $(wildcard $(M417_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_cb/Makefile b/rel/d/a/obj/d_a_obj_cb/Makefile index 90c1c3a2a9..c5a52577e1 100644 --- a/rel/d/a/obj/d_a_obj_cb/Makefile +++ b/rel/d/a/obj/d_a_obj_cb/Makefile @@ -40,10 +40,17 @@ $(M418_TARGET): $(M418_O_FILES) $(M418_LIBS) @python3 tools/lcf.py rel 418 --output $(M418_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M418_LDFLAGS) -o $(M418_TARGET) @build/M418_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cb/%.o: rel/d/a/obj/d_a_obj_cb/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cb/%.o: rel/d/a/obj/d_a_obj_cb/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_cb/%.d @echo [418] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M418_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M418_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M418_D_FILES := $(M418_O_FILES:.o=.d) +$(M418_D_FILES): +include $(wildcard $(M418_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_cblock/Makefile b/rel/d/a/obj/d_a_obj_cblock/Makefile index c7027d70a9..478325bc9f 100644 --- a/rel/d/a/obj/d_a_obj_cblock/Makefile +++ b/rel/d/a/obj/d_a_obj_cblock/Makefile @@ -40,10 +40,17 @@ $(M419_TARGET): $(M419_O_FILES) $(M419_LIBS) @python3 tools/lcf.py rel 419 --output $(M419_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M419_LDFLAGS) -o $(M419_TARGET) @build/M419_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cblock/%.o: rel/d/a/obj/d_a_obj_cblock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cblock/%.o: rel/d/a/obj/d_a_obj_cblock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_cblock/%.d @echo [419] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M419_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M419_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M419_D_FILES := $(M419_O_FILES:.o=.d) +$(M419_D_FILES): +include $(wildcard $(M419_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_cboard/Makefile b/rel/d/a/obj/d_a_obj_cboard/Makefile index ddfc7ef0f1..aa1481fa6a 100644 --- a/rel/d/a/obj/d_a_obj_cboard/Makefile +++ b/rel/d/a/obj/d_a_obj_cboard/Makefile @@ -38,10 +38,17 @@ $(M92_TARGET): $(M92_O_FILES) $(M92_LIBS) @python3 tools/lcf.py rel 92 --output $(M92_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M92_LDFLAGS) -o $(M92_TARGET) @build/M92_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cboard/%.o: rel/d/a/obj/d_a_obj_cboard/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cboard/%.o: rel/d/a/obj/d_a_obj_cboard/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_cboard/%.d @echo [ 92] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M92_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M92_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M92_D_FILES := $(M92_O_FILES:.o=.d) +$(M92_D_FILES): +include $(wildcard $(M92_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_cdoor/Makefile b/rel/d/a/obj/d_a_obj_cdoor/Makefile index 76f86b39a3..ad2fdd486d 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/Makefile +++ b/rel/d/a/obj/d_a_obj_cdoor/Makefile @@ -40,10 +40,17 @@ $(M420_TARGET): $(M420_O_FILES) $(M420_LIBS) @python3 tools/lcf.py rel 420 --output $(M420_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M420_LDFLAGS) -o $(M420_TARGET) @build/M420_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cdoor/%.o: rel/d/a/obj/d_a_obj_cdoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cdoor/%.o: rel/d/a/obj/d_a_obj_cdoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_cdoor/%.d @echo [420] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M420_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M420_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M420_D_FILES := $(M420_O_FILES:.o=.d) +$(M420_D_FILES): +include $(wildcard $(M420_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_chandelier/Makefile b/rel/d/a/obj/d_a_obj_chandelier/Makefile index 8073a1151e..b675b96c61 100644 --- a/rel/d/a/obj/d_a_obj_chandelier/Makefile +++ b/rel/d/a/obj/d_a_obj_chandelier/Makefile @@ -38,10 +38,17 @@ $(M421_TARGET): $(M421_O_FILES) $(M421_LIBS) @python3 tools/lcf.py rel 421 --output $(M421_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M421_LDFLAGS) -o $(M421_TARGET) @build/M421_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_chandelier/%.o: rel/d/a/obj/d_a_obj_chandelier/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_chandelier/%.o: rel/d/a/obj/d_a_obj_chandelier/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_chandelier/%.d @echo [421] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M421_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M421_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M421_D_FILES := $(M421_O_FILES:.o=.d) +$(M421_D_FILES): +include $(wildcard $(M421_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_chest/Makefile b/rel/d/a/obj/d_a_obj_chest/Makefile index 34c060f0fc..5f90b81588 100644 --- a/rel/d/a/obj/d_a_obj_chest/Makefile +++ b/rel/d/a/obj/d_a_obj_chest/Makefile @@ -40,10 +40,17 @@ $(M422_TARGET): $(M422_O_FILES) $(M422_LIBS) @python3 tools/lcf.py rel 422 --output $(M422_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M422_LDFLAGS) -o $(M422_TARGET) @build/M422_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_chest/%.o: rel/d/a/obj/d_a_obj_chest/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_chest/%.o: rel/d/a/obj/d_a_obj_chest/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_chest/%.d @echo [422] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M422_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M422_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M422_D_FILES := $(M422_O_FILES:.o=.d) +$(M422_D_FILES): +include $(wildcard $(M422_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_cho/Makefile b/rel/d/a/obj/d_a_obj_cho/Makefile index b542196939..1a33daf496 100644 --- a/rel/d/a/obj/d_a_obj_cho/Makefile +++ b/rel/d/a/obj/d_a_obj_cho/Makefile @@ -40,10 +40,17 @@ $(M423_TARGET): $(M423_O_FILES) $(M423_LIBS) @python3 tools/lcf.py rel 423 --output $(M423_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M423_LDFLAGS) -o $(M423_TARGET) @build/M423_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cho/%.o: rel/d/a/obj/d_a_obj_cho/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cho/%.o: rel/d/a/obj/d_a_obj_cho/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_cho/%.d @echo [423] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M423_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M423_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M423_D_FILES := $(M423_O_FILES:.o=.d) +$(M423_D_FILES): +include $(wildcard $(M423_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_cowdoor/Makefile b/rel/d/a/obj/d_a_obj_cowdoor/Makefile index 5308d2f8a3..d051d314ea 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/Makefile +++ b/rel/d/a/obj/d_a_obj_cowdoor/Makefile @@ -38,10 +38,17 @@ $(M424_TARGET): $(M424_O_FILES) $(M424_LIBS) @python3 tools/lcf.py rel 424 --output $(M424_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M424_LDFLAGS) -o $(M424_TARGET) @build/M424_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cowdoor/%.o: rel/d/a/obj/d_a_obj_cowdoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cowdoor/%.o: rel/d/a/obj/d_a_obj_cowdoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_cowdoor/%.d @echo [424] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M424_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M424_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M424_D_FILES := $(M424_O_FILES:.o=.d) +$(M424_D_FILES): +include $(wildcard $(M424_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_crope/Makefile b/rel/d/a/obj/d_a_obj_crope/Makefile index 500fdb7ace..fd31335cca 100644 --- a/rel/d/a/obj/d_a_obj_crope/Makefile +++ b/rel/d/a/obj/d_a_obj_crope/Makefile @@ -38,10 +38,17 @@ $(M425_TARGET): $(M425_O_FILES) $(M425_LIBS) @python3 tools/lcf.py rel 425 --output $(M425_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M425_LDFLAGS) -o $(M425_TARGET) @build/M425_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crope/%.o: rel/d/a/obj/d_a_obj_crope/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crope/%.o: rel/d/a/obj/d_a_obj_crope/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_crope/%.d @echo [425] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M425_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M425_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M425_D_FILES := $(M425_O_FILES:.o=.d) +$(M425_D_FILES): +include $(wildcard $(M425_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_crvfence/Makefile b/rel/d/a/obj/d_a_obj_crvfence/Makefile index 1510260d06..b327668133 100644 --- a/rel/d/a/obj/d_a_obj_crvfence/Makefile +++ b/rel/d/a/obj/d_a_obj_crvfence/Makefile @@ -38,10 +38,17 @@ $(M426_TARGET): $(M426_O_FILES) $(M426_LIBS) @python3 tools/lcf.py rel 426 --output $(M426_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M426_LDFLAGS) -o $(M426_TARGET) @build/M426_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvfence/%.o: rel/d/a/obj/d_a_obj_crvfence/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvfence/%.o: rel/d/a/obj/d_a_obj_crvfence/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvfence/%.d @echo [426] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M426_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M426_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M426_D_FILES := $(M426_O_FILES:.o=.d) +$(M426_D_FILES): +include $(wildcard $(M426_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_crvgate/Makefile b/rel/d/a/obj/d_a_obj_crvgate/Makefile index ebb71bef41..49b5b72848 100644 --- a/rel/d/a/obj/d_a_obj_crvgate/Makefile +++ b/rel/d/a/obj/d_a_obj_crvgate/Makefile @@ -38,10 +38,17 @@ $(M427_TARGET): $(M427_O_FILES) $(M427_LIBS) @python3 tools/lcf.py rel 427 --output $(M427_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M427_LDFLAGS) -o $(M427_TARGET) @build/M427_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvgate/%.o: rel/d/a/obj/d_a_obj_crvgate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvgate/%.o: rel/d/a/obj/d_a_obj_crvgate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvgate/%.d @echo [427] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M427_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M427_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M427_D_FILES := $(M427_O_FILES:.o=.d) +$(M427_D_FILES): +include $(wildcard $(M427_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_crvhahen/Makefile b/rel/d/a/obj/d_a_obj_crvhahen/Makefile index 4545dd55aa..512959d22f 100644 --- a/rel/d/a/obj/d_a_obj_crvhahen/Makefile +++ b/rel/d/a/obj/d_a_obj_crvhahen/Makefile @@ -38,10 +38,17 @@ $(M428_TARGET): $(M428_O_FILES) $(M428_LIBS) @python3 tools/lcf.py rel 428 --output $(M428_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M428_LDFLAGS) -o $(M428_TARGET) @build/M428_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvhahen/%.o: rel/d/a/obj/d_a_obj_crvhahen/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvhahen/%.o: rel/d/a/obj/d_a_obj_crvhahen/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvhahen/%.d @echo [428] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M428_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M428_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M428_D_FILES := $(M428_O_FILES:.o=.d) +$(M428_D_FILES): +include $(wildcard $(M428_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_crvlh_down/Makefile b/rel/d/a/obj/d_a_obj_crvlh_down/Makefile index db2f122007..b3a193f9ce 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_down/Makefile +++ b/rel/d/a/obj/d_a_obj_crvlh_down/Makefile @@ -38,10 +38,17 @@ $(M429_TARGET): $(M429_O_FILES) $(M429_LIBS) @python3 tools/lcf.py rel 429 --output $(M429_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M429_LDFLAGS) -o $(M429_TARGET) @build/M429_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvlh_down/%.o: rel/d/a/obj/d_a_obj_crvlh_down/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvlh_down/%.o: rel/d/a/obj/d_a_obj_crvlh_down/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvlh_down/%.d @echo [429] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M429_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M429_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M429_D_FILES := $(M429_O_FILES:.o=.d) +$(M429_D_FILES): +include $(wildcard $(M429_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_crvlh_up/Makefile b/rel/d/a/obj/d_a_obj_crvlh_up/Makefile index 24465ec144..8e6ade0685 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_up/Makefile +++ b/rel/d/a/obj/d_a_obj_crvlh_up/Makefile @@ -38,10 +38,17 @@ $(M430_TARGET): $(M430_O_FILES) $(M430_LIBS) @python3 tools/lcf.py rel 430 --output $(M430_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M430_LDFLAGS) -o $(M430_TARGET) @build/M430_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvlh_up/%.o: rel/d/a/obj/d_a_obj_crvlh_up/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvlh_up/%.o: rel/d/a/obj/d_a_obj_crvlh_up/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvlh_up/%.d @echo [430] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M430_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M430_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M430_D_FILES := $(M430_O_FILES:.o=.d) +$(M430_D_FILES): +include $(wildcard $(M430_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_crvsteel/Makefile b/rel/d/a/obj/d_a_obj_crvsteel/Makefile index aa46469eb5..a1e8043765 100644 --- a/rel/d/a/obj/d_a_obj_crvsteel/Makefile +++ b/rel/d/a/obj/d_a_obj_crvsteel/Makefile @@ -38,10 +38,17 @@ $(M431_TARGET): $(M431_O_FILES) $(M431_LIBS) @python3 tools/lcf.py rel 431 --output $(M431_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M431_LDFLAGS) -o $(M431_TARGET) @build/M431_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvsteel/%.o: rel/d/a/obj/d_a_obj_crvsteel/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvsteel/%.o: rel/d/a/obj/d_a_obj_crvsteel/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_crvsteel/%.d @echo [431] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M431_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M431_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M431_D_FILES := $(M431_O_FILES:.o=.d) +$(M431_D_FILES): +include $(wildcard $(M431_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_crystal/Makefile b/rel/d/a/obj/d_a_obj_crystal/Makefile index bfc9416028..cf34232157 100644 --- a/rel/d/a/obj/d_a_obj_crystal/Makefile +++ b/rel/d/a/obj/d_a_obj_crystal/Makefile @@ -38,10 +38,17 @@ $(M432_TARGET): $(M432_O_FILES) $(M432_LIBS) @python3 tools/lcf.py rel 432 --output $(M432_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M432_LDFLAGS) -o $(M432_TARGET) @build/M432_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crystal/%.o: rel/d/a/obj/d_a_obj_crystal/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_crystal/%.o: rel/d/a/obj/d_a_obj_crystal/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_crystal/%.d @echo [432] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M432_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M432_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M432_D_FILES := $(M432_O_FILES:.o=.d) +$(M432_D_FILES): +include $(wildcard $(M432_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_cwall/Makefile b/rel/d/a/obj/d_a_obj_cwall/Makefile index 576adde570..31bfeb83e0 100644 --- a/rel/d/a/obj/d_a_obj_cwall/Makefile +++ b/rel/d/a/obj/d_a_obj_cwall/Makefile @@ -40,10 +40,17 @@ $(M433_TARGET): $(M433_O_FILES) $(M433_LIBS) @python3 tools/lcf.py rel 433 --output $(M433_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M433_LDFLAGS) -o $(M433_TARGET) @build/M433_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cwall/%.o: rel/d/a/obj/d_a_obj_cwall/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_cwall/%.o: rel/d/a/obj/d_a_obj_cwall/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_cwall/%.d @echo [433] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M433_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M433_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M433_D_FILES := $(M433_O_FILES:.o=.d) +$(M433_D_FILES): +include $(wildcard $(M433_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_damCps/Makefile b/rel/d/a/obj/d_a_obj_damCps/Makefile index 3d04d2b976..2892478c48 100644 --- a/rel/d/a/obj/d_a_obj_damCps/Makefile +++ b/rel/d/a/obj/d_a_obj_damCps/Makefile @@ -38,10 +38,17 @@ $(M434_TARGET): $(M434_O_FILES) $(M434_LIBS) @python3 tools/lcf.py rel 434 --output $(M434_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M434_LDFLAGS) -o $(M434_TARGET) @build/M434_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_damCps/%.o: rel/d/a/obj/d_a_obj_damCps/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_damCps/%.o: rel/d/a/obj/d_a_obj_damCps/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_damCps/%.d @echo [434] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M434_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M434_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M434_D_FILES := $(M434_O_FILES:.o=.d) +$(M434_D_FILES): +include $(wildcard $(M434_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_dan/Makefile b/rel/d/a/obj/d_a_obj_dan/Makefile index 1e9a5ba6e2..622c149091 100644 --- a/rel/d/a/obj/d_a_obj_dan/Makefile +++ b/rel/d/a/obj/d_a_obj_dan/Makefile @@ -40,10 +40,17 @@ $(M435_TARGET): $(M435_O_FILES) $(M435_LIBS) @python3 tools/lcf.py rel 435 --output $(M435_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M435_LDFLAGS) -o $(M435_TARGET) @build/M435_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_dan/%.o: rel/d/a/obj/d_a_obj_dan/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_dan/%.o: rel/d/a/obj/d_a_obj_dan/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_dan/%.d @echo [435] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M435_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M435_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M435_D_FILES := $(M435_O_FILES:.o=.d) +$(M435_D_FILES): +include $(wildcard $(M435_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_digholl/Makefile b/rel/d/a/obj/d_a_obj_digholl/Makefile index 3a4f1b91f4..e5c943adca 100644 --- a/rel/d/a/obj/d_a_obj_digholl/Makefile +++ b/rel/d/a/obj/d_a_obj_digholl/Makefile @@ -38,10 +38,17 @@ $(M436_TARGET): $(M436_O_FILES) $(M436_LIBS) @python3 tools/lcf.py rel 436 --output $(M436_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M436_LDFLAGS) -o $(M436_TARGET) @build/M436_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_digholl/%.o: rel/d/a/obj/d_a_obj_digholl/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_digholl/%.o: rel/d/a/obj/d_a_obj_digholl/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_digholl/%.d @echo [436] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M436_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M436_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M436_D_FILES := $(M436_O_FILES:.o=.d) +$(M436_D_FILES): +include $(wildcard $(M436_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_digplace/Makefile b/rel/d/a/obj/d_a_obj_digplace/Makefile index c507621e73..0930f82b83 100644 --- a/rel/d/a/obj/d_a_obj_digplace/Makefile +++ b/rel/d/a/obj/d_a_obj_digplace/Makefile @@ -38,10 +38,17 @@ $(M93_TARGET): $(M93_O_FILES) $(M93_LIBS) @python3 tools/lcf.py rel 93 --output $(M93_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M93_LDFLAGS) -o $(M93_TARGET) @build/M93_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_digplace/%.o: rel/d/a/obj/d_a_obj_digplace/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_digplace/%.o: rel/d/a/obj/d_a_obj_digplace/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_digplace/%.d @echo [ 93] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M93_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M93_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M93_D_FILES := $(M93_O_FILES:.o=.d) +$(M93_D_FILES): +include $(wildcard $(M93_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_digsnow/Makefile b/rel/d/a/obj/d_a_obj_digsnow/Makefile index e09c354206..fae0ebc1dc 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/Makefile +++ b/rel/d/a/obj/d_a_obj_digsnow/Makefile @@ -40,10 +40,17 @@ $(M437_TARGET): $(M437_O_FILES) $(M437_LIBS) @python3 tools/lcf.py rel 437 --output $(M437_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M437_LDFLAGS) -o $(M437_TARGET) @build/M437_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_digsnow/%.o: rel/d/a/obj/d_a_obj_digsnow/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_digsnow/%.o: rel/d/a/obj/d_a_obj_digsnow/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_digsnow/%.d @echo [437] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M437_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M437_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M437_D_FILES := $(M437_O_FILES:.o=.d) +$(M437_D_FILES): +include $(wildcard $(M437_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_dmelevator/Makefile b/rel/d/a/obj/d_a_obj_dmelevator/Makefile index e91537e052..95f0a04076 100644 --- a/rel/d/a/obj/d_a_obj_dmelevator/Makefile +++ b/rel/d/a/obj/d_a_obj_dmelevator/Makefile @@ -40,10 +40,17 @@ $(M438_TARGET): $(M438_O_FILES) $(M438_LIBS) @python3 tools/lcf.py rel 438 --output $(M438_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M438_LDFLAGS) -o $(M438_TARGET) @build/M438_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_dmelevator/%.o: rel/d/a/obj/d_a_obj_dmelevator/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_dmelevator/%.o: rel/d/a/obj/d_a_obj_dmelevator/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_dmelevator/%.d @echo [438] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M438_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M438_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M438_D_FILES := $(M438_O_FILES:.o=.d) +$(M438_D_FILES): +include $(wildcard $(M438_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_drop/Makefile b/rel/d/a/obj/d_a_obj_drop/Makefile index 05e121a334..bf77fd95ba 100644 --- a/rel/d/a/obj/d_a_obj_drop/Makefile +++ b/rel/d/a/obj/d_a_obj_drop/Makefile @@ -40,10 +40,17 @@ $(M439_TARGET): $(M439_O_FILES) $(M439_LIBS) @python3 tools/lcf.py rel 439 --output $(M439_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M439_LDFLAGS) -o $(M439_TARGET) @build/M439_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_drop/%.o: rel/d/a/obj/d_a_obj_drop/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_drop/%.o: rel/d/a/obj/d_a_obj_drop/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_drop/%.d @echo [439] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M439_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M439_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M439_D_FILES := $(M439_O_FILES:.o=.d) +$(M439_D_FILES): +include $(wildcard $(M439_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_dust/Makefile b/rel/d/a/obj/d_a_obj_dust/Makefile index 5917c4509a..cdda44b36a 100644 --- a/rel/d/a/obj/d_a_obj_dust/Makefile +++ b/rel/d/a/obj/d_a_obj_dust/Makefile @@ -38,10 +38,17 @@ $(M440_TARGET): $(M440_O_FILES) $(M440_LIBS) @python3 tools/lcf.py rel 440 --output $(M440_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M440_LDFLAGS) -o $(M440_TARGET) @build/M440_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_dust/%.o: rel/d/a/obj/d_a_obj_dust/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_dust/%.o: rel/d/a/obj/d_a_obj_dust/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_dust/%.d @echo [440] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M440_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M440_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M440_D_FILES := $(M440_O_FILES:.o=.d) +$(M440_D_FILES): +include $(wildcard $(M440_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_eff/Makefile b/rel/d/a/obj/d_a_obj_eff/Makefile index c45d67507c..c55ff8c0fd 100644 --- a/rel/d/a/obj/d_a_obj_eff/Makefile +++ b/rel/d/a/obj/d_a_obj_eff/Makefile @@ -38,10 +38,17 @@ $(M94_TARGET): $(M94_O_FILES) $(M94_LIBS) @python3 tools/lcf.py rel 94 --output $(M94_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M94_LDFLAGS) -o $(M94_TARGET) @build/M94_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_eff/%.o: rel/d/a/obj/d_a_obj_eff/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_eff/%.o: rel/d/a/obj/d_a_obj_eff/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_eff/%.d @echo [ 94] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M94_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M94_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M94_D_FILES := $(M94_O_FILES:.o=.d) +$(M94_D_FILES): +include $(wildcard $(M94_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_enemy_create/Makefile b/rel/d/a/obj/d_a_obj_enemy_create/Makefile index ab4464590a..746a646120 100644 --- a/rel/d/a/obj/d_a_obj_enemy_create/Makefile +++ b/rel/d/a/obj/d_a_obj_enemy_create/Makefile @@ -38,10 +38,17 @@ $(M441_TARGET): $(M441_O_FILES) $(M441_LIBS) @python3 tools/lcf.py rel 441 --output $(M441_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M441_LDFLAGS) -o $(M441_TARGET) @build/M441_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_enemy_create/%.o: rel/d/a/obj/d_a_obj_enemy_create/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_enemy_create/%.o: rel/d/a/obj/d_a_obj_enemy_create/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_enemy_create/%.d @echo [441] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M441_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M441_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M441_D_FILES := $(M441_O_FILES:.o=.d) +$(M441_D_FILES): +include $(wildcard $(M441_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_fallobj/Makefile b/rel/d/a/obj/d_a_obj_fallobj/Makefile index 1f0ce5c746..e77297b047 100644 --- a/rel/d/a/obj/d_a_obj_fallobj/Makefile +++ b/rel/d/a/obj/d_a_obj_fallobj/Makefile @@ -38,10 +38,17 @@ $(M442_TARGET): $(M442_O_FILES) $(M442_LIBS) @python3 tools/lcf.py rel 442 --output $(M442_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M442_LDFLAGS) -o $(M442_TARGET) @build/M442_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fallobj/%.o: rel/d/a/obj/d_a_obj_fallobj/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fallobj/%.o: rel/d/a/obj/d_a_obj_fallobj/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_fallobj/%.d @echo [442] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M442_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M442_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M442_D_FILES := $(M442_O_FILES:.o=.d) +$(M442_D_FILES): +include $(wildcard $(M442_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_fan/Makefile b/rel/d/a/obj/d_a_obj_fan/Makefile index 05d956b449..52d3a61b77 100644 --- a/rel/d/a/obj/d_a_obj_fan/Makefile +++ b/rel/d/a/obj/d_a_obj_fan/Makefile @@ -38,10 +38,17 @@ $(M443_TARGET): $(M443_O_FILES) $(M443_LIBS) @python3 tools/lcf.py rel 443 --output $(M443_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M443_LDFLAGS) -o $(M443_TARGET) @build/M443_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fan/%.o: rel/d/a/obj/d_a_obj_fan/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fan/%.o: rel/d/a/obj/d_a_obj_fan/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_fan/%.d @echo [443] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M443_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M443_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M443_D_FILES := $(M443_O_FILES:.o=.d) +$(M443_D_FILES): +include $(wildcard $(M443_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_fchain/Makefile b/rel/d/a/obj/d_a_obj_fchain/Makefile index ef9be38859..6c33185e37 100644 --- a/rel/d/a/obj/d_a_obj_fchain/Makefile +++ b/rel/d/a/obj/d_a_obj_fchain/Makefile @@ -38,10 +38,17 @@ $(M444_TARGET): $(M444_O_FILES) $(M444_LIBS) @python3 tools/lcf.py rel 444 --output $(M444_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M444_LDFLAGS) -o $(M444_TARGET) @build/M444_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fchain/%.o: rel/d/a/obj/d_a_obj_fchain/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fchain/%.o: rel/d/a/obj/d_a_obj_fchain/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_fchain/%.d @echo [444] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M444_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M444_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M444_D_FILES := $(M444_O_FILES:.o=.d) +$(M444_D_FILES): +include $(wildcard $(M444_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_fireWood/Makefile b/rel/d/a/obj/d_a_obj_fireWood/Makefile index 41e760aa8a..94b626ea84 100644 --- a/rel/d/a/obj/d_a_obj_fireWood/Makefile +++ b/rel/d/a/obj/d_a_obj_fireWood/Makefile @@ -40,10 +40,17 @@ $(M445_TARGET): $(M445_O_FILES) $(M445_LIBS) @python3 tools/lcf.py rel 445 --output $(M445_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M445_LDFLAGS) -o $(M445_TARGET) @build/M445_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fireWood/%.o: rel/d/a/obj/d_a_obj_fireWood/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fireWood/%.o: rel/d/a/obj/d_a_obj_fireWood/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_fireWood/%.d @echo [445] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M445_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M445_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M445_D_FILES := $(M445_O_FILES:.o=.d) +$(M445_D_FILES): +include $(wildcard $(M445_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_fireWood2/Makefile b/rel/d/a/obj/d_a_obj_fireWood2/Makefile index a87ad61ce6..381952756f 100644 --- a/rel/d/a/obj/d_a_obj_fireWood2/Makefile +++ b/rel/d/a/obj/d_a_obj_fireWood2/Makefile @@ -40,10 +40,17 @@ $(M446_TARGET): $(M446_O_FILES) $(M446_LIBS) @python3 tools/lcf.py rel 446 --output $(M446_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M446_LDFLAGS) -o $(M446_TARGET) @build/M446_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fireWood2/%.o: rel/d/a/obj/d_a_obj_fireWood2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fireWood2/%.o: rel/d/a/obj/d_a_obj_fireWood2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_fireWood2/%.d @echo [446] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M446_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M446_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M446_D_FILES := $(M446_O_FILES:.o=.d) +$(M446_D_FILES): +include $(wildcard $(M446_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_firepillar/Makefile b/rel/d/a/obj/d_a_obj_firepillar/Makefile index 23ed6cffc3..43eeab10ee 100644 --- a/rel/d/a/obj/d_a_obj_firepillar/Makefile +++ b/rel/d/a/obj/d_a_obj_firepillar/Makefile @@ -40,10 +40,17 @@ $(M447_TARGET): $(M447_O_FILES) $(M447_LIBS) @python3 tools/lcf.py rel 447 --output $(M447_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M447_LDFLAGS) -o $(M447_TARGET) @build/M447_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_firepillar/%.o: rel/d/a/obj/d_a_obj_firepillar/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_firepillar/%.o: rel/d/a/obj/d_a_obj_firepillar/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_firepillar/%.d @echo [447] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M447_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M447_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M447_D_FILES := $(M447_O_FILES:.o=.d) +$(M447_D_FILES): +include $(wildcard $(M447_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_firepillar2/Makefile b/rel/d/a/obj/d_a_obj_firepillar2/Makefile index aeb72392cf..38b7e2a8d1 100644 --- a/rel/d/a/obj/d_a_obj_firepillar2/Makefile +++ b/rel/d/a/obj/d_a_obj_firepillar2/Makefile @@ -40,10 +40,17 @@ $(M448_TARGET): $(M448_O_FILES) $(M448_LIBS) @python3 tools/lcf.py rel 448 --output $(M448_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M448_LDFLAGS) -o $(M448_TARGET) @build/M448_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_firepillar2/%.o: rel/d/a/obj/d_a_obj_firepillar2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_firepillar2/%.o: rel/d/a/obj/d_a_obj_firepillar2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_firepillar2/%.d @echo [448] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M448_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M448_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M448_D_FILES := $(M448_O_FILES:.o=.d) +$(M448_D_FILES): +include $(wildcard $(M448_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_flag/Makefile b/rel/d/a/obj/d_a_obj_flag/Makefile index 3b27430411..6473c6bb1a 100644 --- a/rel/d/a/obj/d_a_obj_flag/Makefile +++ b/rel/d/a/obj/d_a_obj_flag/Makefile @@ -38,10 +38,17 @@ $(M449_TARGET): $(M449_O_FILES) $(M449_LIBS) @python3 tools/lcf.py rel 449 --output $(M449_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M449_LDFLAGS) -o $(M449_TARGET) @build/M449_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_flag/%.o: rel/d/a/obj/d_a_obj_flag/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_flag/%.o: rel/d/a/obj/d_a_obj_flag/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_flag/%.d @echo [449] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M449_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M449_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M449_D_FILES := $(M449_O_FILES:.o=.d) +$(M449_D_FILES): +include $(wildcard $(M449_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_flag2/Makefile b/rel/d/a/obj/d_a_obj_flag2/Makefile index f106f8613e..c06bd59f16 100644 --- a/rel/d/a/obj/d_a_obj_flag2/Makefile +++ b/rel/d/a/obj/d_a_obj_flag2/Makefile @@ -38,10 +38,17 @@ $(M450_TARGET): $(M450_O_FILES) $(M450_LIBS) @python3 tools/lcf.py rel 450 --output $(M450_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M450_LDFLAGS) -o $(M450_TARGET) @build/M450_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_flag2/%.o: rel/d/a/obj/d_a_obj_flag2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_flag2/%.o: rel/d/a/obj/d_a_obj_flag2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_flag2/%.d @echo [450] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M450_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M450_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M450_D_FILES := $(M450_O_FILES:.o=.d) +$(M450_D_FILES): +include $(wildcard $(M450_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_flag3/Makefile b/rel/d/a/obj/d_a_obj_flag3/Makefile index ddb034c828..e195020fed 100644 --- a/rel/d/a/obj/d_a_obj_flag3/Makefile +++ b/rel/d/a/obj/d_a_obj_flag3/Makefile @@ -38,10 +38,17 @@ $(M451_TARGET): $(M451_O_FILES) $(M451_LIBS) @python3 tools/lcf.py rel 451 --output $(M451_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M451_LDFLAGS) -o $(M451_TARGET) @build/M451_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_flag3/%.o: rel/d/a/obj/d_a_obj_flag3/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_flag3/%.o: rel/d/a/obj/d_a_obj_flag3/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_flag3/%.d @echo [451] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M451_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M451_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M451_D_FILES := $(M451_O_FILES:.o=.d) +$(M451_D_FILES): +include $(wildcard $(M451_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_fmobj/Makefile b/rel/d/a/obj/d_a_obj_fmobj/Makefile index 61dc21169f..9c0a4bf3d4 100644 --- a/rel/d/a/obj/d_a_obj_fmobj/Makefile +++ b/rel/d/a/obj/d_a_obj_fmobj/Makefile @@ -38,10 +38,17 @@ $(M95_TARGET): $(M95_O_FILES) $(M95_LIBS) @python3 tools/lcf.py rel 95 --output $(M95_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M95_LDFLAGS) -o $(M95_TARGET) @build/M95_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fmobj/%.o: rel/d/a/obj/d_a_obj_fmobj/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fmobj/%.o: rel/d/a/obj/d_a_obj_fmobj/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_fmobj/%.d @echo [ 95] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M95_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M95_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M95_D_FILES := $(M95_O_FILES:.o=.d) +$(M95_D_FILES): +include $(wildcard $(M95_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_food/Makefile b/rel/d/a/obj/d_a_obj_food/Makefile index 446350cb89..6bdbe6afc8 100644 --- a/rel/d/a/obj/d_a_obj_food/Makefile +++ b/rel/d/a/obj/d_a_obj_food/Makefile @@ -40,10 +40,17 @@ $(M452_TARGET): $(M452_O_FILES) $(M452_LIBS) @python3 tools/lcf.py rel 452 --output $(M452_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M452_LDFLAGS) -o $(M452_TARGET) @build/M452_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_food/%.o: rel/d/a/obj/d_a_obj_food/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_food/%.o: rel/d/a/obj/d_a_obj_food/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_food/%.d @echo [452] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M452_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M452_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M452_D_FILES := $(M452_O_FILES:.o=.d) +$(M452_D_FILES): +include $(wildcard $(M452_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_fw/Makefile b/rel/d/a/obj/d_a_obj_fw/Makefile index 9098fb60d1..db5bef63de 100644 --- a/rel/d/a/obj/d_a_obj_fw/Makefile +++ b/rel/d/a/obj/d_a_obj_fw/Makefile @@ -40,10 +40,17 @@ $(M453_TARGET): $(M453_O_FILES) $(M453_LIBS) @python3 tools/lcf.py rel 453 --output $(M453_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M453_LDFLAGS) -o $(M453_TARGET) @build/M453_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fw/%.o: rel/d/a/obj/d_a_obj_fw/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_fw/%.o: rel/d/a/obj/d_a_obj_fw/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_fw/%.d @echo [453] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M453_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M453_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M453_D_FILES := $(M453_O_FILES:.o=.d) +$(M453_D_FILES): +include $(wildcard $(M453_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_gadget/Makefile b/rel/d/a/obj/d_a_obj_gadget/Makefile index b41000d708..06dac0149f 100644 --- a/rel/d/a/obj/d_a_obj_gadget/Makefile +++ b/rel/d/a/obj/d_a_obj_gadget/Makefile @@ -40,10 +40,17 @@ $(M454_TARGET): $(M454_O_FILES) $(M454_LIBS) @python3 tools/lcf.py rel 454 --output $(M454_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M454_LDFLAGS) -o $(M454_TARGET) @build/M454_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gadget/%.o: rel/d/a/obj/d_a_obj_gadget/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gadget/%.o: rel/d/a/obj/d_a_obj_gadget/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_gadget/%.d @echo [454] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M454_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M454_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M454_D_FILES := $(M454_O_FILES:.o=.d) +$(M454_D_FILES): +include $(wildcard $(M454_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ganonwall/Makefile b/rel/d/a/obj/d_a_obj_ganonwall/Makefile index 14484f0010..7874b3aeb0 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall/Makefile +++ b/rel/d/a/obj/d_a_obj_ganonwall/Makefile @@ -38,10 +38,17 @@ $(M455_TARGET): $(M455_O_FILES) $(M455_LIBS) @python3 tools/lcf.py rel 455 --output $(M455_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M455_LDFLAGS) -o $(M455_TARGET) @build/M455_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ganonwall/%.o: rel/d/a/obj/d_a_obj_ganonwall/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ganonwall/%.o: rel/d/a/obj/d_a_obj_ganonwall/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ganonwall/%.d @echo [455] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M455_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M455_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M455_D_FILES := $(M455_O_FILES:.o=.d) +$(M455_D_FILES): +include $(wildcard $(M455_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ganonwall2/Makefile b/rel/d/a/obj/d_a_obj_ganonwall2/Makefile index 4f9929c17b..e850fa8d09 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall2/Makefile +++ b/rel/d/a/obj/d_a_obj_ganonwall2/Makefile @@ -38,10 +38,17 @@ $(M456_TARGET): $(M456_O_FILES) $(M456_LIBS) @python3 tools/lcf.py rel 456 --output $(M456_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M456_LDFLAGS) -o $(M456_TARGET) @build/M456_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ganonwall2/%.o: rel/d/a/obj/d_a_obj_ganonwall2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ganonwall2/%.o: rel/d/a/obj/d_a_obj_ganonwall2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ganonwall2/%.d @echo [456] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M456_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M456_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M456_D_FILES := $(M456_O_FILES:.o=.d) +$(M456_D_FILES): +include $(wildcard $(M456_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_gb/Makefile b/rel/d/a/obj/d_a_obj_gb/Makefile index f48afca23e..2f3f8081e1 100644 --- a/rel/d/a/obj/d_a_obj_gb/Makefile +++ b/rel/d/a/obj/d_a_obj_gb/Makefile @@ -38,10 +38,17 @@ $(M457_TARGET): $(M457_O_FILES) $(M457_LIBS) @python3 tools/lcf.py rel 457 --output $(M457_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M457_LDFLAGS) -o $(M457_TARGET) @build/M457_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gb/%.o: rel/d/a/obj/d_a_obj_gb/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gb/%.o: rel/d/a/obj/d_a_obj_gb/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_gb/%.d @echo [457] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M457_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M457_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M457_D_FILES := $(M457_O_FILES:.o=.d) +$(M457_D_FILES): +include $(wildcard $(M457_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_geyser/Makefile b/rel/d/a/obj/d_a_obj_geyser/Makefile index c4e339fa71..60a545c17c 100644 --- a/rel/d/a/obj/d_a_obj_geyser/Makefile +++ b/rel/d/a/obj/d_a_obj_geyser/Makefile @@ -40,10 +40,17 @@ $(M458_TARGET): $(M458_O_FILES) $(M458_LIBS) @python3 tools/lcf.py rel 458 --output $(M458_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M458_LDFLAGS) -o $(M458_TARGET) @build/M458_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_geyser/%.o: rel/d/a/obj/d_a_obj_geyser/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_geyser/%.o: rel/d/a/obj/d_a_obj_geyser/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_geyser/%.d @echo [458] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M458_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M458_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M458_D_FILES := $(M458_O_FILES:.o=.d) +$(M458_D_FILES): +include $(wildcard $(M458_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_glowSphere/Makefile b/rel/d/a/obj/d_a_obj_glowSphere/Makefile index eb7ef89f29..a58b2ad048 100644 --- a/rel/d/a/obj/d_a_obj_glowSphere/Makefile +++ b/rel/d/a/obj/d_a_obj_glowSphere/Makefile @@ -40,10 +40,17 @@ $(M459_TARGET): $(M459_O_FILES) $(M459_LIBS) @python3 tools/lcf.py rel 459 --output $(M459_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M459_LDFLAGS) -o $(M459_TARGET) @build/M459_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_glowSphere/%.o: rel/d/a/obj/d_a_obj_glowSphere/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_glowSphere/%.o: rel/d/a/obj/d_a_obj_glowSphere/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_glowSphere/%.d @echo [459] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M459_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M459_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M459_D_FILES := $(M459_O_FILES:.o=.d) +$(M459_D_FILES): +include $(wildcard $(M459_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_gm/Makefile b/rel/d/a/obj/d_a_obj_gm/Makefile index 16f9c7dc96..515f717c15 100644 --- a/rel/d/a/obj/d_a_obj_gm/Makefile +++ b/rel/d/a/obj/d_a_obj_gm/Makefile @@ -40,10 +40,17 @@ $(M460_TARGET): $(M460_O_FILES) $(M460_LIBS) @python3 tools/lcf.py rel 460 --output $(M460_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M460_LDFLAGS) -o $(M460_TARGET) @build/M460_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gm/%.o: rel/d/a/obj/d_a_obj_gm/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gm/%.o: rel/d/a/obj/d_a_obj_gm/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_gm/%.d @echo [460] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M460_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M460_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M460_D_FILES := $(M460_O_FILES:.o=.d) +$(M460_D_FILES): +include $(wildcard $(M460_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_goGate/Makefile b/rel/d/a/obj/d_a_obj_goGate/Makefile index 6bc8613303..546e07b9a3 100644 --- a/rel/d/a/obj/d_a_obj_goGate/Makefile +++ b/rel/d/a/obj/d_a_obj_goGate/Makefile @@ -40,10 +40,17 @@ $(M461_TARGET): $(M461_O_FILES) $(M461_LIBS) @python3 tools/lcf.py rel 461 --output $(M461_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M461_LDFLAGS) -o $(M461_TARGET) @build/M461_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_goGate/%.o: rel/d/a/obj/d_a_obj_goGate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_goGate/%.o: rel/d/a/obj/d_a_obj_goGate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_goGate/%.d @echo [461] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M461_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M461_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M461_D_FILES := $(M461_O_FILES:.o=.d) +$(M461_D_FILES): +include $(wildcard $(M461_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_gomikabe/Makefile b/rel/d/a/obj/d_a_obj_gomikabe/Makefile index c659063cc2..11e849bb65 100644 --- a/rel/d/a/obj/d_a_obj_gomikabe/Makefile +++ b/rel/d/a/obj/d_a_obj_gomikabe/Makefile @@ -40,10 +40,17 @@ $(M462_TARGET): $(M462_O_FILES) $(M462_LIBS) @python3 tools/lcf.py rel 462 --output $(M462_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M462_LDFLAGS) -o $(M462_TARGET) @build/M462_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gomikabe/%.o: rel/d/a/obj/d_a_obj_gomikabe/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gomikabe/%.o: rel/d/a/obj/d_a_obj_gomikabe/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_gomikabe/%.d @echo [462] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M462_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M462_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M462_D_FILES := $(M462_O_FILES:.o=.d) +$(M462_D_FILES): +include $(wildcard $(M462_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_gptaru/Makefile b/rel/d/a/obj/d_a_obj_gptaru/Makefile index 66a3c79847..f54eff5324 100644 --- a/rel/d/a/obj/d_a_obj_gptaru/Makefile +++ b/rel/d/a/obj/d_a_obj_gptaru/Makefile @@ -40,10 +40,17 @@ $(M96_TARGET): $(M96_O_FILES) $(M96_LIBS) @python3 tools/lcf.py rel 96 --output $(M96_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M96_LDFLAGS) -o $(M96_TARGET) @build/M96_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gptaru/%.o: rel/d/a/obj/d_a_obj_gptaru/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gptaru/%.o: rel/d/a/obj/d_a_obj_gptaru/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_gptaru/%.d @echo [ 96] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M96_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M96_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M96_D_FILES := $(M96_O_FILES:.o=.d) +$(M96_D_FILES): +include $(wildcard $(M96_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_gra2/Makefile b/rel/d/a/obj/d_a_obj_gra2/Makefile index 1ee58b74ed..94df63514d 100644 --- a/rel/d/a/obj/d_a_obj_gra2/Makefile +++ b/rel/d/a/obj/d_a_obj_gra2/Makefile @@ -40,10 +40,17 @@ $(M463_TARGET): $(M463_O_FILES) $(M463_LIBS) @python3 tools/lcf.py rel 463 --output $(M463_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M463_LDFLAGS) -o $(M463_TARGET) @build/M463_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gra2/%.o: rel/d/a/obj/d_a_obj_gra2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gra2/%.o: rel/d/a/obj/d_a_obj_gra2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_gra2/%.d @echo [463] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M463_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M463_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M463_D_FILES := $(M463_O_FILES:.o=.d) +$(M463_D_FILES): +include $(wildcard $(M463_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_graWall/Makefile b/rel/d/a/obj/d_a_obj_graWall/Makefile index baacfc50db..1b1711e5c5 100644 --- a/rel/d/a/obj/d_a_obj_graWall/Makefile +++ b/rel/d/a/obj/d_a_obj_graWall/Makefile @@ -38,10 +38,17 @@ $(M464_TARGET): $(M464_O_FILES) $(M464_LIBS) @python3 tools/lcf.py rel 464 --output $(M464_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M464_LDFLAGS) -o $(M464_TARGET) @build/M464_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_graWall/%.o: rel/d/a/obj/d_a_obj_graWall/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_graWall/%.o: rel/d/a/obj/d_a_obj_graWall/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_graWall/%.d @echo [464] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M464_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M464_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M464_D_FILES := $(M464_O_FILES:.o=.d) +$(M464_D_FILES): +include $(wildcard $(M464_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_gra_rock/Makefile b/rel/d/a/obj/d_a_obj_gra_rock/Makefile index c4a9246be2..ab05deb538 100644 --- a/rel/d/a/obj/d_a_obj_gra_rock/Makefile +++ b/rel/d/a/obj/d_a_obj_gra_rock/Makefile @@ -38,10 +38,17 @@ $(M465_TARGET): $(M465_O_FILES) $(M465_LIBS) @python3 tools/lcf.py rel 465 --output $(M465_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M465_LDFLAGS) -o $(M465_TARGET) @build/M465_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gra_rock/%.o: rel/d/a/obj/d_a_obj_gra_rock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_gra_rock/%.o: rel/d/a/obj/d_a_obj_gra_rock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_gra_rock/%.d @echo [465] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M465_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M465_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M465_D_FILES := $(M465_O_FILES:.o=.d) +$(M465_D_FILES): +include $(wildcard $(M465_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_grave_stone/Makefile b/rel/d/a/obj/d_a_obj_grave_stone/Makefile index 63d0d5898e..1d0d18ee02 100644 --- a/rel/d/a/obj/d_a_obj_grave_stone/Makefile +++ b/rel/d/a/obj/d_a_obj_grave_stone/Makefile @@ -38,10 +38,17 @@ $(M466_TARGET): $(M466_O_FILES) $(M466_LIBS) @python3 tools/lcf.py rel 466 --output $(M466_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M466_LDFLAGS) -o $(M466_TARGET) @build/M466_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_grave_stone/%.o: rel/d/a/obj/d_a_obj_grave_stone/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_grave_stone/%.o: rel/d/a/obj/d_a_obj_grave_stone/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_grave_stone/%.d @echo [466] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M466_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M466_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M466_D_FILES := $(M466_O_FILES:.o=.d) +$(M466_D_FILES): +include $(wildcard $(M466_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_groundwater/Makefile b/rel/d/a/obj/d_a_obj_groundwater/Makefile index 2997f14a23..7d0045152c 100644 --- a/rel/d/a/obj/d_a_obj_groundwater/Makefile +++ b/rel/d/a/obj/d_a_obj_groundwater/Makefile @@ -40,10 +40,17 @@ $(M467_TARGET): $(M467_O_FILES) $(M467_LIBS) @python3 tools/lcf.py rel 467 --output $(M467_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M467_LDFLAGS) -o $(M467_TARGET) @build/M467_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_groundwater/%.o: rel/d/a/obj/d_a_obj_groundwater/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_groundwater/%.o: rel/d/a/obj/d_a_obj_groundwater/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_groundwater/%.d @echo [467] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M467_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M467_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M467_D_FILES := $(M467_O_FILES:.o=.d) +$(M467_D_FILES): +include $(wildcard $(M467_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_grz_rock/Makefile b/rel/d/a/obj/d_a_obj_grz_rock/Makefile index b5c629187a..7a6188d268 100644 --- a/rel/d/a/obj/d_a_obj_grz_rock/Makefile +++ b/rel/d/a/obj/d_a_obj_grz_rock/Makefile @@ -38,10 +38,17 @@ $(M468_TARGET): $(M468_O_FILES) $(M468_LIBS) @python3 tools/lcf.py rel 468 --output $(M468_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M468_LDFLAGS) -o $(M468_TARGET) @build/M468_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_grz_rock/%.o: rel/d/a/obj/d_a_obj_grz_rock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_grz_rock/%.o: rel/d/a/obj/d_a_obj_grz_rock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_grz_rock/%.d @echo [468] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M468_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M468_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M468_D_FILES := $(M468_O_FILES:.o=.d) +$(M468_D_FILES): +include $(wildcard $(M468_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_h_saku/Makefile b/rel/d/a/obj/d_a_obj_h_saku/Makefile index a836c97f32..5f389b2229 100644 --- a/rel/d/a/obj/d_a_obj_h_saku/Makefile +++ b/rel/d/a/obj/d_a_obj_h_saku/Makefile @@ -40,10 +40,17 @@ $(M469_TARGET): $(M469_O_FILES) $(M469_LIBS) @python3 tools/lcf.py rel 469 --output $(M469_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M469_LDFLAGS) -o $(M469_TARGET) @build/M469_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_h_saku/%.o: rel/d/a/obj/d_a_obj_h_saku/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_h_saku/%.o: rel/d/a/obj/d_a_obj_h_saku/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_h_saku/%.d @echo [469] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M469_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M469_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M469_D_FILES := $(M469_O_FILES:.o=.d) +$(M469_D_FILES): +include $(wildcard $(M469_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_hakai_brl/Makefile b/rel/d/a/obj/d_a_obj_hakai_brl/Makefile index 49cd6221b3..f5915e6ea6 100644 --- a/rel/d/a/obj/d_a_obj_hakai_brl/Makefile +++ b/rel/d/a/obj/d_a_obj_hakai_brl/Makefile @@ -38,10 +38,17 @@ $(M470_TARGET): $(M470_O_FILES) $(M470_LIBS) @python3 tools/lcf.py rel 470 --output $(M470_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M470_LDFLAGS) -o $(M470_TARGET) @build/M470_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hakai_brl/%.o: rel/d/a/obj/d_a_obj_hakai_brl/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hakai_brl/%.o: rel/d/a/obj/d_a_obj_hakai_brl/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_hakai_brl/%.d @echo [470] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M470_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M470_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M470_D_FILES := $(M470_O_FILES:.o=.d) +$(M470_D_FILES): +include $(wildcard $(M470_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_hakai_ftr/Makefile b/rel/d/a/obj/d_a_obj_hakai_ftr/Makefile index e080b824ed..315f27d900 100644 --- a/rel/d/a/obj/d_a_obj_hakai_ftr/Makefile +++ b/rel/d/a/obj/d_a_obj_hakai_ftr/Makefile @@ -38,10 +38,17 @@ $(M471_TARGET): $(M471_O_FILES) $(M471_LIBS) @python3 tools/lcf.py rel 471 --output $(M471_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M471_LDFLAGS) -o $(M471_TARGET) @build/M471_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hakai_ftr/%.o: rel/d/a/obj/d_a_obj_hakai_ftr/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hakai_ftr/%.o: rel/d/a/obj/d_a_obj_hakai_ftr/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_hakai_ftr/%.d @echo [471] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M471_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M471_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M471_D_FILES := $(M471_O_FILES:.o=.d) +$(M471_D_FILES): +include $(wildcard $(M471_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_hasu2/Makefile b/rel/d/a/obj/d_a_obj_hasu2/Makefile index 64ccd7f01c..4362bc50f7 100644 --- a/rel/d/a/obj/d_a_obj_hasu2/Makefile +++ b/rel/d/a/obj/d_a_obj_hasu2/Makefile @@ -38,10 +38,17 @@ $(M472_TARGET): $(M472_O_FILES) $(M472_LIBS) @python3 tools/lcf.py rel 472 --output $(M472_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M472_LDFLAGS) -o $(M472_TARGET) @build/M472_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hasu2/%.o: rel/d/a/obj/d_a_obj_hasu2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hasu2/%.o: rel/d/a/obj/d_a_obj_hasu2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_hasu2/%.d @echo [472] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M472_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M472_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M472_D_FILES := $(M472_O_FILES:.o=.d) +$(M472_D_FILES): +include $(wildcard $(M472_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_hata/Makefile b/rel/d/a/obj/d_a_obj_hata/Makefile index 48edd4a13b..7cd6243e60 100644 --- a/rel/d/a/obj/d_a_obj_hata/Makefile +++ b/rel/d/a/obj/d_a_obj_hata/Makefile @@ -38,10 +38,17 @@ $(M473_TARGET): $(M473_O_FILES) $(M473_LIBS) @python3 tools/lcf.py rel 473 --output $(M473_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M473_LDFLAGS) -o $(M473_TARGET) @build/M473_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hata/%.o: rel/d/a/obj/d_a_obj_hata/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hata/%.o: rel/d/a/obj/d_a_obj_hata/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_hata/%.d @echo [473] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M473_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M473_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M473_D_FILES := $(M473_O_FILES:.o=.d) +$(M473_D_FILES): +include $(wildcard $(M473_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_hb/Makefile b/rel/d/a/obj/d_a_obj_hb/Makefile index bea7a5d82a..dc9e9138a8 100644 --- a/rel/d/a/obj/d_a_obj_hb/Makefile +++ b/rel/d/a/obj/d_a_obj_hb/Makefile @@ -40,10 +40,17 @@ $(M474_TARGET): $(M474_O_FILES) $(M474_LIBS) @python3 tools/lcf.py rel 474 --output $(M474_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M474_LDFLAGS) -o $(M474_TARGET) @build/M474_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hb/%.o: rel/d/a/obj/d_a_obj_hb/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hb/%.o: rel/d/a/obj/d_a_obj_hb/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_hb/%.d @echo [474] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M474_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M474_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M474_D_FILES := $(M474_O_FILES:.o=.d) +$(M474_D_FILES): +include $(wildcard $(M474_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_hbombkoya/Makefile b/rel/d/a/obj/d_a_obj_hbombkoya/Makefile index a2c81e774b..0e8e0a0ca1 100644 --- a/rel/d/a/obj/d_a_obj_hbombkoya/Makefile +++ b/rel/d/a/obj/d_a_obj_hbombkoya/Makefile @@ -38,10 +38,17 @@ $(M475_TARGET): $(M475_O_FILES) $(M475_LIBS) @python3 tools/lcf.py rel 475 --output $(M475_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M475_LDFLAGS) -o $(M475_TARGET) @build/M475_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hbombkoya/%.o: rel/d/a/obj/d_a_obj_hbombkoya/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hbombkoya/%.o: rel/d/a/obj/d_a_obj_hbombkoya/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_hbombkoya/%.d @echo [475] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M475_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M475_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M475_D_FILES := $(M475_O_FILES:.o=.d) +$(M475_D_FILES): +include $(wildcard $(M475_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_heavySw/Makefile b/rel/d/a/obj/d_a_obj_heavySw/Makefile index 7bfd3f645b..35ae901530 100644 --- a/rel/d/a/obj/d_a_obj_heavySw/Makefile +++ b/rel/d/a/obj/d_a_obj_heavySw/Makefile @@ -40,10 +40,17 @@ $(M476_TARGET): $(M476_O_FILES) $(M476_LIBS) @python3 tools/lcf.py rel 476 --output $(M476_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M476_LDFLAGS) -o $(M476_TARGET) @build/M476_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_heavySw/%.o: rel/d/a/obj/d_a_obj_heavySw/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_heavySw/%.o: rel/d/a/obj/d_a_obj_heavySw/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_heavySw/%.d @echo [476] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M476_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M476_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M476_D_FILES := $(M476_O_FILES:.o=.d) +$(M476_D_FILES): +include $(wildcard $(M476_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_hfuta/Makefile b/rel/d/a/obj/d_a_obj_hfuta/Makefile index 2c3e686157..a5e5a13c83 100644 --- a/rel/d/a/obj/d_a_obj_hfuta/Makefile +++ b/rel/d/a/obj/d_a_obj_hfuta/Makefile @@ -40,10 +40,17 @@ $(M477_TARGET): $(M477_O_FILES) $(M477_LIBS) @python3 tools/lcf.py rel 477 --output $(M477_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M477_LDFLAGS) -o $(M477_TARGET) @build/M477_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hfuta/%.o: rel/d/a/obj/d_a_obj_hfuta/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hfuta/%.o: rel/d/a/obj/d_a_obj_hfuta/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_hfuta/%.d @echo [477] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M477_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M477_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M477_D_FILES := $(M477_O_FILES:.o=.d) +$(M477_D_FILES): +include $(wildcard $(M477_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_hhashi/Makefile b/rel/d/a/obj/d_a_obj_hhashi/Makefile index db63127efb..b6bca08dbb 100644 --- a/rel/d/a/obj/d_a_obj_hhashi/Makefile +++ b/rel/d/a/obj/d_a_obj_hhashi/Makefile @@ -38,10 +38,17 @@ $(M97_TARGET): $(M97_O_FILES) $(M97_LIBS) @python3 tools/lcf.py rel 97 --output $(M97_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M97_LDFLAGS) -o $(M97_TARGET) @build/M97_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hhashi/%.o: rel/d/a/obj/d_a_obj_hhashi/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hhashi/%.o: rel/d/a/obj/d_a_obj_hhashi/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_hhashi/%.d @echo [ 97] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M97_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M97_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M97_D_FILES := $(M97_O_FILES:.o=.d) +$(M97_D_FILES): +include $(wildcard $(M97_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_hsTarget/Makefile b/rel/d/a/obj/d_a_obj_hsTarget/Makefile index ba483c0c7e..4d676c57aa 100644 --- a/rel/d/a/obj/d_a_obj_hsTarget/Makefile +++ b/rel/d/a/obj/d_a_obj_hsTarget/Makefile @@ -40,10 +40,17 @@ $(M478_TARGET): $(M478_O_FILES) $(M478_LIBS) @python3 tools/lcf.py rel 478 --output $(M478_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M478_LDFLAGS) -o $(M478_TARGET) @build/M478_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hsTarget/%.o: rel/d/a/obj/d_a_obj_hsTarget/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_hsTarget/%.o: rel/d/a/obj/d_a_obj_hsTarget/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_hsTarget/%.d @echo [478] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M478_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M478_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M478_D_FILES := $(M478_O_FILES:.o=.d) +$(M478_D_FILES): +include $(wildcard $(M478_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ice_l/Makefile b/rel/d/a/obj/d_a_obj_ice_l/Makefile index 227dfc5f62..f5263c3963 100644 --- a/rel/d/a/obj/d_a_obj_ice_l/Makefile +++ b/rel/d/a/obj/d_a_obj_ice_l/Makefile @@ -38,10 +38,17 @@ $(M479_TARGET): $(M479_O_FILES) $(M479_LIBS) @python3 tools/lcf.py rel 479 --output $(M479_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M479_LDFLAGS) -o $(M479_TARGET) @build/M479_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ice_l/%.o: rel/d/a/obj/d_a_obj_ice_l/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ice_l/%.o: rel/d/a/obj/d_a_obj_ice_l/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ice_l/%.d @echo [479] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M479_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M479_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M479_D_FILES := $(M479_O_FILES:.o=.d) +$(M479_D_FILES): +include $(wildcard $(M479_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ice_s/Makefile b/rel/d/a/obj/d_a_obj_ice_s/Makefile index 38bc7e6e91..b4959ab90a 100644 --- a/rel/d/a/obj/d_a_obj_ice_s/Makefile +++ b/rel/d/a/obj/d_a_obj_ice_s/Makefile @@ -40,10 +40,17 @@ $(M480_TARGET): $(M480_O_FILES) $(M480_LIBS) @python3 tools/lcf.py rel 480 --output $(M480_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M480_LDFLAGS) -o $(M480_TARGET) @build/M480_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ice_s/%.o: rel/d/a/obj/d_a_obj_ice_s/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ice_s/%.o: rel/d/a/obj/d_a_obj_ice_s/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ice_s/%.d @echo [480] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M480_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M480_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M480_D_FILES := $(M480_O_FILES:.o=.d) +$(M480_D_FILES): +include $(wildcard $(M480_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_iceblock/Makefile b/rel/d/a/obj/d_a_obj_iceblock/Makefile index 55716e2ebe..758b58a169 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/Makefile +++ b/rel/d/a/obj/d_a_obj_iceblock/Makefile @@ -40,10 +40,17 @@ $(M481_TARGET): $(M481_O_FILES) $(M481_LIBS) @python3 tools/lcf.py rel 481 --output $(M481_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M481_LDFLAGS) -o $(M481_TARGET) @build/M481_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceblock/%.o: rel/d/a/obj/d_a_obj_iceblock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceblock/%.o: rel/d/a/obj/d_a_obj_iceblock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceblock/%.d @echo [481] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M481_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M481_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M481_D_FILES := $(M481_O_FILES:.o=.d) +$(M481_D_FILES): +include $(wildcard $(M481_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_iceleaf/Makefile b/rel/d/a/obj/d_a_obj_iceleaf/Makefile index d784fa6b00..b1d53a18cf 100644 --- a/rel/d/a/obj/d_a_obj_iceleaf/Makefile +++ b/rel/d/a/obj/d_a_obj_iceleaf/Makefile @@ -40,10 +40,17 @@ $(M482_TARGET): $(M482_O_FILES) $(M482_LIBS) @python3 tools/lcf.py rel 482 --output $(M482_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M482_LDFLAGS) -o $(M482_TARGET) @build/M482_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceleaf/%.o: rel/d/a/obj/d_a_obj_iceleaf/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceleaf/%.o: rel/d/a/obj/d_a_obj_iceleaf/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceleaf/%.d @echo [482] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M482_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M482_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M482_D_FILES := $(M482_O_FILES:.o=.d) +$(M482_D_FILES): +include $(wildcard $(M482_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ihasi/Makefile b/rel/d/a/obj/d_a_obj_ihasi/Makefile index 08c1b9292c..d316ba5bf7 100644 --- a/rel/d/a/obj/d_a_obj_ihasi/Makefile +++ b/rel/d/a/obj/d_a_obj_ihasi/Makefile @@ -38,10 +38,17 @@ $(M483_TARGET): $(M483_O_FILES) $(M483_LIBS) @python3 tools/lcf.py rel 483 --output $(M483_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M483_LDFLAGS) -o $(M483_TARGET) @build/M483_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ihasi/%.o: rel/d/a/obj/d_a_obj_ihasi/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ihasi/%.o: rel/d/a/obj/d_a_obj_ihasi/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ihasi/%.d @echo [483] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M483_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M483_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M483_D_FILES := $(M483_O_FILES:.o=.d) +$(M483_D_FILES): +include $(wildcard $(M483_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ikada/Makefile b/rel/d/a/obj/d_a_obj_ikada/Makefile index c6fbd99114..72ec941b6b 100644 --- a/rel/d/a/obj/d_a_obj_ikada/Makefile +++ b/rel/d/a/obj/d_a_obj_ikada/Makefile @@ -38,10 +38,17 @@ $(M484_TARGET): $(M484_O_FILES) $(M484_LIBS) @python3 tools/lcf.py rel 484 --output $(M484_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M484_LDFLAGS) -o $(M484_TARGET) @build/M484_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ikada/%.o: rel/d/a/obj/d_a_obj_ikada/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ikada/%.o: rel/d/a/obj/d_a_obj_ikada/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ikada/%.d @echo [484] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M484_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M484_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M484_D_FILES := $(M484_O_FILES:.o=.d) +$(M484_D_FILES): +include $(wildcard $(M484_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_inobone/Makefile b/rel/d/a/obj/d_a_obj_inobone/Makefile index ec88ab9f30..a69db05060 100644 --- a/rel/d/a/obj/d_a_obj_inobone/Makefile +++ b/rel/d/a/obj/d_a_obj_inobone/Makefile @@ -38,10 +38,17 @@ $(M485_TARGET): $(M485_O_FILES) $(M485_LIBS) @python3 tools/lcf.py rel 485 --output $(M485_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M485_LDFLAGS) -o $(M485_TARGET) @build/M485_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_inobone/%.o: rel/d/a/obj/d_a_obj_inobone/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_inobone/%.o: rel/d/a/obj/d_a_obj_inobone/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_inobone/%.d @echo [485] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M485_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M485_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M485_D_FILES := $(M485_O_FILES:.o=.d) +$(M485_D_FILES): +include $(wildcard $(M485_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ita/Makefile b/rel/d/a/obj/d_a_obj_ita/Makefile index 1568136f86..18ab8d2986 100644 --- a/rel/d/a/obj/d_a_obj_ita/Makefile +++ b/rel/d/a/obj/d_a_obj_ita/Makefile @@ -40,10 +40,17 @@ $(M486_TARGET): $(M486_O_FILES) $(M486_LIBS) @python3 tools/lcf.py rel 486 --output $(M486_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M486_LDFLAGS) -o $(M486_TARGET) @build/M486_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ita/%.o: rel/d/a/obj/d_a_obj_ita/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ita/%.o: rel/d/a/obj/d_a_obj_ita/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ita/%.d @echo [486] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M486_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M486_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M486_D_FILES := $(M486_O_FILES:.o=.d) +$(M486_D_FILES): +include $(wildcard $(M486_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_itamato/Makefile b/rel/d/a/obj/d_a_obj_itamato/Makefile index 0203bef38b..0aaf700b2a 100644 --- a/rel/d/a/obj/d_a_obj_itamato/Makefile +++ b/rel/d/a/obj/d_a_obj_itamato/Makefile @@ -40,10 +40,17 @@ $(M487_TARGET): $(M487_O_FILES) $(M487_LIBS) @python3 tools/lcf.py rel 487 --output $(M487_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M487_LDFLAGS) -o $(M487_TARGET) @build/M487_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_itamato/%.o: rel/d/a/obj/d_a_obj_itamato/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_itamato/%.o: rel/d/a/obj/d_a_obj_itamato/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_itamato/%.d @echo [487] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M487_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M487_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M487_D_FILES := $(M487_O_FILES:.o=.d) +$(M487_D_FILES): +include $(wildcard $(M487_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ito/Makefile b/rel/d/a/obj/d_a_obj_ito/Makefile index bb5c900fca..70ade9f393 100644 --- a/rel/d/a/obj/d_a_obj_ito/Makefile +++ b/rel/d/a/obj/d_a_obj_ito/Makefile @@ -40,10 +40,17 @@ $(M19_TARGET): $(M19_O_FILES) $(M19_LIBS) @python3 tools/lcf.py rel 19 --output $(M19_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M19_LDFLAGS) -o $(M19_TARGET) @build/M19_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ito/%.o: rel/d/a/obj/d_a_obj_ito/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ito/%.o: rel/d/a/obj/d_a_obj_ito/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ito/%.d @echo [ 19] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M19_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M19_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M19_D_FILES := $(M19_O_FILES:.o=.d) +$(M19_D_FILES): +include $(wildcard $(M19_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kabuto/Makefile b/rel/d/a/obj/d_a_obj_kabuto/Makefile index 94dae93e69..3440f2fdac 100644 --- a/rel/d/a/obj/d_a_obj_kabuto/Makefile +++ b/rel/d/a/obj/d_a_obj_kabuto/Makefile @@ -40,10 +40,17 @@ $(M488_TARGET): $(M488_O_FILES) $(M488_LIBS) @python3 tools/lcf.py rel 488 --output $(M488_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M488_LDFLAGS) -o $(M488_TARGET) @build/M488_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kabuto/%.o: rel/d/a/obj/d_a_obj_kabuto/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kabuto/%.o: rel/d/a/obj/d_a_obj_kabuto/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kabuto/%.d @echo [488] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M488_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M488_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M488_D_FILES := $(M488_O_FILES:.o=.d) +$(M488_D_FILES): +include $(wildcard $(M488_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kag/Makefile b/rel/d/a/obj/d_a_obj_kag/Makefile index 6dc093268f..894463744c 100644 --- a/rel/d/a/obj/d_a_obj_kag/Makefile +++ b/rel/d/a/obj/d_a_obj_kag/Makefile @@ -40,10 +40,17 @@ $(M489_TARGET): $(M489_O_FILES) $(M489_LIBS) @python3 tools/lcf.py rel 489 --output $(M489_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M489_LDFLAGS) -o $(M489_TARGET) @build/M489_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kag/%.o: rel/d/a/obj/d_a_obj_kag/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kag/%.o: rel/d/a/obj/d_a_obj_kag/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kag/%.d @echo [489] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M489_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M489_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M489_D_FILES := $(M489_O_FILES:.o=.d) +$(M489_D_FILES): +include $(wildcard $(M489_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kage/Makefile b/rel/d/a/obj/d_a_obj_kage/Makefile index 494057cffa..130f44705c 100644 --- a/rel/d/a/obj/d_a_obj_kage/Makefile +++ b/rel/d/a/obj/d_a_obj_kage/Makefile @@ -38,10 +38,17 @@ $(M490_TARGET): $(M490_O_FILES) $(M490_LIBS) @python3 tools/lcf.py rel 490 --output $(M490_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M490_LDFLAGS) -o $(M490_TARGET) @build/M490_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kage/%.o: rel/d/a/obj/d_a_obj_kage/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kage/%.o: rel/d/a/obj/d_a_obj_kage/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kage/%.d @echo [490] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M490_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M490_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M490_D_FILES := $(M490_O_FILES:.o=.d) +$(M490_D_FILES): +include $(wildcard $(M490_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kago/Makefile b/rel/d/a/obj/d_a_obj_kago/Makefile index fb9653b1fe..61022c81d4 100644 --- a/rel/d/a/obj/d_a_obj_kago/Makefile +++ b/rel/d/a/obj/d_a_obj_kago/Makefile @@ -40,10 +40,17 @@ $(M491_TARGET): $(M491_O_FILES) $(M491_LIBS) @python3 tools/lcf.py rel 491 --output $(M491_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M491_LDFLAGS) -o $(M491_TARGET) @build/M491_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kago/%.o: rel/d/a/obj/d_a_obj_kago/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kago/%.o: rel/d/a/obj/d_a_obj_kago/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kago/%.d @echo [491] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M491_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M491_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M491_D_FILES := $(M491_O_FILES:.o=.d) +$(M491_D_FILES): +include $(wildcard $(M491_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kaisou/Makefile b/rel/d/a/obj/d_a_obj_kaisou/Makefile index fa291d66c8..8be39e48b3 100644 --- a/rel/d/a/obj/d_a_obj_kaisou/Makefile +++ b/rel/d/a/obj/d_a_obj_kaisou/Makefile @@ -38,10 +38,17 @@ $(M492_TARGET): $(M492_O_FILES) $(M492_LIBS) @python3 tools/lcf.py rel 492 --output $(M492_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M492_LDFLAGS) -o $(M492_TARGET) @build/M492_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kaisou/%.o: rel/d/a/obj/d_a_obj_kaisou/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kaisou/%.o: rel/d/a/obj/d_a_obj_kaisou/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kaisou/%.d @echo [492] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M492_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M492_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M492_D_FILES := $(M492_O_FILES:.o=.d) +$(M492_D_FILES): +include $(wildcard $(M492_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kamakiri/Makefile b/rel/d/a/obj/d_a_obj_kamakiri/Makefile index 3ff11730b0..a2c47cd3c4 100644 --- a/rel/d/a/obj/d_a_obj_kamakiri/Makefile +++ b/rel/d/a/obj/d_a_obj_kamakiri/Makefile @@ -40,10 +40,17 @@ $(M493_TARGET): $(M493_O_FILES) $(M493_LIBS) @python3 tools/lcf.py rel 493 --output $(M493_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M493_LDFLAGS) -o $(M493_TARGET) @build/M493_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kamakiri/%.o: rel/d/a/obj/d_a_obj_kamakiri/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kamakiri/%.o: rel/d/a/obj/d_a_obj_kamakiri/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kamakiri/%.d @echo [493] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M493_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M493_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M493_D_FILES := $(M493_O_FILES:.o=.d) +$(M493_D_FILES): +include $(wildcard $(M493_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kanban2/Makefile b/rel/d/a/obj/d_a_obj_kanban2/Makefile index 4f9712ec3b..f1cc4f6799 100644 --- a/rel/d/a/obj/d_a_obj_kanban2/Makefile +++ b/rel/d/a/obj/d_a_obj_kanban2/Makefile @@ -40,10 +40,17 @@ $(M98_TARGET): $(M98_O_FILES) $(M98_LIBS) @python3 tools/lcf.py rel 98 --output $(M98_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M98_LDFLAGS) -o $(M98_TARGET) @build/M98_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kanban2/%.o: rel/d/a/obj/d_a_obj_kanban2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kanban2/%.o: rel/d/a/obj/d_a_obj_kanban2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kanban2/%.d @echo [ 98] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M98_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M98_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M98_D_FILES := $(M98_O_FILES:.o=.d) +$(M98_D_FILES): +include $(wildcard $(M98_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kantera/Makefile b/rel/d/a/obj/d_a_obj_kantera/Makefile index d846652042..a54b4f0015 100644 --- a/rel/d/a/obj/d_a_obj_kantera/Makefile +++ b/rel/d/a/obj/d_a_obj_kantera/Makefile @@ -40,10 +40,17 @@ $(M494_TARGET): $(M494_O_FILES) $(M494_LIBS) @python3 tools/lcf.py rel 494 --output $(M494_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M494_LDFLAGS) -o $(M494_TARGET) @build/M494_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kantera/%.o: rel/d/a/obj/d_a_obj_kantera/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kantera/%.o: rel/d/a/obj/d_a_obj_kantera/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kantera/%.d @echo [494] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M494_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M494_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M494_D_FILES := $(M494_O_FILES:.o=.d) +$(M494_D_FILES): +include $(wildcard $(M494_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_katatsumuri/Makefile b/rel/d/a/obj/d_a_obj_katatsumuri/Makefile index a870356be4..44802afae9 100644 --- a/rel/d/a/obj/d_a_obj_katatsumuri/Makefile +++ b/rel/d/a/obj/d_a_obj_katatsumuri/Makefile @@ -40,10 +40,17 @@ $(M495_TARGET): $(M495_O_FILES) $(M495_LIBS) @python3 tools/lcf.py rel 495 --output $(M495_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M495_LDFLAGS) -o $(M495_TARGET) @build/M495_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_katatsumuri/%.o: rel/d/a/obj/d_a_obj_katatsumuri/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_katatsumuri/%.o: rel/d/a/obj/d_a_obj_katatsumuri/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_katatsumuri/%.d @echo [495] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M495_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M495_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M495_D_FILES := $(M495_O_FILES:.o=.d) +$(M495_D_FILES): +include $(wildcard $(M495_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kazeneko/Makefile b/rel/d/a/obj/d_a_obj_kazeneko/Makefile index 61fc9334e9..bab4fa9c93 100644 --- a/rel/d/a/obj/d_a_obj_kazeneko/Makefile +++ b/rel/d/a/obj/d_a_obj_kazeneko/Makefile @@ -38,10 +38,17 @@ $(M496_TARGET): $(M496_O_FILES) $(M496_LIBS) @python3 tools/lcf.py rel 496 --output $(M496_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M496_LDFLAGS) -o $(M496_TARGET) @build/M496_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kazeneko/%.o: rel/d/a/obj/d_a_obj_kazeneko/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kazeneko/%.o: rel/d/a/obj/d_a_obj_kazeneko/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kazeneko/%.d @echo [496] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M496_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M496_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M496_D_FILES := $(M496_O_FILES:.o=.d) +$(M496_D_FILES): +include $(wildcard $(M496_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kbacket/Makefile b/rel/d/a/obj/d_a_obj_kbacket/Makefile index f96c38ce1a..489d982974 100644 --- a/rel/d/a/obj/d_a_obj_kbacket/Makefile +++ b/rel/d/a/obj/d_a_obj_kbacket/Makefile @@ -40,10 +40,17 @@ $(M99_TARGET): $(M99_O_FILES) $(M99_LIBS) @python3 tools/lcf.py rel 99 --output $(M99_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M99_LDFLAGS) -o $(M99_TARGET) @build/M99_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kbacket/%.o: rel/d/a/obj/d_a_obj_kbacket/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kbacket/%.o: rel/d/a/obj/d_a_obj_kbacket/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kbacket/%.d @echo [ 99] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M99_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M99_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M99_D_FILES := $(M99_O_FILES:.o=.d) +$(M99_D_FILES): +include $(wildcard $(M99_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kbox/Makefile b/rel/d/a/obj/d_a_obj_kbox/Makefile index cacf4d1346..bfb4a4a565 100644 --- a/rel/d/a/obj/d_a_obj_kbox/Makefile +++ b/rel/d/a/obj/d_a_obj_kbox/Makefile @@ -40,10 +40,17 @@ $(M497_TARGET): $(M497_O_FILES) $(M497_LIBS) @python3 tools/lcf.py rel 497 --output $(M497_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M497_LDFLAGS) -o $(M497_TARGET) @build/M497_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kbox/%.o: rel/d/a/obj/d_a_obj_kbox/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kbox/%.o: rel/d/a/obj/d_a_obj_kbox/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kbox/%.d @echo [497] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M497_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M497_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M497_D_FILES := $(M497_O_FILES:.o=.d) +$(M497_D_FILES): +include $(wildcard $(M497_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_key/Makefile b/rel/d/a/obj/d_a_obj_key/Makefile index 53e8c06f2c..ba43c9ead1 100644 --- a/rel/d/a/obj/d_a_obj_key/Makefile +++ b/rel/d/a/obj/d_a_obj_key/Makefile @@ -40,10 +40,17 @@ $(M498_TARGET): $(M498_O_FILES) $(M498_LIBS) @python3 tools/lcf.py rel 498 --output $(M498_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M498_LDFLAGS) -o $(M498_TARGET) @build/M498_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_key/%.o: rel/d/a/obj/d_a_obj_key/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_key/%.o: rel/d/a/obj/d_a_obj_key/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_key/%.d @echo [498] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M498_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M498_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M498_D_FILES := $(M498_O_FILES:.o=.d) +$(M498_D_FILES): +include $(wildcard $(M498_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_keyhole/Makefile b/rel/d/a/obj/d_a_obj_keyhole/Makefile index dee9642f48..504339a62e 100644 --- a/rel/d/a/obj/d_a_obj_keyhole/Makefile +++ b/rel/d/a/obj/d_a_obj_keyhole/Makefile @@ -40,10 +40,17 @@ $(M499_TARGET): $(M499_O_FILES) $(M499_LIBS) @python3 tools/lcf.py rel 499 --output $(M499_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M499_LDFLAGS) -o $(M499_TARGET) @build/M499_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_keyhole/%.o: rel/d/a/obj/d_a_obj_keyhole/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_keyhole/%.o: rel/d/a/obj/d_a_obj_keyhole/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_keyhole/%.d @echo [499] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M499_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M499_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M499_D_FILES := $(M499_O_FILES:.o=.d) +$(M499_D_FILES): +include $(wildcard $(M499_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kgate/Makefile b/rel/d/a/obj/d_a_obj_kgate/Makefile index 8388d113a7..abdc1258bf 100644 --- a/rel/d/a/obj/d_a_obj_kgate/Makefile +++ b/rel/d/a/obj/d_a_obj_kgate/Makefile @@ -40,10 +40,17 @@ $(M100_TARGET): $(M100_O_FILES) $(M100_LIBS) @python3 tools/lcf.py rel 100 --output $(M100_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M100_LDFLAGS) -o $(M100_TARGET) @build/M100_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kgate/%.o: rel/d/a/obj/d_a_obj_kgate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kgate/%.o: rel/d/a/obj/d_a_obj_kgate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kgate/%.d @echo [100] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M100_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M100_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M100_D_FILES := $(M100_O_FILES:.o=.d) +$(M100_D_FILES): +include $(wildcard $(M100_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ki/Makefile b/rel/d/a/obj/d_a_obj_ki/Makefile index 17ec8562d5..b55a4cb249 100644 --- a/rel/d/a/obj/d_a_obj_ki/Makefile +++ b/rel/d/a/obj/d_a_obj_ki/Makefile @@ -40,10 +40,17 @@ $(M500_TARGET): $(M500_O_FILES) $(M500_LIBS) @python3 tools/lcf.py rel 500 --output $(M500_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M500_LDFLAGS) -o $(M500_TARGET) @build/M500_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ki/%.o: rel/d/a/obj/d_a_obj_ki/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ki/%.o: rel/d/a/obj/d_a_obj_ki/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ki/%.d @echo [500] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M500_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M500_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M500_D_FILES := $(M500_O_FILES:.o=.d) +$(M500_D_FILES): +include $(wildcard $(M500_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kiPot/Makefile b/rel/d/a/obj/d_a_obj_kiPot/Makefile index 70f445642b..d03a20f4bd 100644 --- a/rel/d/a/obj/d_a_obj_kiPot/Makefile +++ b/rel/d/a/obj/d_a_obj_kiPot/Makefile @@ -40,10 +40,17 @@ $(M501_TARGET): $(M501_O_FILES) $(M501_LIBS) @python3 tools/lcf.py rel 501 --output $(M501_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M501_LDFLAGS) -o $(M501_TARGET) @build/M501_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kiPot/%.o: rel/d/a/obj/d_a_obj_kiPot/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kiPot/%.o: rel/d/a/obj/d_a_obj_kiPot/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kiPot/%.d @echo [501] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M501_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M501_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M501_D_FILES := $(M501_O_FILES:.o=.d) +$(M501_D_FILES): +include $(wildcard $(M501_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kita/Makefile b/rel/d/a/obj/d_a_obj_kita/Makefile index 04613f0d59..ec4e5594a0 100644 --- a/rel/d/a/obj/d_a_obj_kita/Makefile +++ b/rel/d/a/obj/d_a_obj_kita/Makefile @@ -40,10 +40,17 @@ $(M502_TARGET): $(M502_O_FILES) $(M502_LIBS) @python3 tools/lcf.py rel 502 --output $(M502_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M502_LDFLAGS) -o $(M502_TARGET) @build/M502_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kita/%.o: rel/d/a/obj/d_a_obj_kita/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kita/%.o: rel/d/a/obj/d_a_obj_kita/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kita/%.d @echo [502] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M502_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M502_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M502_D_FILES := $(M502_O_FILES:.o=.d) +$(M502_D_FILES): +include $(wildcard $(M502_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kjgjs/Makefile b/rel/d/a/obj/d_a_obj_kjgjs/Makefile index 6395fd495c..b1058dc8b6 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/Makefile +++ b/rel/d/a/obj/d_a_obj_kjgjs/Makefile @@ -38,10 +38,17 @@ $(M503_TARGET): $(M503_O_FILES) $(M503_LIBS) @python3 tools/lcf.py rel 503 --output $(M503_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M503_LDFLAGS) -o $(M503_TARGET) @build/M503_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kjgjs/%.o: rel/d/a/obj/d_a_obj_kjgjs/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kjgjs/%.o: rel/d/a/obj/d_a_obj_kjgjs/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kjgjs/%.d @echo [503] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M503_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M503_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M503_D_FILES := $(M503_O_FILES:.o=.d) +$(M503_D_FILES): +include $(wildcard $(M503_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kkanban/Makefile b/rel/d/a/obj/d_a_obj_kkanban/Makefile index 53ea20e94e..8f7c261881 100644 --- a/rel/d/a/obj/d_a_obj_kkanban/Makefile +++ b/rel/d/a/obj/d_a_obj_kkanban/Makefile @@ -38,10 +38,17 @@ $(M504_TARGET): $(M504_O_FILES) $(M504_LIBS) @python3 tools/lcf.py rel 504 --output $(M504_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M504_LDFLAGS) -o $(M504_TARGET) @build/M504_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kkanban/%.o: rel/d/a/obj/d_a_obj_kkanban/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kkanban/%.o: rel/d/a/obj/d_a_obj_kkanban/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kkanban/%.d @echo [504] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M504_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M504_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M504_D_FILES := $(M504_O_FILES:.o=.d) +$(M504_D_FILES): +include $(wildcard $(M504_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_klift00/Makefile b/rel/d/a/obj/d_a_obj_klift00/Makefile index 5ead397f84..da361ef339 100644 --- a/rel/d/a/obj/d_a_obj_klift00/Makefile +++ b/rel/d/a/obj/d_a_obj_klift00/Makefile @@ -38,10 +38,17 @@ $(M101_TARGET): $(M101_O_FILES) $(M101_LIBS) @python3 tools/lcf.py rel 101 --output $(M101_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M101_LDFLAGS) -o $(M101_TARGET) @build/M101_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_klift00/%.o: rel/d/a/obj/d_a_obj_klift00/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_klift00/%.o: rel/d/a/obj/d_a_obj_klift00/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_klift00/%.d @echo [101] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M101_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M101_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M101_D_FILES := $(M101_O_FILES:.o=.d) +$(M101_D_FILES): +include $(wildcard $(M101_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_knBullet/Makefile b/rel/d/a/obj/d_a_obj_knBullet/Makefile index d9717337f2..1a4a2a57b4 100644 --- a/rel/d/a/obj/d_a_obj_knBullet/Makefile +++ b/rel/d/a/obj/d_a_obj_knBullet/Makefile @@ -38,10 +38,17 @@ $(M505_TARGET): $(M505_O_FILES) $(M505_LIBS) @python3 tools/lcf.py rel 505 --output $(M505_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M505_LDFLAGS) -o $(M505_TARGET) @build/M505_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_knBullet/%.o: rel/d/a/obj/d_a_obj_knBullet/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_knBullet/%.o: rel/d/a/obj/d_a_obj_knBullet/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_knBullet/%.d @echo [505] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M505_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M505_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M505_D_FILES := $(M505_O_FILES:.o=.d) +$(M505_D_FILES): +include $(wildcard $(M505_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kshutter/Makefile b/rel/d/a/obj/d_a_obj_kshutter/Makefile index ef0071149b..7bd0c972eb 100644 --- a/rel/d/a/obj/d_a_obj_kshutter/Makefile +++ b/rel/d/a/obj/d_a_obj_kshutter/Makefile @@ -40,10 +40,17 @@ $(M506_TARGET): $(M506_O_FILES) $(M506_LIBS) @python3 tools/lcf.py rel 506 --output $(M506_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M506_LDFLAGS) -o $(M506_TARGET) @build/M506_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kshutter/%.o: rel/d/a/obj/d_a_obj_kshutter/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kshutter/%.o: rel/d/a/obj/d_a_obj_kshutter/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kshutter/%.d @echo [506] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M506_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M506_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M506_D_FILES := $(M506_O_FILES:.o=.d) +$(M506_D_FILES): +include $(wildcard $(M506_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ktonfire/Makefile b/rel/d/a/obj/d_a_obj_ktonfire/Makefile index 7f4268ba43..2b70431496 100644 --- a/rel/d/a/obj/d_a_obj_ktonfire/Makefile +++ b/rel/d/a/obj/d_a_obj_ktonfire/Makefile @@ -40,10 +40,17 @@ $(M102_TARGET): $(M102_O_FILES) $(M102_LIBS) @python3 tools/lcf.py rel 102 --output $(M102_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M102_LDFLAGS) -o $(M102_TARGET) @build/M102_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ktonfire/%.o: rel/d/a/obj/d_a_obj_ktonfire/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ktonfire/%.o: rel/d/a/obj/d_a_obj_ktonfire/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ktonfire/%.d @echo [102] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M102_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M102_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M102_D_FILES := $(M102_O_FILES:.o=.d) +$(M102_D_FILES): +include $(wildcard $(M102_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kuwagata/Makefile b/rel/d/a/obj/d_a_obj_kuwagata/Makefile index 5b2be0dbd0..57a32a081e 100644 --- a/rel/d/a/obj/d_a_obj_kuwagata/Makefile +++ b/rel/d/a/obj/d_a_obj_kuwagata/Makefile @@ -40,10 +40,17 @@ $(M507_TARGET): $(M507_O_FILES) $(M507_LIBS) @python3 tools/lcf.py rel 507 --output $(M507_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M507_LDFLAGS) -o $(M507_TARGET) @build/M507_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kuwagata/%.o: rel/d/a/obj/d_a_obj_kuwagata/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kuwagata/%.o: rel/d/a/obj/d_a_obj_kuwagata/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kuwagata/%.d @echo [507] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M507_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M507_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M507_D_FILES := $(M507_O_FILES:.o=.d) +$(M507_D_FILES): +include $(wildcard $(M507_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kwheel00/Makefile b/rel/d/a/obj/d_a_obj_kwheel00/Makefile index 02e5f9d2e0..04cf1dd834 100644 --- a/rel/d/a/obj/d_a_obj_kwheel00/Makefile +++ b/rel/d/a/obj/d_a_obj_kwheel00/Makefile @@ -38,10 +38,17 @@ $(M508_TARGET): $(M508_O_FILES) $(M508_LIBS) @python3 tools/lcf.py rel 508 --output $(M508_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M508_LDFLAGS) -o $(M508_TARGET) @build/M508_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kwheel00/%.o: rel/d/a/obj/d_a_obj_kwheel00/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kwheel00/%.o: rel/d/a/obj/d_a_obj_kwheel00/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kwheel00/%.d @echo [508] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M508_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M508_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M508_D_FILES := $(M508_O_FILES:.o=.d) +$(M508_D_FILES): +include $(wildcard $(M508_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kwheel01/Makefile b/rel/d/a/obj/d_a_obj_kwheel01/Makefile index a42a4acf24..783cc30f20 100644 --- a/rel/d/a/obj/d_a_obj_kwheel01/Makefile +++ b/rel/d/a/obj/d_a_obj_kwheel01/Makefile @@ -38,10 +38,17 @@ $(M509_TARGET): $(M509_O_FILES) $(M509_LIBS) @python3 tools/lcf.py rel 509 --output $(M509_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M509_LDFLAGS) -o $(M509_TARGET) @build/M509_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kwheel01/%.o: rel/d/a/obj/d_a_obj_kwheel01/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kwheel01/%.o: rel/d/a/obj/d_a_obj_kwheel01/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kwheel01/%.d @echo [509] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M509_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M509_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M509_D_FILES := $(M509_O_FILES:.o=.d) +$(M509_D_FILES): +include $(wildcard $(M509_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_kznkarm/Makefile b/rel/d/a/obj/d_a_obj_kznkarm/Makefile index 3be92607dd..b8ed5947df 100644 --- a/rel/d/a/obj/d_a_obj_kznkarm/Makefile +++ b/rel/d/a/obj/d_a_obj_kznkarm/Makefile @@ -38,10 +38,17 @@ $(M510_TARGET): $(M510_O_FILES) $(M510_LIBS) @python3 tools/lcf.py rel 510 --output $(M510_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M510_LDFLAGS) -o $(M510_TARGET) @build/M510_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kznkarm/%.o: rel/d/a/obj/d_a_obj_kznkarm/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_kznkarm/%.o: rel/d/a/obj/d_a_obj_kznkarm/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_kznkarm/%.d @echo [510] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M510_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M510_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M510_D_FILES := $(M510_O_FILES:.o=.d) +$(M510_D_FILES): +include $(wildcard $(M510_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ladder/Makefile b/rel/d/a/obj/d_a_obj_ladder/Makefile index 4678800460..454a76a93a 100644 --- a/rel/d/a/obj/d_a_obj_ladder/Makefile +++ b/rel/d/a/obj/d_a_obj_ladder/Makefile @@ -38,10 +38,17 @@ $(M103_TARGET): $(M103_O_FILES) $(M103_LIBS) @python3 tools/lcf.py rel 103 --output $(M103_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M103_LDFLAGS) -o $(M103_TARGET) @build/M103_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ladder/%.o: rel/d/a/obj/d_a_obj_ladder/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ladder/%.o: rel/d/a/obj/d_a_obj_ladder/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ladder/%.d @echo [103] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M103_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M103_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M103_D_FILES := $(M103_O_FILES:.o=.d) +$(M103_D_FILES): +include $(wildcard $(M103_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_laundry/Makefile b/rel/d/a/obj/d_a_obj_laundry/Makefile index 3c3cd4970b..76244dd5b9 100644 --- a/rel/d/a/obj/d_a_obj_laundry/Makefile +++ b/rel/d/a/obj/d_a_obj_laundry/Makefile @@ -38,10 +38,17 @@ $(M511_TARGET): $(M511_O_FILES) $(M511_LIBS) @python3 tools/lcf.py rel 511 --output $(M511_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M511_LDFLAGS) -o $(M511_TARGET) @build/M511_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_laundry/%.o: rel/d/a/obj/d_a_obj_laundry/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_laundry/%.o: rel/d/a/obj/d_a_obj_laundry/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_laundry/%.d @echo [511] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M511_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M511_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M511_D_FILES := $(M511_O_FILES:.o=.d) +$(M511_D_FILES): +include $(wildcard $(M511_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_laundry_rope/Makefile b/rel/d/a/obj/d_a_obj_laundry_rope/Makefile index f79486d4a0..5897bb2f71 100644 --- a/rel/d/a/obj/d_a_obj_laundry_rope/Makefile +++ b/rel/d/a/obj/d_a_obj_laundry_rope/Makefile @@ -38,10 +38,17 @@ $(M512_TARGET): $(M512_O_FILES) $(M512_LIBS) @python3 tools/lcf.py rel 512 --output $(M512_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M512_LDFLAGS) -o $(M512_TARGET) @build/M512_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_laundry_rope/%.o: rel/d/a/obj/d_a_obj_laundry_rope/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_laundry_rope/%.o: rel/d/a/obj/d_a_obj_laundry_rope/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_laundry_rope/%.d @echo [512] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M512_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M512_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M512_D_FILES := $(M512_O_FILES:.o=.d) +$(M512_D_FILES): +include $(wildcard $(M512_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lbox/Makefile b/rel/d/a/obj/d_a_obj_lbox/Makefile index ece53dcdac..eefadca40a 100644 --- a/rel/d/a/obj/d_a_obj_lbox/Makefile +++ b/rel/d/a/obj/d_a_obj_lbox/Makefile @@ -40,10 +40,17 @@ $(M513_TARGET): $(M513_O_FILES) $(M513_LIBS) @python3 tools/lcf.py rel 513 --output $(M513_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M513_LDFLAGS) -o $(M513_TARGET) @build/M513_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lbox/%.o: rel/d/a/obj/d_a_obj_lbox/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lbox/%.o: rel/d/a/obj/d_a_obj_lbox/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lbox/%.d @echo [513] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M513_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M513_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M513_D_FILES := $(M513_O_FILES:.o=.d) +$(M513_D_FILES): +include $(wildcard $(M513_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_life_container/Makefile b/rel/d/a/obj/d_a_obj_life_container/Makefile index 4cb9d57125..7b8af50a78 100644 --- a/rel/d/a/obj/d_a_obj_life_container/Makefile +++ b/rel/d/a/obj/d_a_obj_life_container/Makefile @@ -40,10 +40,17 @@ $(M53_TARGET): $(M53_O_FILES) $(M53_LIBS) @python3 tools/lcf.py rel 53 --output $(M53_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M53_LDFLAGS) -o $(M53_TARGET) @build/M53_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_life_container/%.o: rel/d/a/obj/d_a_obj_life_container/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_life_container/%.o: rel/d/a/obj/d_a_obj_life_container/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_life_container/%.d @echo [ 53] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M53_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M53_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M53_D_FILES := $(M53_O_FILES:.o=.d) +$(M53_D_FILES): +include $(wildcard $(M53_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lp/Makefile b/rel/d/a/obj/d_a_obj_lp/Makefile index 00c86cab59..04be1e373a 100644 --- a/rel/d/a/obj/d_a_obj_lp/Makefile +++ b/rel/d/a/obj/d_a_obj_lp/Makefile @@ -38,10 +38,17 @@ $(M514_TARGET): $(M514_O_FILES) $(M514_LIBS) @python3 tools/lcf.py rel 514 --output $(M514_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M514_LDFLAGS) -o $(M514_TARGET) @build/M514_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lp/%.o: rel/d/a/obj/d_a_obj_lp/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lp/%.o: rel/d/a/obj/d_a_obj_lp/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lp/%.d @echo [514] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M514_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M514_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M514_D_FILES := $(M514_O_FILES:.o=.d) +$(M514_D_FILES): +include $(wildcard $(M514_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv1Candle00/Makefile b/rel/d/a/obj/d_a_obj_lv1Candle00/Makefile index 41977bfebd..d7602bbde7 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle00/Makefile +++ b/rel/d/a/obj/d_a_obj_lv1Candle00/Makefile @@ -40,10 +40,17 @@ $(M515_TARGET): $(M515_O_FILES) $(M515_LIBS) @python3 tools/lcf.py rel 515 --output $(M515_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M515_LDFLAGS) -o $(M515_TARGET) @build/M515_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv1Candle00/%.o: rel/d/a/obj/d_a_obj_lv1Candle00/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv1Candle00/%.o: rel/d/a/obj/d_a_obj_lv1Candle00/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv1Candle00/%.d @echo [515] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M515_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M515_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M515_D_FILES := $(M515_O_FILES:.o=.d) +$(M515_D_FILES): +include $(wildcard $(M515_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv1Candle01/Makefile b/rel/d/a/obj/d_a_obj_lv1Candle01/Makefile index ba4bf8a574..db0f388def 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle01/Makefile +++ b/rel/d/a/obj/d_a_obj_lv1Candle01/Makefile @@ -40,10 +40,17 @@ $(M516_TARGET): $(M516_O_FILES) $(M516_LIBS) @python3 tools/lcf.py rel 516 --output $(M516_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M516_LDFLAGS) -o $(M516_TARGET) @build/M516_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv1Candle01/%.o: rel/d/a/obj/d_a_obj_lv1Candle01/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv1Candle01/%.o: rel/d/a/obj/d_a_obj_lv1Candle01/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv1Candle01/%.d @echo [516] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M516_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M516_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M516_D_FILES := $(M516_O_FILES:.o=.d) +$(M516_D_FILES): +include $(wildcard $(M516_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv2candle/Makefile b/rel/d/a/obj/d_a_obj_lv2candle/Makefile index 1a335a68ff..e4838d6d4b 100644 --- a/rel/d/a/obj/d_a_obj_lv2candle/Makefile +++ b/rel/d/a/obj/d_a_obj_lv2candle/Makefile @@ -40,10 +40,17 @@ $(M104_TARGET): $(M104_O_FILES) $(M104_LIBS) @python3 tools/lcf.py rel 104 --output $(M104_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M104_LDFLAGS) -o $(M104_TARGET) @build/M104_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv2candle/%.o: rel/d/a/obj/d_a_obj_lv2candle/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv2candle/%.o: rel/d/a/obj/d_a_obj_lv2candle/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv2candle/%.d @echo [104] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M104_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M104_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M104_D_FILES := $(M104_O_FILES:.o=.d) +$(M104_D_FILES): +include $(wildcard $(M104_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv3Candle/Makefile b/rel/d/a/obj/d_a_obj_lv3Candle/Makefile index 7c28749d8d..ad9258afec 100644 --- a/rel/d/a/obj/d_a_obj_lv3Candle/Makefile +++ b/rel/d/a/obj/d_a_obj_lv3Candle/Makefile @@ -40,10 +40,17 @@ $(M517_TARGET): $(M517_O_FILES) $(M517_LIBS) @python3 tools/lcf.py rel 517 --output $(M517_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M517_LDFLAGS) -o $(M517_TARGET) @build/M517_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3Candle/%.o: rel/d/a/obj/d_a_obj_lv3Candle/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3Candle/%.o: rel/d/a/obj/d_a_obj_lv3Candle/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3Candle/%.d @echo [517] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M517_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M517_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M517_D_FILES := $(M517_O_FILES:.o=.d) +$(M517_D_FILES): +include $(wildcard $(M517_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv3Water/Makefile b/rel/d/a/obj/d_a_obj_lv3Water/Makefile index e3441286a2..2920c9ca7d 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water/Makefile +++ b/rel/d/a/obj/d_a_obj_lv3Water/Makefile @@ -40,10 +40,17 @@ $(M518_TARGET): $(M518_O_FILES) $(M518_LIBS) @python3 tools/lcf.py rel 518 --output $(M518_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M518_LDFLAGS) -o $(M518_TARGET) @build/M518_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3Water/%.o: rel/d/a/obj/d_a_obj_lv3Water/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3Water/%.o: rel/d/a/obj/d_a_obj_lv3Water/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3Water/%.d @echo [518] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M518_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M518_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M518_D_FILES := $(M518_O_FILES:.o=.d) +$(M518_D_FILES): +include $(wildcard $(M518_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv3Water2/Makefile b/rel/d/a/obj/d_a_obj_lv3Water2/Makefile index 69c24e4967..302fb4bf22 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water2/Makefile +++ b/rel/d/a/obj/d_a_obj_lv3Water2/Makefile @@ -40,10 +40,17 @@ $(M519_TARGET): $(M519_O_FILES) $(M519_LIBS) @python3 tools/lcf.py rel 519 --output $(M519_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M519_LDFLAGS) -o $(M519_TARGET) @build/M519_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3Water2/%.o: rel/d/a/obj/d_a_obj_lv3Water2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3Water2/%.o: rel/d/a/obj/d_a_obj_lv3Water2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3Water2/%.d @echo [519] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M519_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M519_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M519_D_FILES := $(M519_O_FILES:.o=.d) +$(M519_D_FILES): +include $(wildcard $(M519_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv3WaterB/Makefile b/rel/d/a/obj/d_a_obj_lv3WaterB/Makefile index ce9f6f6918..73ce327abf 100644 --- a/rel/d/a/obj/d_a_obj_lv3WaterB/Makefile +++ b/rel/d/a/obj/d_a_obj_lv3WaterB/Makefile @@ -38,10 +38,17 @@ $(M520_TARGET): $(M520_O_FILES) $(M520_LIBS) @python3 tools/lcf.py rel 520 --output $(M520_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M520_LDFLAGS) -o $(M520_TARGET) @build/M520_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3WaterB/%.o: rel/d/a/obj/d_a_obj_lv3WaterB/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3WaterB/%.o: rel/d/a/obj/d_a_obj_lv3WaterB/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3WaterB/%.d @echo [520] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M520_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M520_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M520_D_FILES := $(M520_O_FILES:.o=.d) +$(M520_D_FILES): +include $(wildcard $(M520_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv3saka00/Makefile b/rel/d/a/obj/d_a_obj_lv3saka00/Makefile index 0e195ad39a..eccf24443c 100644 --- a/rel/d/a/obj/d_a_obj_lv3saka00/Makefile +++ b/rel/d/a/obj/d_a_obj_lv3saka00/Makefile @@ -38,10 +38,17 @@ $(M521_TARGET): $(M521_O_FILES) $(M521_LIBS) @python3 tools/lcf.py rel 521 --output $(M521_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M521_LDFLAGS) -o $(M521_TARGET) @build/M521_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3saka00/%.o: rel/d/a/obj/d_a_obj_lv3saka00/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3saka00/%.o: rel/d/a/obj/d_a_obj_lv3saka00/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3saka00/%.d @echo [521] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M521_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M521_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M521_D_FILES := $(M521_O_FILES:.o=.d) +$(M521_D_FILES): +include $(wildcard $(M521_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/Makefile b/rel/d/a/obj/d_a_obj_lv3waterEff/Makefile index 948088828d..fd687c1ab5 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/Makefile +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/Makefile @@ -38,10 +38,17 @@ $(M522_TARGET): $(M522_O_FILES) $(M522_LIBS) @python3 tools/lcf.py rel 522 --output $(M522_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M522_LDFLAGS) -o $(M522_TARGET) @build/M522_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3waterEff/%.o: rel/d/a/obj/d_a_obj_lv3waterEff/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3waterEff/%.o: rel/d/a/obj/d_a_obj_lv3waterEff/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv3waterEff/%.d @echo [522] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M522_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M522_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M522_D_FILES := $(M522_O_FILES:.o=.d) +$(M522_D_FILES): +include $(wildcard $(M522_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/Makefile b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/Makefile index 11dc84d88c..d0bc88d54c 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/Makefile @@ -40,10 +40,17 @@ $(M523_TARGET): $(M523_O_FILES) $(M523_LIBS) @python3 tools/lcf.py rel 523 --output $(M523_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M523_LDFLAGS) -o $(M523_TARGET) @build/M523_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/%.o: rel/d/a/obj/d_a_obj_lv4CandleDemoTag/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/%.o: rel/d/a/obj/d_a_obj_lv4CandleDemoTag/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/%.d @echo [523] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M523_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M523_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M523_D_FILES := $(M523_O_FILES:.o=.d) +$(M523_D_FILES): +include $(wildcard $(M523_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4CandleTag/Makefile b/rel/d/a/obj/d_a_obj_lv4CandleTag/Makefile index 1e11de865a..590bc66f59 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleTag/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4CandleTag/Makefile @@ -40,10 +40,17 @@ $(M524_TARGET): $(M524_O_FILES) $(M524_LIBS) @python3 tools/lcf.py rel 524 --output $(M524_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M524_LDFLAGS) -o $(M524_TARGET) @build/M524_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4CandleTag/%.o: rel/d/a/obj/d_a_obj_lv4CandleTag/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4CandleTag/%.o: rel/d/a/obj/d_a_obj_lv4CandleTag/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4CandleTag/%.d @echo [524] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M524_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M524_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M524_D_FILES := $(M524_O_FILES:.o=.d) +$(M524_D_FILES): +include $(wildcard $(M524_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4EdShutter/Makefile b/rel/d/a/obj/d_a_obj_lv4EdShutter/Makefile index 811992b079..76be81e439 100644 --- a/rel/d/a/obj/d_a_obj_lv4EdShutter/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4EdShutter/Makefile @@ -40,10 +40,17 @@ $(M525_TARGET): $(M525_O_FILES) $(M525_LIBS) @python3 tools/lcf.py rel 525 --output $(M525_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M525_LDFLAGS) -o $(M525_TARGET) @build/M525_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4EdShutter/%.o: rel/d/a/obj/d_a_obj_lv4EdShutter/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4EdShutter/%.o: rel/d/a/obj/d_a_obj_lv4EdShutter/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4EdShutter/%.d @echo [525] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M525_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M525_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M525_D_FILES := $(M525_O_FILES:.o=.d) +$(M525_D_FILES): +include $(wildcard $(M525_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4Gate/Makefile b/rel/d/a/obj/d_a_obj_lv4Gate/Makefile index b2ac1670a9..1dd090f100 100644 --- a/rel/d/a/obj/d_a_obj_lv4Gate/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4Gate/Makefile @@ -40,10 +40,17 @@ $(M526_TARGET): $(M526_O_FILES) $(M526_LIBS) @python3 tools/lcf.py rel 526 --output $(M526_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M526_LDFLAGS) -o $(M526_TARGET) @build/M526_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4Gate/%.o: rel/d/a/obj/d_a_obj_lv4Gate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4Gate/%.o: rel/d/a/obj/d_a_obj_lv4Gate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4Gate/%.d @echo [526] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M526_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M526_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M526_D_FILES := $(M526_O_FILES:.o=.d) +$(M526_D_FILES): +include $(wildcard $(M526_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4HsTarget/Makefile b/rel/d/a/obj/d_a_obj_lv4HsTarget/Makefile index 0672c0a47e..da3b77b8fd 100644 --- a/rel/d/a/obj/d_a_obj_lv4HsTarget/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4HsTarget/Makefile @@ -40,10 +40,17 @@ $(M527_TARGET): $(M527_O_FILES) $(M527_LIBS) @python3 tools/lcf.py rel 527 --output $(M527_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M527_LDFLAGS) -o $(M527_TARGET) @build/M527_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4HsTarget/%.o: rel/d/a/obj/d_a_obj_lv4HsTarget/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4HsTarget/%.o: rel/d/a/obj/d_a_obj_lv4HsTarget/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4HsTarget/%.d @echo [527] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M527_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M527_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M527_D_FILES := $(M527_O_FILES:.o=.d) +$(M527_D_FILES): +include $(wildcard $(M527_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4PoGate/Makefile b/rel/d/a/obj/d_a_obj_lv4PoGate/Makefile index 5bba9f6c48..cef8c0816c 100644 --- a/rel/d/a/obj/d_a_obj_lv4PoGate/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4PoGate/Makefile @@ -40,10 +40,17 @@ $(M528_TARGET): $(M528_O_FILES) $(M528_LIBS) @python3 tools/lcf.py rel 528 --output $(M528_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M528_LDFLAGS) -o $(M528_TARGET) @build/M528_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4PoGate/%.o: rel/d/a/obj/d_a_obj_lv4PoGate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4PoGate/%.o: rel/d/a/obj/d_a_obj_lv4PoGate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4PoGate/%.d @echo [528] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M528_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M528_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M528_D_FILES := $(M528_O_FILES:.o=.d) +$(M528_D_FILES): +include $(wildcard $(M528_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4RailWall/Makefile b/rel/d/a/obj/d_a_obj_lv4RailWall/Makefile index c5ab99b132..360a2a5dee 100644 --- a/rel/d/a/obj/d_a_obj_lv4RailWall/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4RailWall/Makefile @@ -40,10 +40,17 @@ $(M529_TARGET): $(M529_O_FILES) $(M529_LIBS) @python3 tools/lcf.py rel 529 --output $(M529_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M529_LDFLAGS) -o $(M529_TARGET) @build/M529_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4RailWall/%.o: rel/d/a/obj/d_a_obj_lv4RailWall/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4RailWall/%.o: rel/d/a/obj/d_a_obj_lv4RailWall/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4RailWall/%.d @echo [529] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M529_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M529_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M529_D_FILES := $(M529_O_FILES:.o=.d) +$(M529_D_FILES): +include $(wildcard $(M529_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4SlideWall/Makefile b/rel/d/a/obj/d_a_obj_lv4SlideWall/Makefile index d0b6cceca5..496c55cdf2 100644 --- a/rel/d/a/obj/d_a_obj_lv4SlideWall/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4SlideWall/Makefile @@ -40,10 +40,17 @@ $(M530_TARGET): $(M530_O_FILES) $(M530_LIBS) @python3 tools/lcf.py rel 530 --output $(M530_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M530_LDFLAGS) -o $(M530_TARGET) @build/M530_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4SlideWall/%.o: rel/d/a/obj/d_a_obj_lv4SlideWall/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4SlideWall/%.o: rel/d/a/obj/d_a_obj_lv4SlideWall/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4SlideWall/%.d @echo [530] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M530_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M530_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M530_D_FILES := $(M530_O_FILES:.o=.d) +$(M530_D_FILES): +include $(wildcard $(M530_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4bridge/Makefile b/rel/d/a/obj/d_a_obj_lv4bridge/Makefile index da7a4a9e6f..0a11f63e2e 100644 --- a/rel/d/a/obj/d_a_obj_lv4bridge/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4bridge/Makefile @@ -40,10 +40,17 @@ $(M531_TARGET): $(M531_O_FILES) $(M531_LIBS) @python3 tools/lcf.py rel 531 --output $(M531_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M531_LDFLAGS) -o $(M531_TARGET) @build/M531_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4bridge/%.o: rel/d/a/obj/d_a_obj_lv4bridge/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4bridge/%.o: rel/d/a/obj/d_a_obj_lv4bridge/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4bridge/%.d @echo [531] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M531_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M531_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M531_D_FILES := $(M531_O_FILES:.o=.d) +$(M531_D_FILES): +include $(wildcard $(M531_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4chandelier/Makefile b/rel/d/a/obj/d_a_obj_lv4chandelier/Makefile index da85b4a6bd..06c1a1c0e3 100644 --- a/rel/d/a/obj/d_a_obj_lv4chandelier/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4chandelier/Makefile @@ -38,10 +38,17 @@ $(M532_TARGET): $(M532_O_FILES) $(M532_LIBS) @python3 tools/lcf.py rel 532 --output $(M532_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M532_LDFLAGS) -o $(M532_TARGET) @build/M532_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4chandelier/%.o: rel/d/a/obj/d_a_obj_lv4chandelier/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4chandelier/%.o: rel/d/a/obj/d_a_obj_lv4chandelier/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4chandelier/%.d @echo [532] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M532_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M532_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M532_D_FILES := $(M532_O_FILES:.o=.d) +$(M532_D_FILES): +include $(wildcard $(M532_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4digsand/Makefile b/rel/d/a/obj/d_a_obj_lv4digsand/Makefile index c02674e178..619934cf4e 100644 --- a/rel/d/a/obj/d_a_obj_lv4digsand/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4digsand/Makefile @@ -40,10 +40,17 @@ $(M533_TARGET): $(M533_O_FILES) $(M533_LIBS) @python3 tools/lcf.py rel 533 --output $(M533_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M533_LDFLAGS) -o $(M533_TARGET) @build/M533_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4digsand/%.o: rel/d/a/obj/d_a_obj_lv4digsand/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4digsand/%.o: rel/d/a/obj/d_a_obj_lv4digsand/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4digsand/%.d @echo [533] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M533_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M533_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M533_D_FILES := $(M533_O_FILES:.o=.d) +$(M533_D_FILES): +include $(wildcard $(M533_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4floor/Makefile b/rel/d/a/obj/d_a_obj_lv4floor/Makefile index b07137875b..1001d4137e 100644 --- a/rel/d/a/obj/d_a_obj_lv4floor/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4floor/Makefile @@ -40,10 +40,17 @@ $(M534_TARGET): $(M534_O_FILES) $(M534_LIBS) @python3 tools/lcf.py rel 534 --output $(M534_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M534_LDFLAGS) -o $(M534_TARGET) @build/M534_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4floor/%.o: rel/d/a/obj/d_a_obj_lv4floor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4floor/%.o: rel/d/a/obj/d_a_obj_lv4floor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4floor/%.d @echo [534] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M534_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M534_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M534_D_FILES := $(M534_O_FILES:.o=.d) +$(M534_D_FILES): +include $(wildcard $(M534_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4gear/Makefile b/rel/d/a/obj/d_a_obj_lv4gear/Makefile index e204e49f28..f6848bf631 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4gear/Makefile @@ -38,10 +38,17 @@ $(M535_TARGET): $(M535_O_FILES) $(M535_LIBS) @python3 tools/lcf.py rel 535 --output $(M535_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M535_LDFLAGS) -o $(M535_TARGET) @build/M535_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4gear/%.o: rel/d/a/obj/d_a_obj_lv4gear/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4gear/%.o: rel/d/a/obj/d_a_obj_lv4gear/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4gear/%.d @echo [535] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M535_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M535_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M535_D_FILES := $(M535_O_FILES:.o=.d) +$(M535_D_FILES): +include $(wildcard $(M535_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4prelvtr/Makefile b/rel/d/a/obj/d_a_obj_lv4prelvtr/Makefile index 4366a13685..3ef46414a6 100644 --- a/rel/d/a/obj/d_a_obj_lv4prelvtr/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4prelvtr/Makefile @@ -38,10 +38,17 @@ $(M536_TARGET): $(M536_O_FILES) $(M536_LIBS) @python3 tools/lcf.py rel 536 --output $(M536_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M536_LDFLAGS) -o $(M536_TARGET) @build/M536_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4prelvtr/%.o: rel/d/a/obj/d_a_obj_lv4prelvtr/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4prelvtr/%.o: rel/d/a/obj/d_a_obj_lv4prelvtr/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4prelvtr/%.d @echo [536] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M536_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M536_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M536_D_FILES := $(M536_O_FILES:.o=.d) +$(M536_D_FILES): +include $(wildcard $(M536_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4prwall/Makefile b/rel/d/a/obj/d_a_obj_lv4prwall/Makefile index fc10be0f0a..e22c72d7e4 100644 --- a/rel/d/a/obj/d_a_obj_lv4prwall/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4prwall/Makefile @@ -38,10 +38,17 @@ $(M537_TARGET): $(M537_O_FILES) $(M537_LIBS) @python3 tools/lcf.py rel 537 --output $(M537_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M537_LDFLAGS) -o $(M537_TARGET) @build/M537_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4prwall/%.o: rel/d/a/obj/d_a_obj_lv4prwall/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4prwall/%.o: rel/d/a/obj/d_a_obj_lv4prwall/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4prwall/%.d @echo [537] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M537_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M537_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M537_D_FILES := $(M537_O_FILES:.o=.d) +$(M537_D_FILES): +include $(wildcard $(M537_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv4sand/Makefile b/rel/d/a/obj/d_a_obj_lv4sand/Makefile index 9ded0c3a52..97619642e2 100644 --- a/rel/d/a/obj/d_a_obj_lv4sand/Makefile +++ b/rel/d/a/obj/d_a_obj_lv4sand/Makefile @@ -40,10 +40,17 @@ $(M538_TARGET): $(M538_O_FILES) $(M538_LIBS) @python3 tools/lcf.py rel 538 --output $(M538_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M538_LDFLAGS) -o $(M538_TARGET) @build/M538_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4sand/%.o: rel/d/a/obj/d_a_obj_lv4sand/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4sand/%.o: rel/d/a/obj/d_a_obj_lv4sand/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv4sand/%.d @echo [538] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M538_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M538_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M538_D_FILES := $(M538_O_FILES:.o=.d) +$(M538_D_FILES): +include $(wildcard $(M538_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv5FloorBoard/Makefile b/rel/d/a/obj/d_a_obj_lv5FloorBoard/Makefile index 61b064c1d4..1de49ab26c 100644 --- a/rel/d/a/obj/d_a_obj_lv5FloorBoard/Makefile +++ b/rel/d/a/obj/d_a_obj_lv5FloorBoard/Makefile @@ -40,10 +40,17 @@ $(M539_TARGET): $(M539_O_FILES) $(M539_LIBS) @python3 tools/lcf.py rel 539 --output $(M539_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M539_LDFLAGS) -o $(M539_TARGET) @build/M539_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5FloorBoard/%.o: rel/d/a/obj/d_a_obj_lv5FloorBoard/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5FloorBoard/%.o: rel/d/a/obj/d_a_obj_lv5FloorBoard/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5FloorBoard/%.d @echo [539] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M539_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M539_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M539_D_FILES := $(M539_O_FILES:.o=.d) +$(M539_D_FILES): +include $(wildcard $(M539_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv5IceWall/Makefile b/rel/d/a/obj/d_a_obj_lv5IceWall/Makefile index 754da0fd9c..310e673652 100644 --- a/rel/d/a/obj/d_a_obj_lv5IceWall/Makefile +++ b/rel/d/a/obj/d_a_obj_lv5IceWall/Makefile @@ -40,10 +40,17 @@ $(M540_TARGET): $(M540_O_FILES) $(M540_LIBS) @python3 tools/lcf.py rel 540 --output $(M540_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M540_LDFLAGS) -o $(M540_TARGET) @build/M540_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5IceWall/%.o: rel/d/a/obj/d_a_obj_lv5IceWall/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5IceWall/%.o: rel/d/a/obj/d_a_obj_lv5IceWall/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5IceWall/%.d @echo [540] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M540_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M540_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M540_D_FILES := $(M540_O_FILES:.o=.d) +$(M540_D_FILES): +include $(wildcard $(M540_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv5SwIce/Makefile b/rel/d/a/obj/d_a_obj_lv5SwIce/Makefile index 91b51b10cb..8c32b57670 100644 --- a/rel/d/a/obj/d_a_obj_lv5SwIce/Makefile +++ b/rel/d/a/obj/d_a_obj_lv5SwIce/Makefile @@ -40,10 +40,17 @@ $(M541_TARGET): $(M541_O_FILES) $(M541_LIBS) @python3 tools/lcf.py rel 541 --output $(M541_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M541_LDFLAGS) -o $(M541_TARGET) @build/M541_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5SwIce/%.o: rel/d/a/obj/d_a_obj_lv5SwIce/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5SwIce/%.o: rel/d/a/obj/d_a_obj_lv5SwIce/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5SwIce/%.d @echo [541] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M541_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M541_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M541_D_FILES := $(M541_O_FILES:.o=.d) +$(M541_D_FILES): +include $(wildcard $(M541_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv5ychndlr/Makefile b/rel/d/a/obj/d_a_obj_lv5ychndlr/Makefile index 8670fdc232..36c630b17d 100644 --- a/rel/d/a/obj/d_a_obj_lv5ychndlr/Makefile +++ b/rel/d/a/obj/d_a_obj_lv5ychndlr/Makefile @@ -38,10 +38,17 @@ $(M542_TARGET): $(M542_O_FILES) $(M542_LIBS) @python3 tools/lcf.py rel 542 --output $(M542_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M542_LDFLAGS) -o $(M542_TARGET) @build/M542_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5ychndlr/%.o: rel/d/a/obj/d_a_obj_lv5ychndlr/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5ychndlr/%.o: rel/d/a/obj/d_a_obj_lv5ychndlr/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5ychndlr/%.d @echo [542] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M542_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M542_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M542_D_FILES := $(M542_O_FILES:.o=.d) +$(M542_D_FILES): +include $(wildcard $(M542_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv5yiblltray/Makefile b/rel/d/a/obj/d_a_obj_lv5yiblltray/Makefile index adb095b09e..997c9e4296 100644 --- a/rel/d/a/obj/d_a_obj_lv5yiblltray/Makefile +++ b/rel/d/a/obj/d_a_obj_lv5yiblltray/Makefile @@ -38,10 +38,17 @@ $(M543_TARGET): $(M543_O_FILES) $(M543_LIBS) @python3 tools/lcf.py rel 543 --output $(M543_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M543_LDFLAGS) -o $(M543_TARGET) @build/M543_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5yiblltray/%.o: rel/d/a/obj/d_a_obj_lv5yiblltray/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5yiblltray/%.o: rel/d/a/obj/d_a_obj_lv5yiblltray/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv5yiblltray/%.d @echo [543] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M543_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M543_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M543_D_FILES := $(M543_O_FILES:.o=.d) +$(M543_D_FILES): +include $(wildcard $(M543_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6ChangeGate/Makefile b/rel/d/a/obj/d_a_obj_lv6ChangeGate/Makefile index 0111e30c87..717825393d 100644 --- a/rel/d/a/obj/d_a_obj_lv6ChangeGate/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6ChangeGate/Makefile @@ -40,10 +40,17 @@ $(M544_TARGET): $(M544_O_FILES) $(M544_LIBS) @python3 tools/lcf.py rel 544 --output $(M544_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M544_LDFLAGS) -o $(M544_TARGET) @build/M544_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6ChangeGate/%.o: rel/d/a/obj/d_a_obj_lv6ChangeGate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6ChangeGate/%.o: rel/d/a/obj/d_a_obj_lv6ChangeGate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6ChangeGate/%.d @echo [544] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M544_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M544_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M544_D_FILES := $(M544_O_FILES:.o=.d) +$(M544_D_FILES): +include $(wildcard $(M544_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/Makefile b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/Makefile index 4477a24e55..67e267184a 100644 --- a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/Makefile @@ -40,10 +40,17 @@ $(M545_TARGET): $(M545_O_FILES) $(M545_LIBS) @python3 tools/lcf.py rel 545 --output $(M545_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M545_LDFLAGS) -o $(M545_TARGET) @build/M545_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6FurikoTrap/%.o: rel/d/a/obj/d_a_obj_lv6FurikoTrap/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6FurikoTrap/%.o: rel/d/a/obj/d_a_obj_lv6FurikoTrap/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6FurikoTrap/%.d @echo [545] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M545_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M545_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M545_D_FILES := $(M545_O_FILES:.o=.d) +$(M545_D_FILES): +include $(wildcard $(M545_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6Lblock/Makefile b/rel/d/a/obj/d_a_obj_lv6Lblock/Makefile index 6549608247..9e4ce4eda5 100644 --- a/rel/d/a/obj/d_a_obj_lv6Lblock/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6Lblock/Makefile @@ -40,10 +40,17 @@ $(M546_TARGET): $(M546_O_FILES) $(M546_LIBS) @python3 tools/lcf.py rel 546 --output $(M546_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M546_LDFLAGS) -o $(M546_TARGET) @build/M546_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6Lblock/%.o: rel/d/a/obj/d_a_obj_lv6Lblock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6Lblock/%.o: rel/d/a/obj/d_a_obj_lv6Lblock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6Lblock/%.d @echo [546] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M546_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M546_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M546_D_FILES := $(M546_O_FILES:.o=.d) +$(M546_D_FILES): +include $(wildcard $(M546_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6SwGate/Makefile b/rel/d/a/obj/d_a_obj_lv6SwGate/Makefile index b491ff6661..ffb057803a 100644 --- a/rel/d/a/obj/d_a_obj_lv6SwGate/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6SwGate/Makefile @@ -40,10 +40,17 @@ $(M547_TARGET): $(M547_O_FILES) $(M547_LIBS) @python3 tools/lcf.py rel 547 --output $(M547_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M547_LDFLAGS) -o $(M547_TARGET) @build/M547_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6SwGate/%.o: rel/d/a/obj/d_a_obj_lv6SwGate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6SwGate/%.o: rel/d/a/obj/d_a_obj_lv6SwGate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6SwGate/%.d @echo [547] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M547_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M547_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M547_D_FILES := $(M547_O_FILES:.o=.d) +$(M547_D_FILES): +include $(wildcard $(M547_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6SzGate/Makefile b/rel/d/a/obj/d_a_obj_lv6SzGate/Makefile index d8d431f3b5..6db5b0db4e 100644 --- a/rel/d/a/obj/d_a_obj_lv6SzGate/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6SzGate/Makefile @@ -40,10 +40,17 @@ $(M548_TARGET): $(M548_O_FILES) $(M548_LIBS) @python3 tools/lcf.py rel 548 --output $(M548_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M548_LDFLAGS) -o $(M548_TARGET) @build/M548_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6SzGate/%.o: rel/d/a/obj/d_a_obj_lv6SzGate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6SzGate/%.o: rel/d/a/obj/d_a_obj_lv6SzGate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6SzGate/%.d @echo [548] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M548_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M548_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M548_D_FILES := $(M548_O_FILES:.o=.d) +$(M548_D_FILES): +include $(wildcard $(M548_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6Tenbin/Makefile b/rel/d/a/obj/d_a_obj_lv6Tenbin/Makefile index e391914b64..a8106afb11 100644 --- a/rel/d/a/obj/d_a_obj_lv6Tenbin/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6Tenbin/Makefile @@ -40,10 +40,17 @@ $(M549_TARGET): $(M549_O_FILES) $(M549_LIBS) @python3 tools/lcf.py rel 549 --output $(M549_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M549_LDFLAGS) -o $(M549_TARGET) @build/M549_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6Tenbin/%.o: rel/d/a/obj/d_a_obj_lv6Tenbin/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6Tenbin/%.o: rel/d/a/obj/d_a_obj_lv6Tenbin/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6Tenbin/%.d @echo [549] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M549_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M549_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M549_D_FILES := $(M549_O_FILES:.o=.d) +$(M549_D_FILES): +include $(wildcard $(M549_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6TogeRoll/Makefile b/rel/d/a/obj/d_a_obj_lv6TogeRoll/Makefile index 09f1986d1e..a344813b5d 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeRoll/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6TogeRoll/Makefile @@ -40,10 +40,17 @@ $(M550_TARGET): $(M550_O_FILES) $(M550_LIBS) @python3 tools/lcf.py rel 550 --output $(M550_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M550_LDFLAGS) -o $(M550_TARGET) @build/M550_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6TogeRoll/%.o: rel/d/a/obj/d_a_obj_lv6TogeRoll/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6TogeRoll/%.o: rel/d/a/obj/d_a_obj_lv6TogeRoll/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6TogeRoll/%.d @echo [550] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M550_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M550_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M550_D_FILES := $(M550_O_FILES:.o=.d) +$(M550_D_FILES): +include $(wildcard $(M550_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6TogeTrap/Makefile b/rel/d/a/obj/d_a_obj_lv6TogeTrap/Makefile index d8dba4520d..69dab7ca8a 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeTrap/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6TogeTrap/Makefile @@ -40,10 +40,17 @@ $(M551_TARGET): $(M551_O_FILES) $(M551_LIBS) @python3 tools/lcf.py rel 551 --output $(M551_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M551_LDFLAGS) -o $(M551_TARGET) @build/M551_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6TogeTrap/%.o: rel/d/a/obj/d_a_obj_lv6TogeTrap/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6TogeTrap/%.o: rel/d/a/obj/d_a_obj_lv6TogeTrap/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6TogeTrap/%.d @echo [551] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M551_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M551_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M551_D_FILES := $(M551_O_FILES:.o=.d) +$(M551_D_FILES): +include $(wildcard $(M551_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6bemos/Makefile b/rel/d/a/obj/d_a_obj_lv6bemos/Makefile index 2afce44907..f9b82b54f6 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6bemos/Makefile @@ -40,10 +40,17 @@ $(M552_TARGET): $(M552_O_FILES) $(M552_LIBS) @python3 tools/lcf.py rel 552 --output $(M552_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M552_LDFLAGS) -o $(M552_TARGET) @build/M552_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6bemos/%.o: rel/d/a/obj/d_a_obj_lv6bemos/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6bemos/%.o: rel/d/a/obj/d_a_obj_lv6bemos/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6bemos/%.d @echo [552] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M552_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M552_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M552_D_FILES := $(M552_O_FILES:.o=.d) +$(M552_D_FILES): +include $(wildcard $(M552_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6bemos2/Makefile b/rel/d/a/obj/d_a_obj_lv6bemos2/Makefile index 5ba29a15f9..9df01051cc 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos2/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6bemos2/Makefile @@ -40,10 +40,17 @@ $(M553_TARGET): $(M553_O_FILES) $(M553_LIBS) @python3 tools/lcf.py rel 553 --output $(M553_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M553_LDFLAGS) -o $(M553_TARGET) @build/M553_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6bemos2/%.o: rel/d/a/obj/d_a_obj_lv6bemos2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6bemos2/%.o: rel/d/a/obj/d_a_obj_lv6bemos2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6bemos2/%.d @echo [553] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M553_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M553_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M553_D_FILES := $(M553_O_FILES:.o=.d) +$(M553_D_FILES): +include $(wildcard $(M553_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6egate/Makefile b/rel/d/a/obj/d_a_obj_lv6egate/Makefile index e34ec57f36..3e0fab11b0 100644 --- a/rel/d/a/obj/d_a_obj_lv6egate/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6egate/Makefile @@ -38,10 +38,17 @@ $(M554_TARGET): $(M554_O_FILES) $(M554_LIBS) @python3 tools/lcf.py rel 554 --output $(M554_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M554_LDFLAGS) -o $(M554_TARGET) @build/M554_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6egate/%.o: rel/d/a/obj/d_a_obj_lv6egate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6egate/%.o: rel/d/a/obj/d_a_obj_lv6egate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6egate/%.d @echo [554] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M554_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M554_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M554_D_FILES := $(M554_O_FILES:.o=.d) +$(M554_D_FILES): +include $(wildcard $(M554_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6elevta/Makefile b/rel/d/a/obj/d_a_obj_lv6elevta/Makefile index 9c7ca9d0cc..e85aa290b3 100644 --- a/rel/d/a/obj/d_a_obj_lv6elevta/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6elevta/Makefile @@ -38,10 +38,17 @@ $(M555_TARGET): $(M555_O_FILES) $(M555_LIBS) @python3 tools/lcf.py rel 555 --output $(M555_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M555_LDFLAGS) -o $(M555_TARGET) @build/M555_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6elevta/%.o: rel/d/a/obj/d_a_obj_lv6elevta/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6elevta/%.o: rel/d/a/obj/d_a_obj_lv6elevta/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6elevta/%.d @echo [555] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M555_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M555_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M555_D_FILES := $(M555_O_FILES:.o=.d) +$(M555_D_FILES): +include $(wildcard $(M555_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv6swturn/Makefile b/rel/d/a/obj/d_a_obj_lv6swturn/Makefile index ba97ffeb1d..13a1bc2049 100644 --- a/rel/d/a/obj/d_a_obj_lv6swturn/Makefile +++ b/rel/d/a/obj/d_a_obj_lv6swturn/Makefile @@ -40,10 +40,17 @@ $(M556_TARGET): $(M556_O_FILES) $(M556_LIBS) @python3 tools/lcf.py rel 556 --output $(M556_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M556_LDFLAGS) -o $(M556_TARGET) @build/M556_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6swturn/%.o: rel/d/a/obj/d_a_obj_lv6swturn/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6swturn/%.o: rel/d/a/obj/d_a_obj_lv6swturn/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv6swturn/%.d @echo [556] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M556_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M556_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M556_D_FILES := $(M556_O_FILES:.o=.d) +$(M556_D_FILES): +include $(wildcard $(M556_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv7BsGate/Makefile b/rel/d/a/obj/d_a_obj_lv7BsGate/Makefile index 185822e199..d9c7a89dcf 100644 --- a/rel/d/a/obj/d_a_obj_lv7BsGate/Makefile +++ b/rel/d/a/obj/d_a_obj_lv7BsGate/Makefile @@ -40,10 +40,17 @@ $(M557_TARGET): $(M557_O_FILES) $(M557_LIBS) @python3 tools/lcf.py rel 557 --output $(M557_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M557_LDFLAGS) -o $(M557_TARGET) @build/M557_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv7BsGate/%.o: rel/d/a/obj/d_a_obj_lv7BsGate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv7BsGate/%.o: rel/d/a/obj/d_a_obj_lv7BsGate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv7BsGate/%.d @echo [557] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M557_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M557_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M557_D_FILES := $(M557_O_FILES:.o=.d) +$(M557_D_FILES): +include $(wildcard $(M557_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv7PropellerY/Makefile b/rel/d/a/obj/d_a_obj_lv7PropellerY/Makefile index 9a51c859eb..43ddf7076a 100644 --- a/rel/d/a/obj/d_a_obj_lv7PropellerY/Makefile +++ b/rel/d/a/obj/d_a_obj_lv7PropellerY/Makefile @@ -40,10 +40,17 @@ $(M558_TARGET): $(M558_O_FILES) $(M558_LIBS) @python3 tools/lcf.py rel 558 --output $(M558_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M558_LDFLAGS) -o $(M558_TARGET) @build/M558_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv7PropellerY/%.o: rel/d/a/obj/d_a_obj_lv7PropellerY/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv7PropellerY/%.o: rel/d/a/obj/d_a_obj_lv7PropellerY/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv7PropellerY/%.d @echo [558] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M558_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M558_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M558_D_FILES := $(M558_O_FILES:.o=.d) +$(M558_D_FILES): +include $(wildcard $(M558_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv7bridge/Makefile b/rel/d/a/obj/d_a_obj_lv7bridge/Makefile index 44506d3001..11c6980175 100644 --- a/rel/d/a/obj/d_a_obj_lv7bridge/Makefile +++ b/rel/d/a/obj/d_a_obj_lv7bridge/Makefile @@ -40,10 +40,17 @@ $(M559_TARGET): $(M559_O_FILES) $(M559_LIBS) @python3 tools/lcf.py rel 559 --output $(M559_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M559_LDFLAGS) -o $(M559_TARGET) @build/M559_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv7bridge/%.o: rel/d/a/obj/d_a_obj_lv7bridge/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv7bridge/%.o: rel/d/a/obj/d_a_obj_lv7bridge/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv7bridge/%.d @echo [559] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M559_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M559_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M559_D_FILES := $(M559_O_FILES:.o=.d) +$(M559_D_FILES): +include $(wildcard $(M559_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/Makefile b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/Makefile index 9dad9741b7..85e730da19 100644 --- a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/Makefile +++ b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/Makefile @@ -40,10 +40,17 @@ $(M560_TARGET): $(M560_O_FILES) $(M560_LIBS) @python3 tools/lcf.py rel 560 --output $(M560_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M560_LDFLAGS) -o $(M560_TARGET) @build/M560_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/%.o: rel/d/a/obj/d_a_obj_lv8KekkaiTrap/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/%.o: rel/d/a/obj/d_a_obj_lv8KekkaiTrap/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/%.d @echo [560] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M560_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M560_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M560_D_FILES := $(M560_O_FILES:.o=.d) +$(M560_D_FILES): +include $(wildcard $(M560_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv8Lift/Makefile b/rel/d/a/obj/d_a_obj_lv8Lift/Makefile index e974ca2247..cce31bf40c 100644 --- a/rel/d/a/obj/d_a_obj_lv8Lift/Makefile +++ b/rel/d/a/obj/d_a_obj_lv8Lift/Makefile @@ -40,10 +40,17 @@ $(M561_TARGET): $(M561_O_FILES) $(M561_LIBS) @python3 tools/lcf.py rel 561 --output $(M561_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M561_LDFLAGS) -o $(M561_TARGET) @build/M561_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8Lift/%.o: rel/d/a/obj/d_a_obj_lv8Lift/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8Lift/%.o: rel/d/a/obj/d_a_obj_lv8Lift/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8Lift/%.d @echo [561] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M561_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M561_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M561_D_FILES := $(M561_O_FILES:.o=.d) +$(M561_D_FILES): +include $(wildcard $(M561_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv8OptiLift/Makefile b/rel/d/a/obj/d_a_obj_lv8OptiLift/Makefile index f29efcab08..d284ee6f85 100644 --- a/rel/d/a/obj/d_a_obj_lv8OptiLift/Makefile +++ b/rel/d/a/obj/d_a_obj_lv8OptiLift/Makefile @@ -40,10 +40,17 @@ $(M562_TARGET): $(M562_O_FILES) $(M562_LIBS) @python3 tools/lcf.py rel 562 --output $(M562_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M562_LDFLAGS) -o $(M562_TARGET) @build/M562_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8OptiLift/%.o: rel/d/a/obj/d_a_obj_lv8OptiLift/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8OptiLift/%.o: rel/d/a/obj/d_a_obj_lv8OptiLift/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8OptiLift/%.d @echo [562] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M562_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M562_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M562_D_FILES := $(M562_O_FILES:.o=.d) +$(M562_D_FILES): +include $(wildcard $(M562_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv8UdFloor/Makefile b/rel/d/a/obj/d_a_obj_lv8UdFloor/Makefile index 0595711a43..94feef3ef8 100644 --- a/rel/d/a/obj/d_a_obj_lv8UdFloor/Makefile +++ b/rel/d/a/obj/d_a_obj_lv8UdFloor/Makefile @@ -40,10 +40,17 @@ $(M563_TARGET): $(M563_O_FILES) $(M563_LIBS) @python3 tools/lcf.py rel 563 --output $(M563_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M563_LDFLAGS) -o $(M563_TARGET) @build/M563_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8UdFloor/%.o: rel/d/a/obj/d_a_obj_lv8UdFloor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8UdFloor/%.o: rel/d/a/obj/d_a_obj_lv8UdFloor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv8UdFloor/%.d @echo [563] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M563_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M563_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M563_D_FILES := $(M563_O_FILES:.o=.d) +$(M563_D_FILES): +include $(wildcard $(M563_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_lv9SwShutter/Makefile b/rel/d/a/obj/d_a_obj_lv9SwShutter/Makefile index 842ce85871..c45032d6d2 100644 --- a/rel/d/a/obj/d_a_obj_lv9SwShutter/Makefile +++ b/rel/d/a/obj/d_a_obj_lv9SwShutter/Makefile @@ -40,10 +40,17 @@ $(M564_TARGET): $(M564_O_FILES) $(M564_LIBS) @python3 tools/lcf.py rel 564 --output $(M564_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M564_LDFLAGS) -o $(M564_TARGET) @build/M564_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv9SwShutter/%.o: rel/d/a/obj/d_a_obj_lv9SwShutter/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv9SwShutter/%.o: rel/d/a/obj/d_a_obj_lv9SwShutter/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_lv9SwShutter/%.d @echo [564] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M564_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M564_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M564_D_FILES := $(M564_O_FILES:.o=.d) +$(M564_D_FILES): +include $(wildcard $(M564_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_magLift/Makefile b/rel/d/a/obj/d_a_obj_magLift/Makefile index 1307f38468..bcbfa7f03b 100644 --- a/rel/d/a/obj/d_a_obj_magLift/Makefile +++ b/rel/d/a/obj/d_a_obj_magLift/Makefile @@ -40,10 +40,17 @@ $(M565_TARGET): $(M565_O_FILES) $(M565_LIBS) @python3 tools/lcf.py rel 565 --output $(M565_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M565_LDFLAGS) -o $(M565_TARGET) @build/M565_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_magLift/%.o: rel/d/a/obj/d_a_obj_magLift/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_magLift/%.o: rel/d/a/obj/d_a_obj_magLift/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_magLift/%.d @echo [565] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M565_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M565_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M565_D_FILES := $(M565_O_FILES:.o=.d) +$(M565_D_FILES): +include $(wildcard $(M565_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_magLiftRot/Makefile b/rel/d/a/obj/d_a_obj_magLiftRot/Makefile index bca69a53a9..4994272d0b 100644 --- a/rel/d/a/obj/d_a_obj_magLiftRot/Makefile +++ b/rel/d/a/obj/d_a_obj_magLiftRot/Makefile @@ -40,10 +40,17 @@ $(M566_TARGET): $(M566_O_FILES) $(M566_LIBS) @python3 tools/lcf.py rel 566 --output $(M566_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M566_LDFLAGS) -o $(M566_TARGET) @build/M566_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_magLiftRot/%.o: rel/d/a/obj/d_a_obj_magLiftRot/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_magLiftRot/%.o: rel/d/a/obj/d_a_obj_magLiftRot/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_magLiftRot/%.d @echo [566] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M566_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M566_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M566_D_FILES := $(M566_O_FILES:.o=.d) +$(M566_D_FILES): +include $(wildcard $(M566_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_magne_arm/Makefile b/rel/d/a/obj/d_a_obj_magne_arm/Makefile index 152570238b..ed0e69cc7a 100644 --- a/rel/d/a/obj/d_a_obj_magne_arm/Makefile +++ b/rel/d/a/obj/d_a_obj_magne_arm/Makefile @@ -38,10 +38,17 @@ $(M105_TARGET): $(M105_O_FILES) $(M105_LIBS) @python3 tools/lcf.py rel 105 --output $(M105_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M105_LDFLAGS) -o $(M105_TARGET) @build/M105_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_magne_arm/%.o: rel/d/a/obj/d_a_obj_magne_arm/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_magne_arm/%.o: rel/d/a/obj/d_a_obj_magne_arm/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_magne_arm/%.d @echo [105] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M105_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M105_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M105_D_FILES := $(M105_O_FILES:.o=.d) +$(M105_D_FILES): +include $(wildcard $(M105_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_maki/Makefile b/rel/d/a/obj/d_a_obj_maki/Makefile index 0126a6b7e3..c07b77188c 100644 --- a/rel/d/a/obj/d_a_obj_maki/Makefile +++ b/rel/d/a/obj/d_a_obj_maki/Makefile @@ -40,10 +40,17 @@ $(M567_TARGET): $(M567_O_FILES) $(M567_LIBS) @python3 tools/lcf.py rel 567 --output $(M567_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M567_LDFLAGS) -o $(M567_TARGET) @build/M567_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_maki/%.o: rel/d/a/obj/d_a_obj_maki/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_maki/%.o: rel/d/a/obj/d_a_obj_maki/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_maki/%.d @echo [567] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M567_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M567_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M567_D_FILES := $(M567_O_FILES:.o=.d) +$(M567_D_FILES): +include $(wildcard $(M567_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_master_sword/Makefile b/rel/d/a/obj/d_a_obj_master_sword/Makefile index 9a735530e8..2d049c03b1 100644 --- a/rel/d/a/obj/d_a_obj_master_sword/Makefile +++ b/rel/d/a/obj/d_a_obj_master_sword/Makefile @@ -40,10 +40,17 @@ $(M568_TARGET): $(M568_O_FILES) $(M568_LIBS) @python3 tools/lcf.py rel 568 --output $(M568_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M568_LDFLAGS) -o $(M568_TARGET) @build/M568_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_master_sword/%.o: rel/d/a/obj/d_a_obj_master_sword/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_master_sword/%.o: rel/d/a/obj/d_a_obj_master_sword/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_master_sword/%.d @echo [568] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M568_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M568_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M568_D_FILES := $(M568_O_FILES:.o=.d) +$(M568_D_FILES): +include $(wildcard $(M568_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_mato/Makefile b/rel/d/a/obj/d_a_obj_mato/Makefile index 4551f3b8ec..9136bf7537 100644 --- a/rel/d/a/obj/d_a_obj_mato/Makefile +++ b/rel/d/a/obj/d_a_obj_mato/Makefile @@ -38,10 +38,17 @@ $(M569_TARGET): $(M569_O_FILES) $(M569_LIBS) @python3 tools/lcf.py rel 569 --output $(M569_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M569_LDFLAGS) -o $(M569_TARGET) @build/M569_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mato/%.o: rel/d/a/obj/d_a_obj_mato/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mato/%.o: rel/d/a/obj/d_a_obj_mato/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_mato/%.d @echo [569] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M569_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M569_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M569_D_FILES := $(M569_O_FILES:.o=.d) +$(M569_D_FILES): +include $(wildcard $(M569_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_metalbox/Makefile b/rel/d/a/obj/d_a_obj_metalbox/Makefile index 70c7853fa1..dfa2d8d5d9 100644 --- a/rel/d/a/obj/d_a_obj_metalbox/Makefile +++ b/rel/d/a/obj/d_a_obj_metalbox/Makefile @@ -38,10 +38,17 @@ $(M106_TARGET): $(M106_O_FILES) $(M106_LIBS) @python3 tools/lcf.py rel 106 --output $(M106_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M106_LDFLAGS) -o $(M106_TARGET) @build/M106_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_metalbox/%.o: rel/d/a/obj/d_a_obj_metalbox/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_metalbox/%.o: rel/d/a/obj/d_a_obj_metalbox/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_metalbox/%.d @echo [106] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M106_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M106_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M106_D_FILES := $(M106_O_FILES:.o=.d) +$(M106_D_FILES): +include $(wildcard $(M106_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_mgate/Makefile b/rel/d/a/obj/d_a_obj_mgate/Makefile index d0de98dbc7..c1aa07c75e 100644 --- a/rel/d/a/obj/d_a_obj_mgate/Makefile +++ b/rel/d/a/obj/d_a_obj_mgate/Makefile @@ -38,10 +38,17 @@ $(M107_TARGET): $(M107_O_FILES) $(M107_LIBS) @python3 tools/lcf.py rel 107 --output $(M107_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M107_LDFLAGS) -o $(M107_TARGET) @build/M107_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mgate/%.o: rel/d/a/obj/d_a_obj_mgate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mgate/%.o: rel/d/a/obj/d_a_obj_mgate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_mgate/%.d @echo [107] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M107_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M107_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M107_D_FILES := $(M107_O_FILES:.o=.d) +$(M107_D_FILES): +include $(wildcard $(M107_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_mhole/Makefile b/rel/d/a/obj/d_a_obj_mhole/Makefile index 6b298478c2..d79602d368 100644 --- a/rel/d/a/obj/d_a_obj_mhole/Makefile +++ b/rel/d/a/obj/d_a_obj_mhole/Makefile @@ -38,10 +38,17 @@ $(M570_TARGET): $(M570_O_FILES) $(M570_LIBS) @python3 tools/lcf.py rel 570 --output $(M570_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M570_LDFLAGS) -o $(M570_TARGET) @build/M570_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mhole/%.o: rel/d/a/obj/d_a_obj_mhole/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mhole/%.o: rel/d/a/obj/d_a_obj_mhole/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_mhole/%.d @echo [570] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M570_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M570_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M570_D_FILES := $(M570_O_FILES:.o=.d) +$(M570_D_FILES): +include $(wildcard $(M570_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_mie/Makefile b/rel/d/a/obj/d_a_obj_mie/Makefile index 2675eef5a0..8206688745 100644 --- a/rel/d/a/obj/d_a_obj_mie/Makefile +++ b/rel/d/a/obj/d_a_obj_mie/Makefile @@ -40,10 +40,17 @@ $(M571_TARGET): $(M571_O_FILES) $(M571_LIBS) @python3 tools/lcf.py rel 571 --output $(M571_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M571_LDFLAGS) -o $(M571_TARGET) @build/M571_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mie/%.o: rel/d/a/obj/d_a_obj_mie/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mie/%.o: rel/d/a/obj/d_a_obj_mie/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_mie/%.d @echo [571] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M571_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M571_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M571_D_FILES := $(M571_O_FILES:.o=.d) +$(M571_D_FILES): +include $(wildcard $(M571_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_movebox/Makefile b/rel/d/a/obj/d_a_obj_movebox/Makefile index 0cef594b37..e30ef3de3e 100644 --- a/rel/d/a/obj/d_a_obj_movebox/Makefile +++ b/rel/d/a/obj/d_a_obj_movebox/Makefile @@ -40,10 +40,17 @@ $(M20_TARGET): $(M20_O_FILES) $(M20_LIBS) @python3 tools/lcf.py rel 20 --output $(M20_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M20_LDFLAGS) -o $(M20_TARGET) @build/M20_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_movebox/%.o: rel/d/a/obj/d_a_obj_movebox/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_movebox/%.o: rel/d/a/obj/d_a_obj_movebox/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_movebox/%.d @echo [ 20] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M20_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M20_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M20_D_FILES := $(M20_O_FILES:.o=.d) +$(M20_D_FILES): +include $(wildcard $(M20_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_msima/Makefile b/rel/d/a/obj/d_a_obj_msima/Makefile index fe15977f28..fcd58dbef5 100644 --- a/rel/d/a/obj/d_a_obj_msima/Makefile +++ b/rel/d/a/obj/d_a_obj_msima/Makefile @@ -40,10 +40,17 @@ $(M577_TARGET): $(M577_O_FILES) $(M577_LIBS) @python3 tools/lcf.py rel 577 --output $(M577_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M577_LDFLAGS) -o $(M577_TARGET) @build/M577_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_msima/%.o: rel/d/a/obj/d_a_obj_msima/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_msima/%.o: rel/d/a/obj/d_a_obj_msima/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_msima/%.d @echo [577] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M577_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M577_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M577_D_FILES := $(M577_O_FILES:.o=.d) +$(M577_D_FILES): +include $(wildcard $(M577_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_mvstair/Makefile b/rel/d/a/obj/d_a_obj_mvstair/Makefile index 8dd01d9067..5a080cd99f 100644 --- a/rel/d/a/obj/d_a_obj_mvstair/Makefile +++ b/rel/d/a/obj/d_a_obj_mvstair/Makefile @@ -40,10 +40,17 @@ $(M578_TARGET): $(M578_O_FILES) $(M578_LIBS) @python3 tools/lcf.py rel 578 --output $(M578_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M578_LDFLAGS) -o $(M578_TARGET) @build/M578_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mvstair/%.o: rel/d/a/obj/d_a_obj_mvstair/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_mvstair/%.o: rel/d/a/obj/d_a_obj_mvstair/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_mvstair/%.d @echo [578] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M578_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M578_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M578_D_FILES := $(M578_O_FILES:.o=.d) +$(M578_D_FILES): +include $(wildcard $(M578_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_myogan/Makefile b/rel/d/a/obj/d_a_obj_myogan/Makefile index abce56c88a..64958b8950 100644 --- a/rel/d/a/obj/d_a_obj_myogan/Makefile +++ b/rel/d/a/obj/d_a_obj_myogan/Makefile @@ -40,10 +40,17 @@ $(M579_TARGET): $(M579_O_FILES) $(M579_LIBS) @python3 tools/lcf.py rel 579 --output $(M579_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M579_LDFLAGS) -o $(M579_TARGET) @build/M579_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_myogan/%.o: rel/d/a/obj/d_a_obj_myogan/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_myogan/%.o: rel/d/a/obj/d_a_obj_myogan/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_myogan/%.d @echo [579] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M579_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M579_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M579_D_FILES := $(M579_O_FILES:.o=.d) +$(M579_D_FILES): +include $(wildcard $(M579_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_nagaisu/Makefile b/rel/d/a/obj/d_a_obj_nagaisu/Makefile index 80bb771dc0..a0cd426702 100644 --- a/rel/d/a/obj/d_a_obj_nagaisu/Makefile +++ b/rel/d/a/obj/d_a_obj_nagaisu/Makefile @@ -38,10 +38,17 @@ $(M580_TARGET): $(M580_O_FILES) $(M580_LIBS) @python3 tools/lcf.py rel 580 --output $(M580_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M580_LDFLAGS) -o $(M580_TARGET) @build/M580_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_nagaisu/%.o: rel/d/a/obj/d_a_obj_nagaisu/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_nagaisu/%.o: rel/d/a/obj/d_a_obj_nagaisu/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_nagaisu/%.d @echo [580] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M580_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M580_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M580_D_FILES := $(M580_O_FILES:.o=.d) +$(M580_D_FILES): +include $(wildcard $(M580_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_nameplate/Makefile b/rel/d/a/obj/d_a_obj_nameplate/Makefile index 78104edddf..958a1d8cd8 100644 --- a/rel/d/a/obj/d_a_obj_nameplate/Makefile +++ b/rel/d/a/obj/d_a_obj_nameplate/Makefile @@ -38,10 +38,17 @@ $(M108_TARGET): $(M108_O_FILES) $(M108_LIBS) @python3 tools/lcf.py rel 108 --output $(M108_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M108_LDFLAGS) -o $(M108_TARGET) @build/M108_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_nameplate/%.o: rel/d/a/obj/d_a_obj_nameplate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_nameplate/%.o: rel/d/a/obj/d_a_obj_nameplate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_nameplate/%.d @echo [108] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M108_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M108_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M108_D_FILES := $(M108_O_FILES:.o=.d) +$(M108_D_FILES): +include $(wildcard $(M108_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_nan/Makefile b/rel/d/a/obj/d_a_obj_nan/Makefile index cb70776813..ea3bbed4aa 100644 --- a/rel/d/a/obj/d_a_obj_nan/Makefile +++ b/rel/d/a/obj/d_a_obj_nan/Makefile @@ -40,10 +40,17 @@ $(M581_TARGET): $(M581_O_FILES) $(M581_LIBS) @python3 tools/lcf.py rel 581 --output $(M581_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M581_LDFLAGS) -o $(M581_TARGET) @build/M581_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_nan/%.o: rel/d/a/obj/d_a_obj_nan/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_nan/%.o: rel/d/a/obj/d_a_obj_nan/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_nan/%.d @echo [581] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M581_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M581_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M581_D_FILES := $(M581_O_FILES:.o=.d) +$(M581_D_FILES): +include $(wildcard $(M581_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ndoor/Makefile b/rel/d/a/obj/d_a_obj_ndoor/Makefile index 0eeb977ef1..13848cbeea 100644 --- a/rel/d/a/obj/d_a_obj_ndoor/Makefile +++ b/rel/d/a/obj/d_a_obj_ndoor/Makefile @@ -38,10 +38,17 @@ $(M582_TARGET): $(M582_O_FILES) $(M582_LIBS) @python3 tools/lcf.py rel 582 --output $(M582_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M582_LDFLAGS) -o $(M582_TARGET) @build/M582_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ndoor/%.o: rel/d/a/obj/d_a_obj_ndoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ndoor/%.o: rel/d/a/obj/d_a_obj_ndoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ndoor/%.d @echo [582] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M582_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M582_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M582_D_FILES := $(M582_O_FILES:.o=.d) +$(M582_D_FILES): +include $(wildcard $(M582_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_nougu/Makefile b/rel/d/a/obj/d_a_obj_nougu/Makefile index c0077bf9d0..77a9751028 100644 --- a/rel/d/a/obj/d_a_obj_nougu/Makefile +++ b/rel/d/a/obj/d_a_obj_nougu/Makefile @@ -40,10 +40,17 @@ $(M583_TARGET): $(M583_O_FILES) $(M583_LIBS) @python3 tools/lcf.py rel 583 --output $(M583_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M583_LDFLAGS) -o $(M583_TARGET) @build/M583_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_nougu/%.o: rel/d/a/obj/d_a_obj_nougu/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_nougu/%.o: rel/d/a/obj/d_a_obj_nougu/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_nougu/%.d @echo [583] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M583_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M583_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M583_D_FILES := $(M583_O_FILES:.o=.d) +$(M583_D_FILES): +include $(wildcard $(M583_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_octhashi/Makefile b/rel/d/a/obj/d_a_obj_octhashi/Makefile index 21f82a1966..6e7a95d717 100644 --- a/rel/d/a/obj/d_a_obj_octhashi/Makefile +++ b/rel/d/a/obj/d_a_obj_octhashi/Makefile @@ -40,10 +40,17 @@ $(M584_TARGET): $(M584_O_FILES) $(M584_LIBS) @python3 tools/lcf.py rel 584 --output $(M584_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M584_LDFLAGS) -o $(M584_TARGET) @build/M584_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_octhashi/%.o: rel/d/a/obj/d_a_obj_octhashi/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_octhashi/%.o: rel/d/a/obj/d_a_obj_octhashi/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_octhashi/%.d @echo [584] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M584_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M584_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M584_D_FILES := $(M584_O_FILES:.o=.d) +$(M584_D_FILES): +include $(wildcard $(M584_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_oiltubo/Makefile b/rel/d/a/obj/d_a_obj_oiltubo/Makefile index 6e0271795d..6d84c99d8e 100644 --- a/rel/d/a/obj/d_a_obj_oiltubo/Makefile +++ b/rel/d/a/obj/d_a_obj_oiltubo/Makefile @@ -38,10 +38,17 @@ $(M585_TARGET): $(M585_O_FILES) $(M585_LIBS) @python3 tools/lcf.py rel 585 --output $(M585_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M585_LDFLAGS) -o $(M585_TARGET) @build/M585_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_oiltubo/%.o: rel/d/a/obj/d_a_obj_oiltubo/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_oiltubo/%.o: rel/d/a/obj/d_a_obj_oiltubo/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_oiltubo/%.d @echo [585] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M585_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M585_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M585_D_FILES := $(M585_O_FILES:.o=.d) +$(M585_D_FILES): +include $(wildcard $(M585_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_onsen/Makefile b/rel/d/a/obj/d_a_obj_onsen/Makefile index 025ca56343..a279f1ab91 100644 --- a/rel/d/a/obj/d_a_obj_onsen/Makefile +++ b/rel/d/a/obj/d_a_obj_onsen/Makefile @@ -38,10 +38,17 @@ $(M586_TARGET): $(M586_O_FILES) $(M586_LIBS) @python3 tools/lcf.py rel 586 --output $(M586_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M586_LDFLAGS) -o $(M586_TARGET) @build/M586_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_onsen/%.o: rel/d/a/obj/d_a_obj_onsen/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_onsen/%.o: rel/d/a/obj/d_a_obj_onsen/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_onsen/%.d @echo [586] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M586_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M586_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M586_D_FILES := $(M586_O_FILES:.o=.d) +$(M586_D_FILES): +include $(wildcard $(M586_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_onsenFire/Makefile b/rel/d/a/obj/d_a_obj_onsenFire/Makefile index 0148f09618..399f5cfbfb 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/Makefile +++ b/rel/d/a/obj/d_a_obj_onsenFire/Makefile @@ -38,10 +38,17 @@ $(M587_TARGET): $(M587_O_FILES) $(M587_LIBS) @python3 tools/lcf.py rel 587 --output $(M587_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M587_LDFLAGS) -o $(M587_TARGET) @build/M587_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_onsenFire/%.o: rel/d/a/obj/d_a_obj_onsenFire/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_onsenFire/%.o: rel/d/a/obj/d_a_obj_onsenFire/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_onsenFire/%.d @echo [587] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M587_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M587_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M587_D_FILES := $(M587_O_FILES:.o=.d) +$(M587_D_FILES): +include $(wildcard $(M587_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_onsenTaru/Makefile b/rel/d/a/obj/d_a_obj_onsenTaru/Makefile index 2ee62c18c7..54e473fcc5 100644 --- a/rel/d/a/obj/d_a_obj_onsenTaru/Makefile +++ b/rel/d/a/obj/d_a_obj_onsenTaru/Makefile @@ -40,10 +40,17 @@ $(M588_TARGET): $(M588_O_FILES) $(M588_LIBS) @python3 tools/lcf.py rel 588 --output $(M588_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M588_LDFLAGS) -o $(M588_TARGET) @build/M588_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_onsenTaru/%.o: rel/d/a/obj/d_a_obj_onsenTaru/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_onsenTaru/%.o: rel/d/a/obj/d_a_obj_onsenTaru/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_onsenTaru/%.d @echo [588] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M588_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M588_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M588_D_FILES := $(M588_O_FILES:.o=.d) +$(M588_D_FILES): +include $(wildcard $(M588_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ornament_cloth/Makefile b/rel/d/a/obj/d_a_obj_ornament_cloth/Makefile index f0aac69b75..a9d995c1f2 100644 --- a/rel/d/a/obj/d_a_obj_ornament_cloth/Makefile +++ b/rel/d/a/obj/d_a_obj_ornament_cloth/Makefile @@ -38,10 +38,17 @@ $(M109_TARGET): $(M109_O_FILES) $(M109_LIBS) @python3 tools/lcf.py rel 109 --output $(M109_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M109_LDFLAGS) -o $(M109_TARGET) @build/M109_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ornament_cloth/%.o: rel/d/a/obj/d_a_obj_ornament_cloth/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ornament_cloth/%.o: rel/d/a/obj/d_a_obj_ornament_cloth/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ornament_cloth/%.d @echo [109] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M109_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M109_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M109_D_FILES := $(M109_O_FILES:.o=.d) +$(M109_D_FILES): +include $(wildcard $(M109_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_pdoor/Makefile b/rel/d/a/obj/d_a_obj_pdoor/Makefile index e45b4a23e0..cdadf28300 100644 --- a/rel/d/a/obj/d_a_obj_pdoor/Makefile +++ b/rel/d/a/obj/d_a_obj_pdoor/Makefile @@ -40,10 +40,17 @@ $(M589_TARGET): $(M589_O_FILES) $(M589_LIBS) @python3 tools/lcf.py rel 589 --output $(M589_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M589_LDFLAGS) -o $(M589_TARGET) @build/M589_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pdoor/%.o: rel/d/a/obj/d_a_obj_pdoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pdoor/%.o: rel/d/a/obj/d_a_obj_pdoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_pdoor/%.d @echo [589] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M589_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M589_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M589_D_FILES := $(M589_O_FILES:.o=.d) +$(M589_D_FILES): +include $(wildcard $(M589_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_pdtile/Makefile b/rel/d/a/obj/d_a_obj_pdtile/Makefile index 336c5b9001..783c23c3cd 100644 --- a/rel/d/a/obj/d_a_obj_pdtile/Makefile +++ b/rel/d/a/obj/d_a_obj_pdtile/Makefile @@ -38,10 +38,17 @@ $(M590_TARGET): $(M590_O_FILES) $(M590_LIBS) @python3 tools/lcf.py rel 590 --output $(M590_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M590_LDFLAGS) -o $(M590_TARGET) @build/M590_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pdtile/%.o: rel/d/a/obj/d_a_obj_pdtile/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pdtile/%.o: rel/d/a/obj/d_a_obj_pdtile/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_pdtile/%.d @echo [590] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M590_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M590_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M590_D_FILES := $(M590_O_FILES:.o=.d) +$(M590_D_FILES): +include $(wildcard $(M590_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_pdwall/Makefile b/rel/d/a/obj/d_a_obj_pdwall/Makefile index b550b0ead9..92c3f072a9 100644 --- a/rel/d/a/obj/d_a_obj_pdwall/Makefile +++ b/rel/d/a/obj/d_a_obj_pdwall/Makefile @@ -38,10 +38,17 @@ $(M591_TARGET): $(M591_O_FILES) $(M591_LIBS) @python3 tools/lcf.py rel 591 --output $(M591_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M591_LDFLAGS) -o $(M591_TARGET) @build/M591_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pdwall/%.o: rel/d/a/obj/d_a_obj_pdwall/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pdwall/%.o: rel/d/a/obj/d_a_obj_pdwall/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_pdwall/%.d @echo [591] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M591_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M591_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M591_D_FILES := $(M591_O_FILES:.o=.d) +$(M591_D_FILES): +include $(wildcard $(M591_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_picture/Makefile b/rel/d/a/obj/d_a_obj_picture/Makefile index ec8d4b7629..0ce40ae9ec 100644 --- a/rel/d/a/obj/d_a_obj_picture/Makefile +++ b/rel/d/a/obj/d_a_obj_picture/Makefile @@ -38,10 +38,17 @@ $(M592_TARGET): $(M592_O_FILES) $(M592_LIBS) @python3 tools/lcf.py rel 592 --output $(M592_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M592_LDFLAGS) -o $(M592_TARGET) @build/M592_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_picture/%.o: rel/d/a/obj/d_a_obj_picture/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_picture/%.o: rel/d/a/obj/d_a_obj_picture/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_picture/%.d @echo [592] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M592_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M592_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M592_D_FILES := $(M592_O_FILES:.o=.d) +$(M592_D_FILES): +include $(wildcard $(M592_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_pillar/Makefile b/rel/d/a/obj/d_a_obj_pillar/Makefile index e36d461990..de494c0ffd 100644 --- a/rel/d/a/obj/d_a_obj_pillar/Makefile +++ b/rel/d/a/obj/d_a_obj_pillar/Makefile @@ -40,10 +40,17 @@ $(M593_TARGET): $(M593_O_FILES) $(M593_LIBS) @python3 tools/lcf.py rel 593 --output $(M593_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M593_LDFLAGS) -o $(M593_TARGET) @build/M593_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pillar/%.o: rel/d/a/obj/d_a_obj_pillar/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pillar/%.o: rel/d/a/obj/d_a_obj_pillar/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_pillar/%.d @echo [593] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M593_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M593_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M593_D_FILES := $(M593_O_FILES:.o=.d) +$(M593_D_FILES): +include $(wildcard $(M593_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_pleaf/Makefile b/rel/d/a/obj/d_a_obj_pleaf/Makefile index 09bc209ee5..0e831b26de 100644 --- a/rel/d/a/obj/d_a_obj_pleaf/Makefile +++ b/rel/d/a/obj/d_a_obj_pleaf/Makefile @@ -40,10 +40,17 @@ $(M594_TARGET): $(M594_O_FILES) $(M594_LIBS) @python3 tools/lcf.py rel 594 --output $(M594_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M594_LDFLAGS) -o $(M594_TARGET) @build/M594_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pleaf/%.o: rel/d/a/obj/d_a_obj_pleaf/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pleaf/%.o: rel/d/a/obj/d_a_obj_pleaf/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_pleaf/%.d @echo [594] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M594_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M594_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M594_D_FILES := $(M594_O_FILES:.o=.d) +$(M594_D_FILES): +include $(wildcard $(M594_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_poCandle/Makefile b/rel/d/a/obj/d_a_obj_poCandle/Makefile index 06a442f35d..e91bf8eab3 100644 --- a/rel/d/a/obj/d_a_obj_poCandle/Makefile +++ b/rel/d/a/obj/d_a_obj_poCandle/Makefile @@ -40,10 +40,17 @@ $(M595_TARGET): $(M595_O_FILES) $(M595_LIBS) @python3 tools/lcf.py rel 595 --output $(M595_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M595_LDFLAGS) -o $(M595_TARGET) @build/M595_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_poCandle/%.o: rel/d/a/obj/d_a_obj_poCandle/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_poCandle/%.o: rel/d/a/obj/d_a_obj_poCandle/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_poCandle/%.d @echo [595] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M595_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M595_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M595_D_FILES := $(M595_O_FILES:.o=.d) +$(M595_D_FILES): +include $(wildcard $(M595_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_poFire/Makefile b/rel/d/a/obj/d_a_obj_poFire/Makefile index bd6a9416c2..ca6aafef89 100644 --- a/rel/d/a/obj/d_a_obj_poFire/Makefile +++ b/rel/d/a/obj/d_a_obj_poFire/Makefile @@ -40,10 +40,17 @@ $(M596_TARGET): $(M596_O_FILES) $(M596_LIBS) @python3 tools/lcf.py rel 596 --output $(M596_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M596_LDFLAGS) -o $(M596_TARGET) @build/M596_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_poFire/%.o: rel/d/a/obj/d_a_obj_poFire/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_poFire/%.o: rel/d/a/obj/d_a_obj_poFire/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_poFire/%.d @echo [596] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M596_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M596_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M596_D_FILES := $(M596_O_FILES:.o=.d) +$(M596_D_FILES): +include $(wildcard $(M596_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_poTbox/Makefile b/rel/d/a/obj/d_a_obj_poTbox/Makefile index f9bc0d94d0..b6ca6fc60e 100644 --- a/rel/d/a/obj/d_a_obj_poTbox/Makefile +++ b/rel/d/a/obj/d_a_obj_poTbox/Makefile @@ -40,10 +40,17 @@ $(M597_TARGET): $(M597_O_FILES) $(M597_LIBS) @python3 tools/lcf.py rel 597 --output $(M597_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M597_LDFLAGS) -o $(M597_TARGET) @build/M597_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_poTbox/%.o: rel/d/a/obj/d_a_obj_poTbox/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_poTbox/%.o: rel/d/a/obj/d_a_obj_poTbox/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_poTbox/%.d @echo [597] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M597_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M597_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M597_D_FILES := $(M597_O_FILES:.o=.d) +$(M597_D_FILES): +include $(wildcard $(M597_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_prop/Makefile b/rel/d/a/obj/d_a_obj_prop/Makefile index 38f2e13bd1..f52e2e8a16 100644 --- a/rel/d/a/obj/d_a_obj_prop/Makefile +++ b/rel/d/a/obj/d_a_obj_prop/Makefile @@ -38,10 +38,17 @@ $(M598_TARGET): $(M598_O_FILES) $(M598_LIBS) @python3 tools/lcf.py rel 598 --output $(M598_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M598_LDFLAGS) -o $(M598_TARGET) @build/M598_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_prop/%.o: rel/d/a/obj/d_a_obj_prop/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_prop/%.o: rel/d/a/obj/d_a_obj_prop/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_prop/%.d @echo [598] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M598_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M598_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M598_D_FILES := $(M598_O_FILES:.o=.d) +$(M598_D_FILES): +include $(wildcard $(M598_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_pumpkin/Makefile b/rel/d/a/obj/d_a_obj_pumpkin/Makefile index fdd3942476..035ab0db58 100644 --- a/rel/d/a/obj/d_a_obj_pumpkin/Makefile +++ b/rel/d/a/obj/d_a_obj_pumpkin/Makefile @@ -40,10 +40,17 @@ $(M599_TARGET): $(M599_O_FILES) $(M599_LIBS) @python3 tools/lcf.py rel 599 --output $(M599_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M599_LDFLAGS) -o $(M599_TARGET) @build/M599_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pumpkin/%.o: rel/d/a/obj/d_a_obj_pumpkin/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_pumpkin/%.o: rel/d/a/obj/d_a_obj_pumpkin/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_pumpkin/%.d @echo [599] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M599_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M599_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M599_D_FILES := $(M599_O_FILES:.o=.d) +$(M599_D_FILES): +include $(wildcard $(M599_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_rcircle/Makefile b/rel/d/a/obj/d_a_obj_rcircle/Makefile index 7b67b27d1f..3fc4db94e5 100644 --- a/rel/d/a/obj/d_a_obj_rcircle/Makefile +++ b/rel/d/a/obj/d_a_obj_rcircle/Makefile @@ -38,10 +38,17 @@ $(M600_TARGET): $(M600_O_FILES) $(M600_LIBS) @python3 tools/lcf.py rel 600 --output $(M600_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M600_LDFLAGS) -o $(M600_TARGET) @build/M600_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rcircle/%.o: rel/d/a/obj/d_a_obj_rcircle/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rcircle/%.o: rel/d/a/obj/d_a_obj_rcircle/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_rcircle/%.d @echo [600] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M600_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M600_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M600_D_FILES := $(M600_O_FILES:.o=.d) +$(M600_D_FILES): +include $(wildcard $(M600_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_rfHole/Makefile b/rel/d/a/obj/d_a_obj_rfHole/Makefile index 9e722f2203..7e63239281 100644 --- a/rel/d/a/obj/d_a_obj_rfHole/Makefile +++ b/rel/d/a/obj/d_a_obj_rfHole/Makefile @@ -40,10 +40,17 @@ $(M601_TARGET): $(M601_O_FILES) $(M601_LIBS) @python3 tools/lcf.py rel 601 --output $(M601_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M601_LDFLAGS) -o $(M601_TARGET) @build/M601_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rfHole/%.o: rel/d/a/obj/d_a_obj_rfHole/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rfHole/%.o: rel/d/a/obj/d_a_obj_rfHole/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_rfHole/%.d @echo [601] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M601_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M601_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M601_D_FILES := $(M601_O_FILES:.o=.d) +$(M601_D_FILES): +include $(wildcard $(M601_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_rgate/Makefile b/rel/d/a/obj/d_a_obj_rgate/Makefile index d5a58117f1..3c10dba289 100644 --- a/rel/d/a/obj/d_a_obj_rgate/Makefile +++ b/rel/d/a/obj/d_a_obj_rgate/Makefile @@ -38,10 +38,17 @@ $(M602_TARGET): $(M602_O_FILES) $(M602_LIBS) @python3 tools/lcf.py rel 602 --output $(M602_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M602_LDFLAGS) -o $(M602_TARGET) @build/M602_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rgate/%.o: rel/d/a/obj/d_a_obj_rgate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rgate/%.o: rel/d/a/obj/d_a_obj_rgate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_rgate/%.d @echo [602] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M602_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M602_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M602_D_FILES := $(M602_O_FILES:.o=.d) +$(M602_D_FILES): +include $(wildcard $(M602_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_riverrock/Makefile b/rel/d/a/obj/d_a_obj_riverrock/Makefile index 56bd83d9e2..95002aa11b 100644 --- a/rel/d/a/obj/d_a_obj_riverrock/Makefile +++ b/rel/d/a/obj/d_a_obj_riverrock/Makefile @@ -40,10 +40,17 @@ $(M603_TARGET): $(M603_O_FILES) $(M603_LIBS) @python3 tools/lcf.py rel 603 --output $(M603_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M603_LDFLAGS) -o $(M603_TARGET) @build/M603_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_riverrock/%.o: rel/d/a/obj/d_a_obj_riverrock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_riverrock/%.o: rel/d/a/obj/d_a_obj_riverrock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_riverrock/%.d @echo [603] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M603_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M603_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M603_D_FILES := $(M603_O_FILES:.o=.d) +$(M603_D_FILES): +include $(wildcard $(M603_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_rock/Makefile b/rel/d/a/obj/d_a_obj_rock/Makefile index 4da76be7a5..88270f3735 100644 --- a/rel/d/a/obj/d_a_obj_rock/Makefile +++ b/rel/d/a/obj/d_a_obj_rock/Makefile @@ -38,10 +38,17 @@ $(M604_TARGET): $(M604_O_FILES) $(M604_LIBS) @python3 tools/lcf.py rel 604 --output $(M604_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M604_LDFLAGS) -o $(M604_TARGET) @build/M604_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rock/%.o: rel/d/a/obj/d_a_obj_rock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rock/%.o: rel/d/a/obj/d_a_obj_rock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_rock/%.d @echo [604] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M604_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M604_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M604_D_FILES := $(M604_O_FILES:.o=.d) +$(M604_D_FILES): +include $(wildcard $(M604_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/Makefile b/rel/d/a/obj/d_a_obj_rope_bridge/Makefile index 9e4e61ab80..7ede670b18 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/Makefile +++ b/rel/d/a/obj/d_a_obj_rope_bridge/Makefile @@ -40,10 +40,17 @@ $(M110_TARGET): $(M110_O_FILES) $(M110_LIBS) @python3 tools/lcf.py rel 110 --output $(M110_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M110_LDFLAGS) -o $(M110_TARGET) @build/M110_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rope_bridge/%.o: rel/d/a/obj/d_a_obj_rope_bridge/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rope_bridge/%.o: rel/d/a/obj/d_a_obj_rope_bridge/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_rope_bridge/%.d @echo [110] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M110_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M110_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M110_D_FILES := $(M110_O_FILES:.o=.d) +$(M110_D_FILES): +include $(wildcard $(M110_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_rotBridge/Makefile b/rel/d/a/obj/d_a_obj_rotBridge/Makefile index b1e72f96cc..b7b273bf27 100644 --- a/rel/d/a/obj/d_a_obj_rotBridge/Makefile +++ b/rel/d/a/obj/d_a_obj_rotBridge/Makefile @@ -40,10 +40,17 @@ $(M605_TARGET): $(M605_O_FILES) $(M605_LIBS) @python3 tools/lcf.py rel 605 --output $(M605_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M605_LDFLAGS) -o $(M605_TARGET) @build/M605_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rotBridge/%.o: rel/d/a/obj/d_a_obj_rotBridge/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rotBridge/%.o: rel/d/a/obj/d_a_obj_rotBridge/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_rotBridge/%.d @echo [605] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M605_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M605_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M605_D_FILES := $(M605_O_FILES:.o=.d) +$(M605_D_FILES): +include $(wildcard $(M605_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_rotTrap/Makefile b/rel/d/a/obj/d_a_obj_rotTrap/Makefile index 0f6e030ed8..10817001a2 100644 --- a/rel/d/a/obj/d_a_obj_rotTrap/Makefile +++ b/rel/d/a/obj/d_a_obj_rotTrap/Makefile @@ -40,10 +40,17 @@ $(M606_TARGET): $(M606_O_FILES) $(M606_LIBS) @python3 tools/lcf.py rel 606 --output $(M606_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M606_LDFLAGS) -o $(M606_TARGET) @build/M606_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rotTrap/%.o: rel/d/a/obj/d_a_obj_rotTrap/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rotTrap/%.o: rel/d/a/obj/d_a_obj_rotTrap/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_rotTrap/%.d @echo [606] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M606_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M606_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M606_D_FILES := $(M606_O_FILES:.o=.d) +$(M606_D_FILES): +include $(wildcard $(M606_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_roten/Makefile b/rel/d/a/obj/d_a_obj_roten/Makefile index f2ad0d7f3b..3aa613cfd7 100644 --- a/rel/d/a/obj/d_a_obj_roten/Makefile +++ b/rel/d/a/obj/d_a_obj_roten/Makefile @@ -38,10 +38,17 @@ $(M607_TARGET): $(M607_O_FILES) $(M607_LIBS) @python3 tools/lcf.py rel 607 --output $(M607_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M607_LDFLAGS) -o $(M607_TARGET) @build/M607_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_roten/%.o: rel/d/a/obj/d_a_obj_roten/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_roten/%.o: rel/d/a/obj/d_a_obj_roten/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_roten/%.d @echo [607] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M607_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M607_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M607_D_FILES := $(M607_O_FILES:.o=.d) +$(M607_D_FILES): +include $(wildcard $(M607_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_rstair/Makefile b/rel/d/a/obj/d_a_obj_rstair/Makefile index 949fe771ae..9247a57184 100644 --- a/rel/d/a/obj/d_a_obj_rstair/Makefile +++ b/rel/d/a/obj/d_a_obj_rstair/Makefile @@ -40,10 +40,17 @@ $(M608_TARGET): $(M608_O_FILES) $(M608_LIBS) @python3 tools/lcf.py rel 608 --output $(M608_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M608_LDFLAGS) -o $(M608_TARGET) @build/M608_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rstair/%.o: rel/d/a/obj/d_a_obj_rstair/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rstair/%.o: rel/d/a/obj/d_a_obj_rstair/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_rstair/%.d @echo [608] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M608_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M608_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M608_D_FILES := $(M608_O_FILES:.o=.d) +$(M608_D_FILES): +include $(wildcard $(M608_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_rw/Makefile b/rel/d/a/obj/d_a_obj_rw/Makefile index 0d58894be9..bcd3db7b5d 100644 --- a/rel/d/a/obj/d_a_obj_rw/Makefile +++ b/rel/d/a/obj/d_a_obj_rw/Makefile @@ -40,10 +40,17 @@ $(M609_TARGET): $(M609_O_FILES) $(M609_LIBS) @python3 tools/lcf.py rel 609 --output $(M609_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M609_LDFLAGS) -o $(M609_TARGET) @build/M609_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rw/%.o: rel/d/a/obj/d_a_obj_rw/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_rw/%.o: rel/d/a/obj/d_a_obj_rw/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_rw/%.d @echo [609] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M609_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M609_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M609_D_FILES := $(M609_O_FILES:.o=.d) +$(M609_D_FILES): +include $(wildcard $(M609_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_saidan/Makefile b/rel/d/a/obj/d_a_obj_saidan/Makefile index 1ef0e3c1b9..a1830bef6a 100644 --- a/rel/d/a/obj/d_a_obj_saidan/Makefile +++ b/rel/d/a/obj/d_a_obj_saidan/Makefile @@ -40,10 +40,17 @@ $(M610_TARGET): $(M610_O_FILES) $(M610_LIBS) @python3 tools/lcf.py rel 610 --output $(M610_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M610_LDFLAGS) -o $(M610_TARGET) @build/M610_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_saidan/%.o: rel/d/a/obj/d_a_obj_saidan/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_saidan/%.o: rel/d/a/obj/d_a_obj_saidan/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_saidan/%.d @echo [610] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M610_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M610_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M610_D_FILES := $(M610_O_FILES:.o=.d) +$(M610_D_FILES): +include $(wildcard $(M610_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_sakuita/Makefile b/rel/d/a/obj/d_a_obj_sakuita/Makefile index b7752a9633..b3bc355ad3 100644 --- a/rel/d/a/obj/d_a_obj_sakuita/Makefile +++ b/rel/d/a/obj/d_a_obj_sakuita/Makefile @@ -38,10 +38,17 @@ $(M611_TARGET): $(M611_O_FILES) $(M611_LIBS) @python3 tools/lcf.py rel 611 --output $(M611_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M611_LDFLAGS) -o $(M611_TARGET) @build/M611_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sakuita/%.o: rel/d/a/obj/d_a_obj_sakuita/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sakuita/%.o: rel/d/a/obj/d_a_obj_sakuita/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_sakuita/%.d @echo [611] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M611_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M611_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M611_D_FILES := $(M611_O_FILES:.o=.d) +$(M611_D_FILES): +include $(wildcard $(M611_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_sakuita_rope/Makefile b/rel/d/a/obj/d_a_obj_sakuita_rope/Makefile index e0f0eb06bb..0d7fa2f177 100644 --- a/rel/d/a/obj/d_a_obj_sakuita_rope/Makefile +++ b/rel/d/a/obj/d_a_obj_sakuita_rope/Makefile @@ -38,10 +38,17 @@ $(M612_TARGET): $(M612_O_FILES) $(M612_LIBS) @python3 tools/lcf.py rel 612 --output $(M612_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M612_LDFLAGS) -o $(M612_TARGET) @build/M612_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sakuita_rope/%.o: rel/d/a/obj/d_a_obj_sakuita_rope/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sakuita_rope/%.o: rel/d/a/obj/d_a_obj_sakuita_rope/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_sakuita_rope/%.d @echo [612] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M612_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M612_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M612_D_FILES := $(M612_O_FILES:.o=.d) +$(M612_D_FILES): +include $(wildcard $(M612_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_scannon/Makefile b/rel/d/a/obj/d_a_obj_scannon/Makefile index 9a0a4b716b..0c1a5807c9 100644 --- a/rel/d/a/obj/d_a_obj_scannon/Makefile +++ b/rel/d/a/obj/d_a_obj_scannon/Makefile @@ -38,10 +38,17 @@ $(M613_TARGET): $(M613_O_FILES) $(M613_LIBS) @python3 tools/lcf.py rel 613 --output $(M613_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M613_LDFLAGS) -o $(M613_TARGET) @build/M613_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_scannon/%.o: rel/d/a/obj/d_a_obj_scannon/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_scannon/%.o: rel/d/a/obj/d_a_obj_scannon/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_scannon/%.d @echo [613] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M613_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M613_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M613_D_FILES := $(M613_O_FILES:.o=.d) +$(M613_D_FILES): +include $(wildcard $(M613_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_scannon_crs/Makefile b/rel/d/a/obj/d_a_obj_scannon_crs/Makefile index c0047c94ec..1199589699 100644 --- a/rel/d/a/obj/d_a_obj_scannon_crs/Makefile +++ b/rel/d/a/obj/d_a_obj_scannon_crs/Makefile @@ -38,10 +38,17 @@ $(M614_TARGET): $(M614_O_FILES) $(M614_LIBS) @python3 tools/lcf.py rel 614 --output $(M614_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M614_LDFLAGS) -o $(M614_TARGET) @build/M614_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_scannon_crs/%.o: rel/d/a/obj/d_a_obj_scannon_crs/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_scannon_crs/%.o: rel/d/a/obj/d_a_obj_scannon_crs/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_scannon_crs/%.d @echo [614] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M614_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M614_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M614_D_FILES := $(M614_O_FILES:.o=.d) +$(M614_D_FILES): +include $(wildcard $(M614_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_scannon_ten/Makefile b/rel/d/a/obj/d_a_obj_scannon_ten/Makefile index c40908fe3f..eb02bc3af3 100644 --- a/rel/d/a/obj/d_a_obj_scannon_ten/Makefile +++ b/rel/d/a/obj/d_a_obj_scannon_ten/Makefile @@ -38,10 +38,17 @@ $(M615_TARGET): $(M615_O_FILES) $(M615_LIBS) @python3 tools/lcf.py rel 615 --output $(M615_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M615_LDFLAGS) -o $(M615_TARGET) @build/M615_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_scannon_ten/%.o: rel/d/a/obj/d_a_obj_scannon_ten/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_scannon_ten/%.o: rel/d/a/obj/d_a_obj_scannon_ten/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_scannon_ten/%.d @echo [615] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M615_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M615_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M615_D_FILES := $(M615_O_FILES:.o=.d) +$(M615_D_FILES): +include $(wildcard $(M615_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_sekidoor/Makefile b/rel/d/a/obj/d_a_obj_sekidoor/Makefile index 1cd1a9d342..442170d238 100644 --- a/rel/d/a/obj/d_a_obj_sekidoor/Makefile +++ b/rel/d/a/obj/d_a_obj_sekidoor/Makefile @@ -40,10 +40,17 @@ $(M616_TARGET): $(M616_O_FILES) $(M616_LIBS) @python3 tools/lcf.py rel 616 --output $(M616_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M616_LDFLAGS) -o $(M616_TARGET) @build/M616_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sekidoor/%.o: rel/d/a/obj/d_a_obj_sekidoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sekidoor/%.o: rel/d/a/obj/d_a_obj_sekidoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_sekidoor/%.d @echo [616] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M616_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M616_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M616_D_FILES := $(M616_O_FILES:.o=.d) +$(M616_D_FILES): +include $(wildcard $(M616_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_sekizo/Makefile b/rel/d/a/obj/d_a_obj_sekizo/Makefile index f87a644199..038f7364ce 100644 --- a/rel/d/a/obj/d_a_obj_sekizo/Makefile +++ b/rel/d/a/obj/d_a_obj_sekizo/Makefile @@ -40,10 +40,17 @@ $(M617_TARGET): $(M617_O_FILES) $(M617_LIBS) @python3 tools/lcf.py rel 617 --output $(M617_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M617_LDFLAGS) -o $(M617_TARGET) @build/M617_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sekizo/%.o: rel/d/a/obj/d_a_obj_sekizo/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sekizo/%.o: rel/d/a/obj/d_a_obj_sekizo/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_sekizo/%.d @echo [617] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M617_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M617_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M617_D_FILES := $(M617_O_FILES:.o=.d) +$(M617_D_FILES): +include $(wildcard $(M617_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_sekizoa/Makefile b/rel/d/a/obj/d_a_obj_sekizoa/Makefile index 348ce058ca..a2a879163c 100644 --- a/rel/d/a/obj/d_a_obj_sekizoa/Makefile +++ b/rel/d/a/obj/d_a_obj_sekizoa/Makefile @@ -40,10 +40,17 @@ $(M618_TARGET): $(M618_O_FILES) $(M618_LIBS) @python3 tools/lcf.py rel 618 --output $(M618_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M618_LDFLAGS) -o $(M618_TARGET) @build/M618_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sekizoa/%.o: rel/d/a/obj/d_a_obj_sekizoa/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sekizoa/%.o: rel/d/a/obj/d_a_obj_sekizoa/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_sekizoa/%.d @echo [618] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M618_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M618_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M618_D_FILES := $(M618_O_FILES:.o=.d) +$(M618_D_FILES): +include $(wildcard $(M618_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_shield/Makefile b/rel/d/a/obj/d_a_obj_shield/Makefile index 4a7fca18b1..3ef4100044 100644 --- a/rel/d/a/obj/d_a_obj_shield/Makefile +++ b/rel/d/a/obj/d_a_obj_shield/Makefile @@ -40,10 +40,17 @@ $(M619_TARGET): $(M619_O_FILES) $(M619_LIBS) @python3 tools/lcf.py rel 619 --output $(M619_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M619_LDFLAGS) -o $(M619_TARGET) @build/M619_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_shield/%.o: rel/d/a/obj/d_a_obj_shield/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_shield/%.o: rel/d/a/obj/d_a_obj_shield/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_shield/%.d @echo [619] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M619_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M619_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M619_D_FILES := $(M619_O_FILES:.o=.d) +$(M619_D_FILES): +include $(wildcard $(M619_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_sm_door/Makefile b/rel/d/a/obj/d_a_obj_sm_door/Makefile index 31c4d5c48e..73aad7a3df 100644 --- a/rel/d/a/obj/d_a_obj_sm_door/Makefile +++ b/rel/d/a/obj/d_a_obj_sm_door/Makefile @@ -38,10 +38,17 @@ $(M620_TARGET): $(M620_O_FILES) $(M620_LIBS) @python3 tools/lcf.py rel 620 --output $(M620_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M620_LDFLAGS) -o $(M620_TARGET) @build/M620_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sm_door/%.o: rel/d/a/obj/d_a_obj_sm_door/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sm_door/%.o: rel/d/a/obj/d_a_obj_sm_door/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_sm_door/%.d @echo [620] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M620_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M620_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M620_D_FILES := $(M620_O_FILES:.o=.d) +$(M620_D_FILES): +include $(wildcard $(M620_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_smallkey/Makefile b/rel/d/a/obj/d_a_obj_smallkey/Makefile index 8a910dd807..e9f1556c32 100644 --- a/rel/d/a/obj/d_a_obj_smallkey/Makefile +++ b/rel/d/a/obj/d_a_obj_smallkey/Makefile @@ -40,10 +40,17 @@ $(M621_TARGET): $(M621_O_FILES) $(M621_LIBS) @python3 tools/lcf.py rel 621 --output $(M621_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M621_LDFLAGS) -o $(M621_TARGET) @build/M621_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smallkey/%.o: rel/d/a/obj/d_a_obj_smallkey/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smallkey/%.o: rel/d/a/obj/d_a_obj_smallkey/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_smallkey/%.d @echo [621] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M621_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M621_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M621_D_FILES := $(M621_O_FILES:.o=.d) +$(M621_D_FILES): +include $(wildcard $(M621_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_smgdoor/Makefile b/rel/d/a/obj/d_a_obj_smgdoor/Makefile index 8be185df97..f77ffc997e 100644 --- a/rel/d/a/obj/d_a_obj_smgdoor/Makefile +++ b/rel/d/a/obj/d_a_obj_smgdoor/Makefile @@ -40,10 +40,17 @@ $(M622_TARGET): $(M622_O_FILES) $(M622_LIBS) @python3 tools/lcf.py rel 622 --output $(M622_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M622_LDFLAGS) -o $(M622_TARGET) @build/M622_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smgdoor/%.o: rel/d/a/obj/d_a_obj_smgdoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smgdoor/%.o: rel/d/a/obj/d_a_obj_smgdoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_smgdoor/%.d @echo [622] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M622_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M622_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M622_D_FILES := $(M622_O_FILES:.o=.d) +$(M622_D_FILES): +include $(wildcard $(M622_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_smoke/Makefile b/rel/d/a/obj/d_a_obj_smoke/Makefile index bf9f1c6687..0104aa7b01 100644 --- a/rel/d/a/obj/d_a_obj_smoke/Makefile +++ b/rel/d/a/obj/d_a_obj_smoke/Makefile @@ -38,10 +38,17 @@ $(M623_TARGET): $(M623_O_FILES) $(M623_LIBS) @python3 tools/lcf.py rel 623 --output $(M623_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M623_LDFLAGS) -o $(M623_TARGET) @build/M623_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smoke/%.o: rel/d/a/obj/d_a_obj_smoke/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smoke/%.o: rel/d/a/obj/d_a_obj_smoke/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_smoke/%.d @echo [623] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M623_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M623_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M623_D_FILES := $(M623_O_FILES:.o=.d) +$(M623_D_FILES): +include $(wildcard $(M623_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_smtile/Makefile b/rel/d/a/obj/d_a_obj_smtile/Makefile index af685bf927..d162a2ab69 100644 --- a/rel/d/a/obj/d_a_obj_smtile/Makefile +++ b/rel/d/a/obj/d_a_obj_smtile/Makefile @@ -40,10 +40,17 @@ $(M624_TARGET): $(M624_O_FILES) $(M624_LIBS) @python3 tools/lcf.py rel 624 --output $(M624_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M624_LDFLAGS) -o $(M624_TARGET) @build/M624_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smtile/%.o: rel/d/a/obj/d_a_obj_smtile/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smtile/%.o: rel/d/a/obj/d_a_obj_smtile/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_smtile/%.d @echo [624] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M624_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M624_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M624_D_FILES := $(M624_O_FILES:.o=.d) +$(M624_D_FILES): +include $(wildcard $(M624_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_smw_stone/Makefile b/rel/d/a/obj/d_a_obj_smw_stone/Makefile index 408368c7fc..6b5d9a8edf 100644 --- a/rel/d/a/obj/d_a_obj_smw_stone/Makefile +++ b/rel/d/a/obj/d_a_obj_smw_stone/Makefile @@ -38,10 +38,17 @@ $(M625_TARGET): $(M625_O_FILES) $(M625_LIBS) @python3 tools/lcf.py rel 625 --output $(M625_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M625_LDFLAGS) -o $(M625_TARGET) @build/M625_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smw_stone/%.o: rel/d/a/obj/d_a_obj_smw_stone/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_smw_stone/%.o: rel/d/a/obj/d_a_obj_smw_stone/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_smw_stone/%.d @echo [625] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M625_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M625_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M625_D_FILES := $(M625_O_FILES:.o=.d) +$(M625_D_FILES): +include $(wildcard $(M625_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/Makefile b/rel/d/a/obj/d_a_obj_snowEffTag/Makefile index ba0fae6cd2..cc4a325973 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/Makefile +++ b/rel/d/a/obj/d_a_obj_snowEffTag/Makefile @@ -40,10 +40,17 @@ $(M626_TARGET): $(M626_O_FILES) $(M626_LIBS) @python3 tools/lcf.py rel 626 --output $(M626_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M626_LDFLAGS) -o $(M626_TARGET) @build/M626_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_snowEffTag/%.o: rel/d/a/obj/d_a_obj_snowEffTag/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_snowEffTag/%.o: rel/d/a/obj/d_a_obj_snowEffTag/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_snowEffTag/%.d @echo [626] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M626_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M626_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M626_D_FILES := $(M626_O_FILES:.o=.d) +$(M626_D_FILES): +include $(wildcard $(M626_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_snow_soup/Makefile b/rel/d/a/obj/d_a_obj_snow_soup/Makefile index bd47145999..c6cc7ca39e 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/Makefile +++ b/rel/d/a/obj/d_a_obj_snow_soup/Makefile @@ -38,10 +38,17 @@ $(M627_TARGET): $(M627_O_FILES) $(M627_LIBS) @python3 tools/lcf.py rel 627 --output $(M627_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M627_LDFLAGS) -o $(M627_TARGET) @build/M627_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_snow_soup/%.o: rel/d/a/obj/d_a_obj_snow_soup/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_snow_soup/%.o: rel/d/a/obj/d_a_obj_snow_soup/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_snow_soup/%.d @echo [627] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M627_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M627_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M627_D_FILES := $(M627_O_FILES:.o=.d) +$(M627_D_FILES): +include $(wildcard $(M627_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_so/Makefile b/rel/d/a/obj/d_a_obj_so/Makefile index 81380a1274..5eb32ffa8c 100644 --- a/rel/d/a/obj/d_a_obj_so/Makefile +++ b/rel/d/a/obj/d_a_obj_so/Makefile @@ -40,10 +40,17 @@ $(M628_TARGET): $(M628_O_FILES) $(M628_LIBS) @python3 tools/lcf.py rel 628 --output $(M628_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M628_LDFLAGS) -o $(M628_TARGET) @build/M628_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_so/%.o: rel/d/a/obj/d_a_obj_so/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_so/%.o: rel/d/a/obj/d_a_obj_so/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_so/%.d @echo [628] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M628_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M628_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M628_D_FILES := $(M628_O_FILES:.o=.d) +$(M628_D_FILES): +include $(wildcard $(M628_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_spinLift/Makefile b/rel/d/a/obj/d_a_obj_spinLift/Makefile index b8dc50f514..6fb4d39b40 100644 --- a/rel/d/a/obj/d_a_obj_spinLift/Makefile +++ b/rel/d/a/obj/d_a_obj_spinLift/Makefile @@ -40,10 +40,17 @@ $(M629_TARGET): $(M629_O_FILES) $(M629_LIBS) @python3 tools/lcf.py rel 629 --output $(M629_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M629_LDFLAGS) -o $(M629_TARGET) @build/M629_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_spinLift/%.o: rel/d/a/obj/d_a_obj_spinLift/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_spinLift/%.o: rel/d/a/obj/d_a_obj_spinLift/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_spinLift/%.d @echo [629] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M629_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M629_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M629_D_FILES := $(M629_O_FILES:.o=.d) +$(M629_D_FILES): +include $(wildcard $(M629_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ss_drink/Makefile b/rel/d/a/obj/d_a_obj_ss_drink/Makefile index 3d986f20b5..2e1b589df8 100644 --- a/rel/d/a/obj/d_a_obj_ss_drink/Makefile +++ b/rel/d/a/obj/d_a_obj_ss_drink/Makefile @@ -38,10 +38,17 @@ $(M630_TARGET): $(M630_O_FILES) $(M630_LIBS) @python3 tools/lcf.py rel 630 --output $(M630_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M630_LDFLAGS) -o $(M630_TARGET) @build/M630_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ss_drink/%.o: rel/d/a/obj/d_a_obj_ss_drink/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ss_drink/%.o: rel/d/a/obj/d_a_obj_ss_drink/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ss_drink/%.d @echo [630] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M630_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M630_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M630_D_FILES := $(M630_O_FILES:.o=.d) +$(M630_D_FILES): +include $(wildcard $(M630_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ss_item/Makefile b/rel/d/a/obj/d_a_obj_ss_item/Makefile index 80fd75166c..b6d468f4de 100644 --- a/rel/d/a/obj/d_a_obj_ss_item/Makefile +++ b/rel/d/a/obj/d_a_obj_ss_item/Makefile @@ -38,10 +38,17 @@ $(M631_TARGET): $(M631_O_FILES) $(M631_LIBS) @python3 tools/lcf.py rel 631 --output $(M631_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M631_LDFLAGS) -o $(M631_TARGET) @build/M631_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ss_item/%.o: rel/d/a/obj/d_a_obj_ss_item/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ss_item/%.o: rel/d/a/obj/d_a_obj_ss_item/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ss_item/%.d @echo [631] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M631_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M631_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M631_D_FILES := $(M631_O_FILES:.o=.d) +$(M631_D_FILES): +include $(wildcard $(M631_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_stairBlock/Makefile b/rel/d/a/obj/d_a_obj_stairBlock/Makefile index 24a2059125..87908ecbe3 100644 --- a/rel/d/a/obj/d_a_obj_stairBlock/Makefile +++ b/rel/d/a/obj/d_a_obj_stairBlock/Makefile @@ -40,10 +40,17 @@ $(M632_TARGET): $(M632_O_FILES) $(M632_LIBS) @python3 tools/lcf.py rel 632 --output $(M632_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M632_LDFLAGS) -o $(M632_TARGET) @build/M632_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stairBlock/%.o: rel/d/a/obj/d_a_obj_stairBlock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stairBlock/%.o: rel/d/a/obj/d_a_obj_stairBlock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_stairBlock/%.d @echo [632] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M632_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M632_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M632_D_FILES := $(M632_O_FILES:.o=.d) +$(M632_D_FILES): +include $(wildcard $(M632_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_stick/Makefile b/rel/d/a/obj/d_a_obj_stick/Makefile index 1817bd1461..922b856ddf 100644 --- a/rel/d/a/obj/d_a_obj_stick/Makefile +++ b/rel/d/a/obj/d_a_obj_stick/Makefile @@ -40,10 +40,17 @@ $(M112_TARGET): $(M112_O_FILES) $(M112_LIBS) @python3 tools/lcf.py rel 112 --output $(M112_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M112_LDFLAGS) -o $(M112_TARGET) @build/M112_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stick/%.o: rel/d/a/obj/d_a_obj_stick/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stick/%.o: rel/d/a/obj/d_a_obj_stick/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_stick/%.d @echo [112] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M112_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M112_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M112_D_FILES := $(M112_O_FILES:.o=.d) +$(M112_D_FILES): +include $(wildcard $(M112_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_stone/Makefile b/rel/d/a/obj/d_a_obj_stone/Makefile index 19ea989777..822f444240 100644 --- a/rel/d/a/obj/d_a_obj_stone/Makefile +++ b/rel/d/a/obj/d_a_obj_stone/Makefile @@ -40,10 +40,17 @@ $(M633_TARGET): $(M633_O_FILES) $(M633_LIBS) @python3 tools/lcf.py rel 633 --output $(M633_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M633_LDFLAGS) -o $(M633_TARGET) @build/M633_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stone/%.o: rel/d/a/obj/d_a_obj_stone/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stone/%.o: rel/d/a/obj/d_a_obj_stone/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_stone/%.d @echo [633] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M633_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M633_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M633_D_FILES := $(M633_O_FILES:.o=.d) +$(M633_D_FILES): +include $(wildcard $(M633_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_stonemark/Makefile b/rel/d/a/obj/d_a_obj_stonemark/Makefile index 90d4b901c9..3342221221 100644 --- a/rel/d/a/obj/d_a_obj_stonemark/Makefile +++ b/rel/d/a/obj/d_a_obj_stonemark/Makefile @@ -38,10 +38,17 @@ $(M113_TARGET): $(M113_O_FILES) $(M113_LIBS) @python3 tools/lcf.py rel 113 --output $(M113_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M113_LDFLAGS) -o $(M113_TARGET) @build/M113_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stonemark/%.o: rel/d/a/obj/d_a_obj_stonemark/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stonemark/%.o: rel/d/a/obj/d_a_obj_stonemark/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_stonemark/%.d @echo [113] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M113_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M113_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M113_D_FILES := $(M113_O_FILES:.o=.d) +$(M113_D_FILES): +include $(wildcard $(M113_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_stopper/Makefile b/rel/d/a/obj/d_a_obj_stopper/Makefile index 18e08f53c7..0348f9b6ca 100644 --- a/rel/d/a/obj/d_a_obj_stopper/Makefile +++ b/rel/d/a/obj/d_a_obj_stopper/Makefile @@ -40,10 +40,17 @@ $(M634_TARGET): $(M634_O_FILES) $(M634_LIBS) @python3 tools/lcf.py rel 634 --output $(M634_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M634_LDFLAGS) -o $(M634_TARGET) @build/M634_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stopper/%.o: rel/d/a/obj/d_a_obj_stopper/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stopper/%.o: rel/d/a/obj/d_a_obj_stopper/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_stopper/%.d @echo [634] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M634_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M634_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M634_D_FILES := $(M634_O_FILES:.o=.d) +$(M634_D_FILES): +include $(wildcard $(M634_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_stopper2/Makefile b/rel/d/a/obj/d_a_obj_stopper2/Makefile index 4c34f0242f..d062cbdc56 100644 --- a/rel/d/a/obj/d_a_obj_stopper2/Makefile +++ b/rel/d/a/obj/d_a_obj_stopper2/Makefile @@ -40,10 +40,17 @@ $(M635_TARGET): $(M635_O_FILES) $(M635_LIBS) @python3 tools/lcf.py rel 635 --output $(M635_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M635_LDFLAGS) -o $(M635_TARGET) @build/M635_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stopper2/%.o: rel/d/a/obj/d_a_obj_stopper2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_stopper2/%.o: rel/d/a/obj/d_a_obj_stopper2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_stopper2/%.d @echo [635] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M635_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M635_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M635_D_FILES := $(M635_O_FILES:.o=.d) +$(M635_D_FILES): +include $(wildcard $(M635_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_suisya/Makefile b/rel/d/a/obj/d_a_obj_suisya/Makefile index 0a9a23a336..c4e63fed70 100644 --- a/rel/d/a/obj/d_a_obj_suisya/Makefile +++ b/rel/d/a/obj/d_a_obj_suisya/Makefile @@ -38,10 +38,17 @@ $(M636_TARGET): $(M636_O_FILES) $(M636_LIBS) @python3 tools/lcf.py rel 636 --output $(M636_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M636_LDFLAGS) -o $(M636_TARGET) @build/M636_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_suisya/%.o: rel/d/a/obj/d_a_obj_suisya/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_suisya/%.o: rel/d/a/obj/d_a_obj_suisya/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_suisya/%.d @echo [636] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M636_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M636_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M636_D_FILES := $(M636_O_FILES:.o=.d) +$(M636_D_FILES): +include $(wildcard $(M636_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_sw/Makefile b/rel/d/a/obj/d_a_obj_sw/Makefile index 4b50b522b6..c6db9103b0 100644 --- a/rel/d/a/obj/d_a_obj_sw/Makefile +++ b/rel/d/a/obj/d_a_obj_sw/Makefile @@ -38,10 +38,17 @@ $(M637_TARGET): $(M637_O_FILES) $(M637_LIBS) @python3 tools/lcf.py rel 637 --output $(M637_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M637_LDFLAGS) -o $(M637_TARGET) @build/M637_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sw/%.o: rel/d/a/obj/d_a_obj_sw/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sw/%.o: rel/d/a/obj/d_a_obj_sw/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_sw/%.d @echo [637] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M637_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M637_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M637_D_FILES := $(M637_O_FILES:.o=.d) +$(M637_D_FILES): +include $(wildcard $(M637_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swBallA/Makefile b/rel/d/a/obj/d_a_obj_swBallA/Makefile index d64b981068..1ba2c6721f 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/Makefile +++ b/rel/d/a/obj/d_a_obj_swBallA/Makefile @@ -38,10 +38,17 @@ $(M638_TARGET): $(M638_O_FILES) $(M638_LIBS) @python3 tools/lcf.py rel 638 --output $(M638_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M638_LDFLAGS) -o $(M638_TARGET) @build/M638_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallA/%.o: rel/d/a/obj/d_a_obj_swBallA/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallA/%.o: rel/d/a/obj/d_a_obj_swBallA/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallA/%.d @echo [638] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M638_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M638_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M638_D_FILES := $(M638_O_FILES:.o=.d) +$(M638_D_FILES): +include $(wildcard $(M638_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swBallB/Makefile b/rel/d/a/obj/d_a_obj_swBallB/Makefile index f76883bedb..b75f40cfcf 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/Makefile +++ b/rel/d/a/obj/d_a_obj_swBallB/Makefile @@ -38,10 +38,17 @@ $(M639_TARGET): $(M639_O_FILES) $(M639_LIBS) @python3 tools/lcf.py rel 639 --output $(M639_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M639_LDFLAGS) -o $(M639_TARGET) @build/M639_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallB/%.o: rel/d/a/obj/d_a_obj_swBallB/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallB/%.o: rel/d/a/obj/d_a_obj_swBallB/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallB/%.d @echo [639] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M639_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M639_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M639_D_FILES := $(M639_O_FILES:.o=.d) +$(M639_D_FILES): +include $(wildcard $(M639_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swBallC/Makefile b/rel/d/a/obj/d_a_obj_swBallC/Makefile index ed71ad35ec..7c37a74582 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/Makefile +++ b/rel/d/a/obj/d_a_obj_swBallC/Makefile @@ -40,10 +40,17 @@ $(M640_TARGET): $(M640_O_FILES) $(M640_LIBS) @python3 tools/lcf.py rel 640 --output $(M640_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M640_LDFLAGS) -o $(M640_TARGET) @build/M640_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallC/%.o: rel/d/a/obj/d_a_obj_swBallC/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallC/%.o: rel/d/a/obj/d_a_obj_swBallC/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swBallC/%.d @echo [640] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M640_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M640_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M640_D_FILES := $(M640_O_FILES:.o=.d) +$(M640_D_FILES): +include $(wildcard $(M640_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swLight/Makefile b/rel/d/a/obj/d_a_obj_swLight/Makefile index 1f2f9e48ee..73196d0853 100644 --- a/rel/d/a/obj/d_a_obj_swLight/Makefile +++ b/rel/d/a/obj/d_a_obj_swLight/Makefile @@ -40,10 +40,17 @@ $(M641_TARGET): $(M641_O_FILES) $(M641_LIBS) @python3 tools/lcf.py rel 641 --output $(M641_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M641_LDFLAGS) -o $(M641_TARGET) @build/M641_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swLight/%.o: rel/d/a/obj/d_a_obj_swLight/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swLight/%.o: rel/d/a/obj/d_a_obj_swLight/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swLight/%.d @echo [641] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M641_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M641_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M641_D_FILES := $(M641_O_FILES:.o=.d) +$(M641_D_FILES): +include $(wildcard $(M641_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swallshutter/Makefile b/rel/d/a/obj/d_a_obj_swallshutter/Makefile index d86b0a36f1..3159cd7e15 100644 --- a/rel/d/a/obj/d_a_obj_swallshutter/Makefile +++ b/rel/d/a/obj/d_a_obj_swallshutter/Makefile @@ -40,10 +40,17 @@ $(M111_TARGET): $(M111_O_FILES) $(M111_LIBS) @python3 tools/lcf.py rel 111 --output $(M111_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M111_LDFLAGS) -o $(M111_TARGET) @build/M111_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swallshutter/%.o: rel/d/a/obj/d_a_obj_swallshutter/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swallshutter/%.o: rel/d/a/obj/d_a_obj_swallshutter/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swallshutter/%.d @echo [111] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M111_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M111_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M111_D_FILES := $(M111_O_FILES:.o=.d) +$(M111_D_FILES): +include $(wildcard $(M111_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swchain/Makefile b/rel/d/a/obj/d_a_obj_swchain/Makefile index 85b7292c23..6fbf466ed4 100644 --- a/rel/d/a/obj/d_a_obj_swchain/Makefile +++ b/rel/d/a/obj/d_a_obj_swchain/Makefile @@ -38,10 +38,17 @@ $(M642_TARGET): $(M642_O_FILES) $(M642_LIBS) @python3 tools/lcf.py rel 642 --output $(M642_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M642_LDFLAGS) -o $(M642_TARGET) @build/M642_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swchain/%.o: rel/d/a/obj/d_a_obj_swchain/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swchain/%.o: rel/d/a/obj/d_a_obj_swchain/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swchain/%.d @echo [642] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M642_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M642_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M642_D_FILES := $(M642_O_FILES:.o=.d) +$(M642_D_FILES): +include $(wildcard $(M642_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swhang/Makefile b/rel/d/a/obj/d_a_obj_swhang/Makefile index 3099da6d03..af4caf3e72 100644 --- a/rel/d/a/obj/d_a_obj_swhang/Makefile +++ b/rel/d/a/obj/d_a_obj_swhang/Makefile @@ -40,10 +40,17 @@ $(M643_TARGET): $(M643_O_FILES) $(M643_LIBS) @python3 tools/lcf.py rel 643 --output $(M643_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M643_LDFLAGS) -o $(M643_TARGET) @build/M643_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swhang/%.o: rel/d/a/obj/d_a_obj_swhang/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swhang/%.o: rel/d/a/obj/d_a_obj_swhang/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swhang/%.d @echo [643] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M643_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M643_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M643_D_FILES := $(M643_O_FILES:.o=.d) +$(M643_D_FILES): +include $(wildcard $(M643_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_sword/Makefile b/rel/d/a/obj/d_a_obj_sword/Makefile index a57b6af86c..36c235291a 100644 --- a/rel/d/a/obj/d_a_obj_sword/Makefile +++ b/rel/d/a/obj/d_a_obj_sword/Makefile @@ -40,10 +40,17 @@ $(M644_TARGET): $(M644_O_FILES) $(M644_LIBS) @python3 tools/lcf.py rel 644 --output $(M644_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M644_LDFLAGS) -o $(M644_TARGET) @build/M644_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sword/%.o: rel/d/a/obj/d_a_obj_sword/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_sword/%.o: rel/d/a/obj/d_a_obj_sword/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_sword/%.d @echo [644] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M644_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M644_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M644_D_FILES := $(M644_O_FILES:.o=.d) +$(M644_D_FILES): +include $(wildcard $(M644_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swpropeller/Makefile b/rel/d/a/obj/d_a_obj_swpropeller/Makefile index 5cd8867071..b150261ebf 100644 --- a/rel/d/a/obj/d_a_obj_swpropeller/Makefile +++ b/rel/d/a/obj/d_a_obj_swpropeller/Makefile @@ -38,10 +38,17 @@ $(M114_TARGET): $(M114_O_FILES) $(M114_LIBS) @python3 tools/lcf.py rel 114 --output $(M114_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M114_LDFLAGS) -o $(M114_TARGET) @build/M114_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpropeller/%.o: rel/d/a/obj/d_a_obj_swpropeller/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpropeller/%.o: rel/d/a/obj/d_a_obj_swpropeller/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpropeller/%.d @echo [114] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M114_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M114_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M114_D_FILES := $(M114_O_FILES:.o=.d) +$(M114_D_FILES): +include $(wildcard $(M114_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swpush/Makefile b/rel/d/a/obj/d_a_obj_swpush/Makefile index 2118dd7201..68e5a42961 100644 --- a/rel/d/a/obj/d_a_obj_swpush/Makefile +++ b/rel/d/a/obj/d_a_obj_swpush/Makefile @@ -40,10 +40,17 @@ $(M21_TARGET): $(M21_O_FILES) $(M21_LIBS) @python3 tools/lcf.py rel 21 --output $(M21_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M21_LDFLAGS) -o $(M21_TARGET) @build/M21_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpush/%.o: rel/d/a/obj/d_a_obj_swpush/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpush/%.o: rel/d/a/obj/d_a_obj_swpush/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpush/%.d @echo [ 21] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M21_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M21_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M21_D_FILES := $(M21_O_FILES:.o=.d) +$(M21_D_FILES): +include $(wildcard $(M21_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swpush2/Makefile b/rel/d/a/obj/d_a_obj_swpush2/Makefile index 27104046b4..090b753ba7 100644 --- a/rel/d/a/obj/d_a_obj_swpush2/Makefile +++ b/rel/d/a/obj/d_a_obj_swpush2/Makefile @@ -40,10 +40,17 @@ $(M645_TARGET): $(M645_O_FILES) $(M645_LIBS) @python3 tools/lcf.py rel 645 --output $(M645_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M645_LDFLAGS) -o $(M645_TARGET) @build/M645_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpush2/%.o: rel/d/a/obj/d_a_obj_swpush2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpush2/%.o: rel/d/a/obj/d_a_obj_swpush2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpush2/%.d @echo [645] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M645_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M645_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M645_D_FILES := $(M645_O_FILES:.o=.d) +$(M645_D_FILES): +include $(wildcard $(M645_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swpush5/Makefile b/rel/d/a/obj/d_a_obj_swpush5/Makefile index aa32679bbf..8db5d0f533 100644 --- a/rel/d/a/obj/d_a_obj_swpush5/Makefile +++ b/rel/d/a/obj/d_a_obj_swpush5/Makefile @@ -40,10 +40,17 @@ $(M115_TARGET): $(M115_O_FILES) $(M115_LIBS) @python3 tools/lcf.py rel 115 --output $(M115_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M115_LDFLAGS) -o $(M115_TARGET) @build/M115_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpush5/%.o: rel/d/a/obj/d_a_obj_swpush5/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpush5/%.o: rel/d/a/obj/d_a_obj_swpush5/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swpush5/%.d @echo [115] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M115_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M115_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M115_D_FILES := $(M115_O_FILES:.o=.d) +$(M115_D_FILES): +include $(wildcard $(M115_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swspinner/Makefile b/rel/d/a/obj/d_a_obj_swspinner/Makefile index 5aa39df856..f0cdc3e8a9 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/Makefile +++ b/rel/d/a/obj/d_a_obj_swspinner/Makefile @@ -38,10 +38,17 @@ $(M646_TARGET): $(M646_O_FILES) $(M646_LIBS) @python3 tools/lcf.py rel 646 --output $(M646_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M646_LDFLAGS) -o $(M646_TARGET) @build/M646_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swspinner/%.o: rel/d/a/obj/d_a_obj_swspinner/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swspinner/%.o: rel/d/a/obj/d_a_obj_swspinner/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swspinner/%.d @echo [646] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M646_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M646_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M646_D_FILES := $(M646_O_FILES:.o=.d) +$(M646_D_FILES): +include $(wildcard $(M646_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_swturn/Makefile b/rel/d/a/obj/d_a_obj_swturn/Makefile index 189c2becf4..32e4230e06 100644 --- a/rel/d/a/obj/d_a_obj_swturn/Makefile +++ b/rel/d/a/obj/d_a_obj_swturn/Makefile @@ -40,10 +40,17 @@ $(M647_TARGET): $(M647_O_FILES) $(M647_LIBS) @python3 tools/lcf.py rel 647 --output $(M647_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M647_LDFLAGS) -o $(M647_TARGET) @build/M647_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swturn/%.o: rel/d/a/obj/d_a_obj_swturn/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_swturn/%.o: rel/d/a/obj/d_a_obj_swturn/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_swturn/%.d @echo [647] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M647_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M647_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M647_D_FILES := $(M647_O_FILES:.o=.d) +$(M647_D_FILES): +include $(wildcard $(M647_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_syRock/Makefile b/rel/d/a/obj/d_a_obj_syRock/Makefile index ec7b340150..8450bdd8fe 100644 --- a/rel/d/a/obj/d_a_obj_syRock/Makefile +++ b/rel/d/a/obj/d_a_obj_syRock/Makefile @@ -40,10 +40,17 @@ $(M648_TARGET): $(M648_O_FILES) $(M648_LIBS) @python3 tools/lcf.py rel 648 --output $(M648_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M648_LDFLAGS) -o $(M648_TARGET) @build/M648_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_syRock/%.o: rel/d/a/obj/d_a_obj_syRock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_syRock/%.o: rel/d/a/obj/d_a_obj_syRock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_syRock/%.d @echo [648] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M648_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M648_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M648_D_FILES := $(M648_O_FILES:.o=.d) +$(M648_D_FILES): +include $(wildcard $(M648_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_szbridge/Makefile b/rel/d/a/obj/d_a_obj_szbridge/Makefile index b503133208..da24d946c9 100644 --- a/rel/d/a/obj/d_a_obj_szbridge/Makefile +++ b/rel/d/a/obj/d_a_obj_szbridge/Makefile @@ -38,10 +38,17 @@ $(M649_TARGET): $(M649_O_FILES) $(M649_LIBS) @python3 tools/lcf.py rel 649 --output $(M649_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M649_LDFLAGS) -o $(M649_TARGET) @build/M649_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_szbridge/%.o: rel/d/a/obj/d_a_obj_szbridge/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_szbridge/%.o: rel/d/a/obj/d_a_obj_szbridge/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_szbridge/%.d @echo [649] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M649_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M649_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M649_D_FILES := $(M649_O_FILES:.o=.d) +$(M649_D_FILES): +include $(wildcard $(M649_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_taFence/Makefile b/rel/d/a/obj/d_a_obj_taFence/Makefile index a1667086d9..f50aff4351 100644 --- a/rel/d/a/obj/d_a_obj_taFence/Makefile +++ b/rel/d/a/obj/d_a_obj_taFence/Makefile @@ -40,10 +40,17 @@ $(M650_TARGET): $(M650_O_FILES) $(M650_LIBS) @python3 tools/lcf.py rel 650 --output $(M650_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M650_LDFLAGS) -o $(M650_TARGET) @build/M650_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_taFence/%.o: rel/d/a/obj/d_a_obj_taFence/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_taFence/%.o: rel/d/a/obj/d_a_obj_taFence/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_taFence/%.d @echo [650] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M650_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M650_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M650_D_FILES := $(M650_O_FILES:.o=.d) +$(M650_D_FILES): +include $(wildcard $(M650_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_table/Makefile b/rel/d/a/obj/d_a_obj_table/Makefile index 9988e46b02..e17ecef9df 100644 --- a/rel/d/a/obj/d_a_obj_table/Makefile +++ b/rel/d/a/obj/d_a_obj_table/Makefile @@ -38,10 +38,17 @@ $(M651_TARGET): $(M651_O_FILES) $(M651_LIBS) @python3 tools/lcf.py rel 651 --output $(M651_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M651_LDFLAGS) -o $(M651_TARGET) @build/M651_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_table/%.o: rel/d/a/obj/d_a_obj_table/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_table/%.o: rel/d/a/obj/d_a_obj_table/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_table/%.d @echo [651] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M651_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M651_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M651_D_FILES := $(M651_O_FILES:.o=.d) +$(M651_D_FILES): +include $(wildcard $(M651_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_takaraDai/Makefile b/rel/d/a/obj/d_a_obj_takaraDai/Makefile index 05563f9fd3..a63f8e0a98 100644 --- a/rel/d/a/obj/d_a_obj_takaraDai/Makefile +++ b/rel/d/a/obj/d_a_obj_takaraDai/Makefile @@ -40,10 +40,17 @@ $(M652_TARGET): $(M652_O_FILES) $(M652_LIBS) @python3 tools/lcf.py rel 652 --output $(M652_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M652_LDFLAGS) -o $(M652_TARGET) @build/M652_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_takaraDai/%.o: rel/d/a/obj/d_a_obj_takaraDai/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_takaraDai/%.o: rel/d/a/obj/d_a_obj_takaraDai/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_takaraDai/%.d @echo [652] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M652_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M652_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M652_D_FILES := $(M652_O_FILES:.o=.d) +$(M652_D_FILES): +include $(wildcard $(M652_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_tatigi/Makefile b/rel/d/a/obj/d_a_obj_tatigi/Makefile index 9f83be97fa..1c40a55fcd 100644 --- a/rel/d/a/obj/d_a_obj_tatigi/Makefile +++ b/rel/d/a/obj/d_a_obj_tatigi/Makefile @@ -38,10 +38,17 @@ $(M653_TARGET): $(M653_O_FILES) $(M653_LIBS) @python3 tools/lcf.py rel 653 --output $(M653_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M653_LDFLAGS) -o $(M653_TARGET) @build/M653_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tatigi/%.o: rel/d/a/obj/d_a_obj_tatigi/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tatigi/%.o: rel/d/a/obj/d_a_obj_tatigi/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_tatigi/%.d @echo [653] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M653_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M653_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M653_D_FILES := $(M653_O_FILES:.o=.d) +$(M653_D_FILES): +include $(wildcard $(M653_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ten/Makefile b/rel/d/a/obj/d_a_obj_ten/Makefile index 12e6cfb442..5eebc4c7ee 100644 --- a/rel/d/a/obj/d_a_obj_ten/Makefile +++ b/rel/d/a/obj/d_a_obj_ten/Makefile @@ -40,10 +40,17 @@ $(M654_TARGET): $(M654_O_FILES) $(M654_LIBS) @python3 tools/lcf.py rel 654 --output $(M654_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M654_LDFLAGS) -o $(M654_TARGET) @build/M654_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ten/%.o: rel/d/a/obj/d_a_obj_ten/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ten/%.o: rel/d/a/obj/d_a_obj_ten/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ten/%.d @echo [654] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M654_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M654_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M654_D_FILES := $(M654_O_FILES:.o=.d) +$(M654_D_FILES): +include $(wildcard $(M654_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_testcube/Makefile b/rel/d/a/obj/d_a_obj_testcube/Makefile index c5331869c7..76b3bfbba1 100644 --- a/rel/d/a/obj/d_a_obj_testcube/Makefile +++ b/rel/d/a/obj/d_a_obj_testcube/Makefile @@ -38,10 +38,17 @@ $(M655_TARGET): $(M655_O_FILES) $(M655_LIBS) @python3 tools/lcf.py rel 655 --output $(M655_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M655_LDFLAGS) -o $(M655_TARGET) @build/M655_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_testcube/%.o: rel/d/a/obj/d_a_obj_testcube/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_testcube/%.o: rel/d/a/obj/d_a_obj_testcube/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_testcube/%.d @echo [655] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M655_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M655_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M655_D_FILES := $(M655_O_FILES:.o=.d) +$(M655_D_FILES): +include $(wildcard $(M655_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_tgake/Makefile b/rel/d/a/obj/d_a_obj_tgake/Makefile index 90c5dd8e7f..da5c3f677e 100644 --- a/rel/d/a/obj/d_a_obj_tgake/Makefile +++ b/rel/d/a/obj/d_a_obj_tgake/Makefile @@ -38,10 +38,17 @@ $(M656_TARGET): $(M656_O_FILES) $(M656_LIBS) @python3 tools/lcf.py rel 656 --output $(M656_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M656_LDFLAGS) -o $(M656_TARGET) @build/M656_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tgake/%.o: rel/d/a/obj/d_a_obj_tgake/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tgake/%.o: rel/d/a/obj/d_a_obj_tgake/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_tgake/%.d @echo [656] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M656_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M656_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M656_D_FILES := $(M656_O_FILES:.o=.d) +$(M656_D_FILES): +include $(wildcard $(M656_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_thashi/Makefile b/rel/d/a/obj/d_a_obj_thashi/Makefile index 74f852d8d7..70fe7de66f 100644 --- a/rel/d/a/obj/d_a_obj_thashi/Makefile +++ b/rel/d/a/obj/d_a_obj_thashi/Makefile @@ -38,10 +38,17 @@ $(M657_TARGET): $(M657_O_FILES) $(M657_LIBS) @python3 tools/lcf.py rel 657 --output $(M657_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M657_LDFLAGS) -o $(M657_TARGET) @build/M657_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_thashi/%.o: rel/d/a/obj/d_a_obj_thashi/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_thashi/%.o: rel/d/a/obj/d_a_obj_thashi/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_thashi/%.d @echo [657] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M657_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M657_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M657_D_FILES := $(M657_O_FILES:.o=.d) +$(M657_D_FILES): +include $(wildcard $(M657_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_thdoor/Makefile b/rel/d/a/obj/d_a_obj_thdoor/Makefile index b567f00211..92a9237dc7 100644 --- a/rel/d/a/obj/d_a_obj_thdoor/Makefile +++ b/rel/d/a/obj/d_a_obj_thdoor/Makefile @@ -40,10 +40,17 @@ $(M658_TARGET): $(M658_O_FILES) $(M658_LIBS) @python3 tools/lcf.py rel 658 --output $(M658_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M658_LDFLAGS) -o $(M658_TARGET) @build/M658_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_thdoor/%.o: rel/d/a/obj/d_a_obj_thdoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_thdoor/%.o: rel/d/a/obj/d_a_obj_thdoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_thdoor/%.d @echo [658] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M658_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M658_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M658_D_FILES := $(M658_O_FILES:.o=.d) +$(M658_D_FILES): +include $(wildcard $(M658_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_timeFire/Makefile b/rel/d/a/obj/d_a_obj_timeFire/Makefile index 5eba12ee2a..0a45f51f22 100644 --- a/rel/d/a/obj/d_a_obj_timeFire/Makefile +++ b/rel/d/a/obj/d_a_obj_timeFire/Makefile @@ -40,10 +40,17 @@ $(M659_TARGET): $(M659_O_FILES) $(M659_LIBS) @python3 tools/lcf.py rel 659 --output $(M659_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M659_LDFLAGS) -o $(M659_TARGET) @build/M659_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_timeFire/%.o: rel/d/a/obj/d_a_obj_timeFire/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_timeFire/%.o: rel/d/a/obj/d_a_obj_timeFire/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_timeFire/%.d @echo [659] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M659_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M659_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M659_D_FILES := $(M659_O_FILES:.o=.d) +$(M659_D_FILES): +include $(wildcard $(M659_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_timer/Makefile b/rel/d/a/obj/d_a_obj_timer/Makefile index 13b7fb622f..9e8859d392 100644 --- a/rel/d/a/obj/d_a_obj_timer/Makefile +++ b/rel/d/a/obj/d_a_obj_timer/Makefile @@ -40,10 +40,17 @@ $(M22_TARGET): $(M22_O_FILES) $(M22_LIBS) @python3 tools/lcf.py rel 22 --output $(M22_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M22_LDFLAGS) -o $(M22_TARGET) @build/M22_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_timer/%.o: rel/d/a/obj/d_a_obj_timer/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_timer/%.o: rel/d/a/obj/d_a_obj_timer/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_timer/%.d @echo [ 22] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M22_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M22_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M22_D_FILES := $(M22_O_FILES:.o=.d) +$(M22_D_FILES): +include $(wildcard $(M22_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_tks/Makefile b/rel/d/a/obj/d_a_obj_tks/Makefile index 00b392857b..c7f4394612 100644 --- a/rel/d/a/obj/d_a_obj_tks/Makefile +++ b/rel/d/a/obj/d_a_obj_tks/Makefile @@ -40,10 +40,17 @@ $(M660_TARGET): $(M660_O_FILES) $(M660_LIBS) @python3 tools/lcf.py rel 660 --output $(M660_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M660_LDFLAGS) -o $(M660_TARGET) @build/M660_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tks/%.o: rel/d/a/obj/d_a_obj_tks/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tks/%.o: rel/d/a/obj/d_a_obj_tks/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_tks/%.d @echo [660] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M660_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M660_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M660_D_FILES := $(M660_O_FILES:.o=.d) +$(M660_D_FILES): +include $(wildcard $(M660_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_tmoon/Makefile b/rel/d/a/obj/d_a_obj_tmoon/Makefile index d6d2224b4b..e7851b66f6 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/Makefile +++ b/rel/d/a/obj/d_a_obj_tmoon/Makefile @@ -38,10 +38,17 @@ $(M661_TARGET): $(M661_O_FILES) $(M661_LIBS) @python3 tools/lcf.py rel 661 --output $(M661_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M661_LDFLAGS) -o $(M661_TARGET) @build/M661_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tmoon/%.o: rel/d/a/obj/d_a_obj_tmoon/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tmoon/%.o: rel/d/a/obj/d_a_obj_tmoon/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_tmoon/%.d @echo [661] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M661_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M661_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M661_D_FILES := $(M661_O_FILES:.o=.d) +$(M661_D_FILES): +include $(wildcard $(M661_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_toaru_maki/Makefile b/rel/d/a/obj/d_a_obj_toaru_maki/Makefile index eeb8372d33..49f88c97ce 100644 --- a/rel/d/a/obj/d_a_obj_toaru_maki/Makefile +++ b/rel/d/a/obj/d_a_obj_toaru_maki/Makefile @@ -38,10 +38,17 @@ $(M662_TARGET): $(M662_O_FILES) $(M662_LIBS) @python3 tools/lcf.py rel 662 --output $(M662_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M662_LDFLAGS) -o $(M662_TARGET) @build/M662_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_toaru_maki/%.o: rel/d/a/obj/d_a_obj_toaru_maki/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_toaru_maki/%.o: rel/d/a/obj/d_a_obj_toaru_maki/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_toaru_maki/%.d @echo [662] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M662_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M662_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M662_D_FILES := $(M662_O_FILES:.o=.d) +$(M662_D_FILES): +include $(wildcard $(M662_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_toby/Makefile b/rel/d/a/obj/d_a_obj_toby/Makefile index e829df05f7..b024775843 100644 --- a/rel/d/a/obj/d_a_obj_toby/Makefile +++ b/rel/d/a/obj/d_a_obj_toby/Makefile @@ -40,10 +40,17 @@ $(M663_TARGET): $(M663_O_FILES) $(M663_LIBS) @python3 tools/lcf.py rel 663 --output $(M663_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M663_LDFLAGS) -o $(M663_TARGET) @build/M663_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_toby/%.o: rel/d/a/obj/d_a_obj_toby/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_toby/%.o: rel/d/a/obj/d_a_obj_toby/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_toby/%.d @echo [663] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M663_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M663_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M663_D_FILES := $(M663_O_FILES:.o=.d) +$(M663_D_FILES): +include $(wildcard $(M663_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_tobyhouse/Makefile b/rel/d/a/obj/d_a_obj_tobyhouse/Makefile index 3c011bece2..d144c59ef3 100644 --- a/rel/d/a/obj/d_a_obj_tobyhouse/Makefile +++ b/rel/d/a/obj/d_a_obj_tobyhouse/Makefile @@ -40,10 +40,17 @@ $(M664_TARGET): $(M664_O_FILES) $(M664_LIBS) @python3 tools/lcf.py rel 664 --output $(M664_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M664_LDFLAGS) -o $(M664_TARGET) @build/M664_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tobyhouse/%.o: rel/d/a/obj/d_a_obj_tobyhouse/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tobyhouse/%.o: rel/d/a/obj/d_a_obj_tobyhouse/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_tobyhouse/%.d @echo [664] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M664_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M664_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M664_D_FILES := $(M664_O_FILES:.o=.d) +$(M664_D_FILES): +include $(wildcard $(M664_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_togeTrap/Makefile b/rel/d/a/obj/d_a_obj_togeTrap/Makefile index 06708988db..bdba018b39 100644 --- a/rel/d/a/obj/d_a_obj_togeTrap/Makefile +++ b/rel/d/a/obj/d_a_obj_togeTrap/Makefile @@ -40,10 +40,17 @@ $(M665_TARGET): $(M665_O_FILES) $(M665_LIBS) @python3 tools/lcf.py rel 665 --output $(M665_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M665_LDFLAGS) -o $(M665_TARGET) @build/M665_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_togeTrap/%.o: rel/d/a/obj/d_a_obj_togeTrap/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_togeTrap/%.o: rel/d/a/obj/d_a_obj_togeTrap/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_togeTrap/%.d @echo [665] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M665_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M665_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M665_D_FILES := $(M665_O_FILES:.o=.d) +$(M665_D_FILES): +include $(wildcard $(M665_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_tombo/Makefile b/rel/d/a/obj/d_a_obj_tombo/Makefile index 1e45175425..be7df8b0cc 100644 --- a/rel/d/a/obj/d_a_obj_tombo/Makefile +++ b/rel/d/a/obj/d_a_obj_tombo/Makefile @@ -40,10 +40,17 @@ $(M666_TARGET): $(M666_O_FILES) $(M666_LIBS) @python3 tools/lcf.py rel 666 --output $(M666_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M666_LDFLAGS) -o $(M666_TARGET) @build/M666_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tombo/%.o: rel/d/a/obj/d_a_obj_tombo/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tombo/%.o: rel/d/a/obj/d_a_obj_tombo/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_tombo/%.d @echo [666] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M666_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M666_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M666_D_FILES := $(M666_O_FILES:.o=.d) +$(M666_D_FILES): +include $(wildcard $(M666_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_tornado/Makefile b/rel/d/a/obj/d_a_obj_tornado/Makefile index 0c878f4769..98399c48f3 100644 --- a/rel/d/a/obj/d_a_obj_tornado/Makefile +++ b/rel/d/a/obj/d_a_obj_tornado/Makefile @@ -38,10 +38,17 @@ $(M667_TARGET): $(M667_O_FILES) $(M667_LIBS) @python3 tools/lcf.py rel 667 --output $(M667_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M667_LDFLAGS) -o $(M667_TARGET) @build/M667_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tornado/%.o: rel/d/a/obj/d_a_obj_tornado/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tornado/%.o: rel/d/a/obj/d_a_obj_tornado/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_tornado/%.d @echo [667] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M667_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M667_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M667_D_FILES := $(M667_O_FILES:.o=.d) +$(M667_D_FILES): +include $(wildcard $(M667_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_tornado2/Makefile b/rel/d/a/obj/d_a_obj_tornado2/Makefile index 05be3bd796..3cec150964 100644 --- a/rel/d/a/obj/d_a_obj_tornado2/Makefile +++ b/rel/d/a/obj/d_a_obj_tornado2/Makefile @@ -38,10 +38,17 @@ $(M668_TARGET): $(M668_O_FILES) $(M668_LIBS) @python3 tools/lcf.py rel 668 --output $(M668_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M668_LDFLAGS) -o $(M668_TARGET) @build/M668_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tornado2/%.o: rel/d/a/obj/d_a_obj_tornado2/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tornado2/%.o: rel/d/a/obj/d_a_obj_tornado2/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_tornado2/%.d @echo [668] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M668_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M668_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M668_D_FILES := $(M668_O_FILES:.o=.d) +$(M668_D_FILES): +include $(wildcard $(M668_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_tp/Makefile b/rel/d/a/obj/d_a_obj_tp/Makefile index 383627b0a4..afc21d9157 100644 --- a/rel/d/a/obj/d_a_obj_tp/Makefile +++ b/rel/d/a/obj/d_a_obj_tp/Makefile @@ -38,10 +38,17 @@ $(M669_TARGET): $(M669_O_FILES) $(M669_LIBS) @python3 tools/lcf.py rel 669 --output $(M669_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M669_LDFLAGS) -o $(M669_TARGET) @build/M669_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tp/%.o: rel/d/a/obj/d_a_obj_tp/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_tp/%.o: rel/d/a/obj/d_a_obj_tp/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_tp/%.d @echo [669] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M669_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M669_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M669_D_FILES := $(M669_O_FILES:.o=.d) +$(M669_D_FILES): +include $(wildcard $(M669_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_treesh/Makefile b/rel/d/a/obj/d_a_obj_treesh/Makefile index 8295228125..b30a4c1e06 100644 --- a/rel/d/a/obj/d_a_obj_treesh/Makefile +++ b/rel/d/a/obj/d_a_obj_treesh/Makefile @@ -40,10 +40,17 @@ $(M670_TARGET): $(M670_O_FILES) $(M670_LIBS) @python3 tools/lcf.py rel 670 --output $(M670_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M670_LDFLAGS) -o $(M670_TARGET) @build/M670_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_treesh/%.o: rel/d/a/obj/d_a_obj_treesh/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_treesh/%.o: rel/d/a/obj/d_a_obj_treesh/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_treesh/%.d @echo [670] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M670_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M670_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M670_D_FILES := $(M670_O_FILES:.o=.d) +$(M670_D_FILES): +include $(wildcard $(M670_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_twGate/Makefile b/rel/d/a/obj/d_a_obj_twGate/Makefile index 57276a1b45..87c80cf204 100644 --- a/rel/d/a/obj/d_a_obj_twGate/Makefile +++ b/rel/d/a/obj/d_a_obj_twGate/Makefile @@ -40,10 +40,17 @@ $(M671_TARGET): $(M671_O_FILES) $(M671_LIBS) @python3 tools/lcf.py rel 671 --output $(M671_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M671_LDFLAGS) -o $(M671_TARGET) @build/M671_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_twGate/%.o: rel/d/a/obj/d_a_obj_twGate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_twGate/%.o: rel/d/a/obj/d_a_obj_twGate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_twGate/%.d @echo [671] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M671_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M671_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M671_D_FILES := $(M671_O_FILES:.o=.d) +$(M671_D_FILES): +include $(wildcard $(M671_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_udoor/Makefile b/rel/d/a/obj/d_a_obj_udoor/Makefile index 1432d7e3a0..9a755fc7f7 100644 --- a/rel/d/a/obj/d_a_obj_udoor/Makefile +++ b/rel/d/a/obj/d_a_obj_udoor/Makefile @@ -38,10 +38,17 @@ $(M672_TARGET): $(M672_O_FILES) $(M672_LIBS) @python3 tools/lcf.py rel 672 --output $(M672_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M672_LDFLAGS) -o $(M672_TARGET) @build/M672_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_udoor/%.o: rel/d/a/obj/d_a_obj_udoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_udoor/%.o: rel/d/a/obj/d_a_obj_udoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_udoor/%.d @echo [672] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M672_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M672_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M672_D_FILES := $(M672_O_FILES:.o=.d) +$(M672_D_FILES): +include $(wildcard $(M672_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_usaku/Makefile b/rel/d/a/obj/d_a_obj_usaku/Makefile index 7aeaea4447..c9ca839060 100644 --- a/rel/d/a/obj/d_a_obj_usaku/Makefile +++ b/rel/d/a/obj/d_a_obj_usaku/Makefile @@ -38,10 +38,17 @@ $(M673_TARGET): $(M673_O_FILES) $(M673_LIBS) @python3 tools/lcf.py rel 673 --output $(M673_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M673_LDFLAGS) -o $(M673_TARGET) @build/M673_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_usaku/%.o: rel/d/a/obj/d_a_obj_usaku/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_usaku/%.o: rel/d/a/obj/d_a_obj_usaku/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_usaku/%.d @echo [673] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M673_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M673_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M673_D_FILES := $(M673_O_FILES:.o=.d) +$(M673_D_FILES): +include $(wildcard $(M673_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_vground/Makefile b/rel/d/a/obj/d_a_obj_vground/Makefile index e4f17f5b55..d748f66901 100644 --- a/rel/d/a/obj/d_a_obj_vground/Makefile +++ b/rel/d/a/obj/d_a_obj_vground/Makefile @@ -38,10 +38,17 @@ $(M674_TARGET): $(M674_O_FILES) $(M674_LIBS) @python3 tools/lcf.py rel 674 --output $(M674_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M674_LDFLAGS) -o $(M674_TARGET) @build/M674_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_vground/%.o: rel/d/a/obj/d_a_obj_vground/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_vground/%.o: rel/d/a/obj/d_a_obj_vground/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_vground/%.d @echo [674] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M674_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M674_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M674_D_FILES := $(M674_O_FILES:.o=.d) +$(M674_D_FILES): +include $(wildcard $(M674_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_volcball/Makefile b/rel/d/a/obj/d_a_obj_volcball/Makefile index 7d2be686f4..3bde1eb3b7 100644 --- a/rel/d/a/obj/d_a_obj_volcball/Makefile +++ b/rel/d/a/obj/d_a_obj_volcball/Makefile @@ -40,10 +40,17 @@ $(M675_TARGET): $(M675_O_FILES) $(M675_LIBS) @python3 tools/lcf.py rel 675 --output $(M675_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M675_LDFLAGS) -o $(M675_TARGET) @build/M675_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_volcball/%.o: rel/d/a/obj/d_a_obj_volcball/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_volcball/%.o: rel/d/a/obj/d_a_obj_volcball/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_volcball/%.d @echo [675] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M675_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M675_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M675_D_FILES := $(M675_O_FILES:.o=.d) +$(M675_D_FILES): +include $(wildcard $(M675_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_volcbom/Makefile b/rel/d/a/obj/d_a_obj_volcbom/Makefile index 2a83d7d0af..61b47c1923 100644 --- a/rel/d/a/obj/d_a_obj_volcbom/Makefile +++ b/rel/d/a/obj/d_a_obj_volcbom/Makefile @@ -40,10 +40,17 @@ $(M676_TARGET): $(M676_O_FILES) $(M676_LIBS) @python3 tools/lcf.py rel 676 --output $(M676_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M676_LDFLAGS) -o $(M676_TARGET) @build/M676_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_volcbom/%.o: rel/d/a/obj/d_a_obj_volcbom/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_volcbom/%.o: rel/d/a/obj/d_a_obj_volcbom/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_volcbom/%.d @echo [676] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M676_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M676_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M676_D_FILES := $(M676_O_FILES:.o=.d) +$(M676_D_FILES): +include $(wildcard $(M676_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_warp_kbrg/Makefile b/rel/d/a/obj/d_a_obj_warp_kbrg/Makefile index 6e18585122..01769aef54 100644 --- a/rel/d/a/obj/d_a_obj_warp_kbrg/Makefile +++ b/rel/d/a/obj/d_a_obj_warp_kbrg/Makefile @@ -40,10 +40,17 @@ $(M677_TARGET): $(M677_O_FILES) $(M677_LIBS) @python3 tools/lcf.py rel 677 --output $(M677_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M677_LDFLAGS) -o $(M677_TARGET) @build/M677_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_warp_kbrg/%.o: rel/d/a/obj/d_a_obj_warp_kbrg/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_warp_kbrg/%.o: rel/d/a/obj/d_a_obj_warp_kbrg/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_warp_kbrg/%.d @echo [677] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M677_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M677_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M677_D_FILES := $(M677_O_FILES:.o=.d) +$(M677_D_FILES): +include $(wildcard $(M677_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_warp_obrg/Makefile b/rel/d/a/obj/d_a_obj_warp_obrg/Makefile index bab7b28667..0332ebdbc4 100644 --- a/rel/d/a/obj/d_a_obj_warp_obrg/Makefile +++ b/rel/d/a/obj/d_a_obj_warp_obrg/Makefile @@ -40,10 +40,17 @@ $(M678_TARGET): $(M678_O_FILES) $(M678_LIBS) @python3 tools/lcf.py rel 678 --output $(M678_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M678_LDFLAGS) -o $(M678_TARGET) @build/M678_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_warp_obrg/%.o: rel/d/a/obj/d_a_obj_warp_obrg/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_warp_obrg/%.o: rel/d/a/obj/d_a_obj_warp_obrg/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_warp_obrg/%.d @echo [678] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M678_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M678_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M678_D_FILES := $(M678_O_FILES:.o=.d) +$(M678_D_FILES): +include $(wildcard $(M678_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_waterGate/Makefile b/rel/d/a/obj/d_a_obj_waterGate/Makefile index 8d1e3b8c50..0bb7d435fc 100644 --- a/rel/d/a/obj/d_a_obj_waterGate/Makefile +++ b/rel/d/a/obj/d_a_obj_waterGate/Makefile @@ -40,10 +40,17 @@ $(M679_TARGET): $(M679_O_FILES) $(M679_LIBS) @python3 tools/lcf.py rel 679 --output $(M679_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M679_LDFLAGS) -o $(M679_TARGET) @build/M679_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_waterGate/%.o: rel/d/a/obj/d_a_obj_waterGate/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_waterGate/%.o: rel/d/a/obj/d_a_obj_waterGate/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_waterGate/%.d @echo [679] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M679_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M679_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M679_D_FILES := $(M679_O_FILES:.o=.d) +$(M679_D_FILES): +include $(wildcard $(M679_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_waterPillar/Makefile b/rel/d/a/obj/d_a_obj_waterPillar/Makefile index 4fddc1f4c9..60d4ace7a9 100644 --- a/rel/d/a/obj/d_a_obj_waterPillar/Makefile +++ b/rel/d/a/obj/d_a_obj_waterPillar/Makefile @@ -40,10 +40,17 @@ $(M680_TARGET): $(M680_O_FILES) $(M680_LIBS) @python3 tools/lcf.py rel 680 --output $(M680_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M680_LDFLAGS) -o $(M680_TARGET) @build/M680_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_waterPillar/%.o: rel/d/a/obj/d_a_obj_waterPillar/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_waterPillar/%.o: rel/d/a/obj/d_a_obj_waterPillar/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_waterPillar/%.d @echo [680] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M680_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M680_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M680_D_FILES := $(M680_O_FILES:.o=.d) +$(M680_D_FILES): +include $(wildcard $(M680_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_waterfall/Makefile b/rel/d/a/obj/d_a_obj_waterfall/Makefile index 1cd52c61e5..3148f9ac44 100644 --- a/rel/d/a/obj/d_a_obj_waterfall/Makefile +++ b/rel/d/a/obj/d_a_obj_waterfall/Makefile @@ -38,10 +38,17 @@ $(M681_TARGET): $(M681_O_FILES) $(M681_LIBS) @python3 tools/lcf.py rel 681 --output $(M681_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M681_LDFLAGS) -o $(M681_TARGET) @build/M681_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_waterfall/%.o: rel/d/a/obj/d_a_obj_waterfall/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_waterfall/%.o: rel/d/a/obj/d_a_obj_waterfall/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_waterfall/%.d @echo [681] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M681_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M681_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M681_D_FILES := $(M681_O_FILES:.o=.d) +$(M681_D_FILES): +include $(wildcard $(M681_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_wchain/Makefile b/rel/d/a/obj/d_a_obj_wchain/Makefile index e9e1caea96..9b5ba0faf9 100644 --- a/rel/d/a/obj/d_a_obj_wchain/Makefile +++ b/rel/d/a/obj/d_a_obj_wchain/Makefile @@ -38,10 +38,17 @@ $(M682_TARGET): $(M682_O_FILES) $(M682_LIBS) @python3 tools/lcf.py rel 682 --output $(M682_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M682_LDFLAGS) -o $(M682_TARGET) @build/M682_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wchain/%.o: rel/d/a/obj/d_a_obj_wchain/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wchain/%.o: rel/d/a/obj/d_a_obj_wchain/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_wchain/%.d @echo [682] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M682_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M682_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M682_D_FILES := $(M682_O_FILES:.o=.d) +$(M682_D_FILES): +include $(wildcard $(M682_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_wdStick/Makefile b/rel/d/a/obj/d_a_obj_wdStick/Makefile index 9abe509f22..c4d2a607b3 100644 --- a/rel/d/a/obj/d_a_obj_wdStick/Makefile +++ b/rel/d/a/obj/d_a_obj_wdStick/Makefile @@ -40,10 +40,17 @@ $(M683_TARGET): $(M683_O_FILES) $(M683_LIBS) @python3 tools/lcf.py rel 683 --output $(M683_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M683_LDFLAGS) -o $(M683_TARGET) @build/M683_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wdStick/%.o: rel/d/a/obj/d_a_obj_wdStick/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wdStick/%.o: rel/d/a/obj/d_a_obj_wdStick/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_wdStick/%.d @echo [683] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M683_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M683_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M683_D_FILES := $(M683_O_FILES:.o=.d) +$(M683_D_FILES): +include $(wildcard $(M683_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_web0/Makefile b/rel/d/a/obj/d_a_obj_web0/Makefile index f89b3bd079..6b9ce9ff4a 100644 --- a/rel/d/a/obj/d_a_obj_web0/Makefile +++ b/rel/d/a/obj/d_a_obj_web0/Makefile @@ -40,10 +40,17 @@ $(M684_TARGET): $(M684_O_FILES) $(M684_LIBS) @python3 tools/lcf.py rel 684 --output $(M684_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M684_LDFLAGS) -o $(M684_TARGET) @build/M684_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_web0/%.o: rel/d/a/obj/d_a_obj_web0/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_web0/%.o: rel/d/a/obj/d_a_obj_web0/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_web0/%.d @echo [684] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M684_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M684_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M684_D_FILES := $(M684_O_FILES:.o=.d) +$(M684_D_FILES): +include $(wildcard $(M684_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_web1/Makefile b/rel/d/a/obj/d_a_obj_web1/Makefile index 04bb5523a0..d618630e22 100644 --- a/rel/d/a/obj/d_a_obj_web1/Makefile +++ b/rel/d/a/obj/d_a_obj_web1/Makefile @@ -40,10 +40,17 @@ $(M685_TARGET): $(M685_O_FILES) $(M685_LIBS) @python3 tools/lcf.py rel 685 --output $(M685_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M685_LDFLAGS) -o $(M685_TARGET) @build/M685_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_web1/%.o: rel/d/a/obj/d_a_obj_web1/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_web1/%.o: rel/d/a/obj/d_a_obj_web1/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_web1/%.d @echo [685] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M685_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M685_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M685_D_FILES := $(M685_O_FILES:.o=.d) +$(M685_D_FILES): +include $(wildcard $(M685_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_well_cover/Makefile b/rel/d/a/obj/d_a_obj_well_cover/Makefile index 7ce7d96c1d..378364ba46 100644 --- a/rel/d/a/obj/d_a_obj_well_cover/Makefile +++ b/rel/d/a/obj/d_a_obj_well_cover/Makefile @@ -40,10 +40,17 @@ $(M686_TARGET): $(M686_O_FILES) $(M686_LIBS) @python3 tools/lcf.py rel 686 --output $(M686_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M686_LDFLAGS) -o $(M686_TARGET) @build/M686_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_well_cover/%.o: rel/d/a/obj/d_a_obj_well_cover/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_well_cover/%.o: rel/d/a/obj/d_a_obj_well_cover/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_well_cover/%.d @echo [686] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M686_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M686_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M686_D_FILES := $(M686_O_FILES:.o=.d) +$(M686_D_FILES): +include $(wildcard $(M686_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_wflag/Makefile b/rel/d/a/obj/d_a_obj_wflag/Makefile index 760cc0b36e..8780db4663 100644 --- a/rel/d/a/obj/d_a_obj_wflag/Makefile +++ b/rel/d/a/obj/d_a_obj_wflag/Makefile @@ -38,10 +38,17 @@ $(M687_TARGET): $(M687_O_FILES) $(M687_LIBS) @python3 tools/lcf.py rel 687 --output $(M687_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M687_LDFLAGS) -o $(M687_TARGET) @build/M687_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wflag/%.o: rel/d/a/obj/d_a_obj_wflag/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wflag/%.o: rel/d/a/obj/d_a_obj_wflag/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_wflag/%.d @echo [687] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M687_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M687_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M687_D_FILES := $(M687_O_FILES:.o=.d) +$(M687_D_FILES): +include $(wildcard $(M687_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_wind_stone/Makefile b/rel/d/a/obj/d_a_obj_wind_stone/Makefile index eb8da8d4d5..091d250383 100644 --- a/rel/d/a/obj/d_a_obj_wind_stone/Makefile +++ b/rel/d/a/obj/d_a_obj_wind_stone/Makefile @@ -38,10 +38,17 @@ $(M688_TARGET): $(M688_O_FILES) $(M688_LIBS) @python3 tools/lcf.py rel 688 --output $(M688_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M688_LDFLAGS) -o $(M688_TARGET) @build/M688_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wind_stone/%.o: rel/d/a/obj/d_a_obj_wind_stone/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wind_stone/%.o: rel/d/a/obj/d_a_obj_wind_stone/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_wind_stone/%.d @echo [688] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M688_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M688_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M688_D_FILES := $(M688_O_FILES:.o=.d) +$(M688_D_FILES): +include $(wildcard $(M688_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_window/Makefile b/rel/d/a/obj/d_a_obj_window/Makefile index 2cc2e22f46..353cf5427e 100644 --- a/rel/d/a/obj/d_a_obj_window/Makefile +++ b/rel/d/a/obj/d_a_obj_window/Makefile @@ -38,10 +38,17 @@ $(M689_TARGET): $(M689_O_FILES) $(M689_LIBS) @python3 tools/lcf.py rel 689 --output $(M689_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M689_LDFLAGS) -o $(M689_TARGET) @build/M689_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_window/%.o: rel/d/a/obj/d_a_obj_window/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_window/%.o: rel/d/a/obj/d_a_obj_window/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_window/%.d @echo [689] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M689_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M689_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M689_D_FILES := $(M689_O_FILES:.o=.d) +$(M689_D_FILES): +include $(wildcard $(M689_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_wood_pendulum/Makefile b/rel/d/a/obj/d_a_obj_wood_pendulum/Makefile index cf70be8268..342979aee3 100644 --- a/rel/d/a/obj/d_a_obj_wood_pendulum/Makefile +++ b/rel/d/a/obj/d_a_obj_wood_pendulum/Makefile @@ -38,10 +38,17 @@ $(M690_TARGET): $(M690_O_FILES) $(M690_LIBS) @python3 tools/lcf.py rel 690 --output $(M690_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M690_LDFLAGS) -o $(M690_TARGET) @build/M690_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wood_pendulum/%.o: rel/d/a/obj/d_a_obj_wood_pendulum/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wood_pendulum/%.o: rel/d/a/obj/d_a_obj_wood_pendulum/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_wood_pendulum/%.d @echo [690] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M690_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M690_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M690_D_FILES := $(M690_O_FILES:.o=.d) +$(M690_D_FILES): +include $(wildcard $(M690_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_wood_statue/Makefile b/rel/d/a/obj/d_a_obj_wood_statue/Makefile index e5e5170623..0e7b7fdb32 100644 --- a/rel/d/a/obj/d_a_obj_wood_statue/Makefile +++ b/rel/d/a/obj/d_a_obj_wood_statue/Makefile @@ -40,10 +40,17 @@ $(M691_TARGET): $(M691_O_FILES) $(M691_LIBS) @python3 tools/lcf.py rel 691 --output $(M691_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M691_LDFLAGS) -o $(M691_TARGET) @build/M691_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wood_statue/%.o: rel/d/a/obj/d_a_obj_wood_statue/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wood_statue/%.o: rel/d/a/obj/d_a_obj_wood_statue/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_wood_statue/%.d @echo [691] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M691_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M691_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M691_D_FILES := $(M691_O_FILES:.o=.d) +$(M691_D_FILES): +include $(wildcard $(M691_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_wsword/Makefile b/rel/d/a/obj/d_a_obj_wsword/Makefile index ebe9304ab0..5f1cf82e5e 100644 --- a/rel/d/a/obj/d_a_obj_wsword/Makefile +++ b/rel/d/a/obj/d_a_obj_wsword/Makefile @@ -38,10 +38,17 @@ $(M692_TARGET): $(M692_O_FILES) $(M692_LIBS) @python3 tools/lcf.py rel 692 --output $(M692_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M692_LDFLAGS) -o $(M692_TARGET) @build/M692_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wsword/%.o: rel/d/a/obj/d_a_obj_wsword/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_wsword/%.o: rel/d/a/obj/d_a_obj_wsword/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_wsword/%.d @echo [692] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M692_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M692_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M692_D_FILES := $(M692_O_FILES:.o=.d) +$(M692_D_FILES): +include $(wildcard $(M692_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_yel_bag/Makefile b/rel/d/a/obj/d_a_obj_yel_bag/Makefile index f208b48066..ae77327ec2 100644 --- a/rel/d/a/obj/d_a_obj_yel_bag/Makefile +++ b/rel/d/a/obj/d_a_obj_yel_bag/Makefile @@ -40,10 +40,17 @@ $(M693_TARGET): $(M693_O_FILES) $(M693_LIBS) @python3 tools/lcf.py rel 693 --output $(M693_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M693_LDFLAGS) -o $(M693_TARGET) @build/M693_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_yel_bag/%.o: rel/d/a/obj/d_a_obj_yel_bag/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_yel_bag/%.o: rel/d/a/obj/d_a_obj_yel_bag/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_yel_bag/%.d @echo [693] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M693_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M693_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M693_D_FILES := $(M693_O_FILES:.o=.d) +$(M693_D_FILES): +include $(wildcard $(M693_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_yobikusa/Makefile b/rel/d/a/obj/d_a_obj_yobikusa/Makefile index 8af6f1fb6b..be948efac7 100644 --- a/rel/d/a/obj/d_a_obj_yobikusa/Makefile +++ b/rel/d/a/obj/d_a_obj_yobikusa/Makefile @@ -38,10 +38,17 @@ $(M116_TARGET): $(M116_O_FILES) $(M116_LIBS) @python3 tools/lcf.py rel 116 --output $(M116_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M116_LDFLAGS) -o $(M116_TARGET) @build/M116_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_yobikusa/%.o: rel/d/a/obj/d_a_obj_yobikusa/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_yobikusa/%.o: rel/d/a/obj/d_a_obj_yobikusa/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_yobikusa/%.d @echo [116] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M116_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M116_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M116_D_FILES := $(M116_O_FILES:.o=.d) +$(M116_D_FILES): +include $(wildcard $(M116_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_yousei/Makefile b/rel/d/a/obj/d_a_obj_yousei/Makefile index 0e3753c897..b166353573 100644 --- a/rel/d/a/obj/d_a_obj_yousei/Makefile +++ b/rel/d/a/obj/d_a_obj_yousei/Makefile @@ -38,10 +38,17 @@ $(M54_TARGET): $(M54_O_FILES) $(M54_LIBS) @python3 tools/lcf.py rel 54 --output $(M54_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M54_LDFLAGS) -o $(M54_TARGET) @build/M54_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_yousei/%.o: rel/d/a/obj/d_a_obj_yousei/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_yousei/%.o: rel/d/a/obj/d_a_obj_yousei/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_yousei/%.d @echo [ 54] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M54_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M54_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M54_D_FILES := $(M54_O_FILES:.o=.d) +$(M54_D_FILES): +include $(wildcard $(M54_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_ystone/Makefile b/rel/d/a/obj/d_a_obj_ystone/Makefile index 83a393c702..10f5a57936 100644 --- a/rel/d/a/obj/d_a_obj_ystone/Makefile +++ b/rel/d/a/obj/d_a_obj_ystone/Makefile @@ -38,10 +38,17 @@ $(M694_TARGET): $(M694_O_FILES) $(M694_LIBS) @python3 tools/lcf.py rel 694 --output $(M694_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M694_LDFLAGS) -o $(M694_TARGET) @build/M694_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ystone/%.o: rel/d/a/obj/d_a_obj_ystone/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_ystone/%.o: rel/d/a/obj/d_a_obj_ystone/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_ystone/%.d @echo [694] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M694_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M694_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M694_D_FILES := $(M694_O_FILES:.o=.d) +$(M694_D_FILES): +include $(wildcard $(M694_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_zcloth/Makefile b/rel/d/a/obj/d_a_obj_zcloth/Makefile index 0c040ff2b9..f52506815a 100644 --- a/rel/d/a/obj/d_a_obj_zcloth/Makefile +++ b/rel/d/a/obj/d_a_obj_zcloth/Makefile @@ -38,10 +38,17 @@ $(M695_TARGET): $(M695_O_FILES) $(M695_LIBS) @python3 tools/lcf.py rel 695 --output $(M695_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M695_LDFLAGS) -o $(M695_TARGET) @build/M695_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zcloth/%.o: rel/d/a/obj/d_a_obj_zcloth/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zcloth/%.o: rel/d/a/obj/d_a_obj_zcloth/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_zcloth/%.d @echo [695] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M695_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M695_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M695_D_FILES := $(M695_O_FILES:.o=.d) +$(M695_D_FILES): +include $(wildcard $(M695_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_zdoor/Makefile b/rel/d/a/obj/d_a_obj_zdoor/Makefile index 91b90b73e8..e1030b628b 100644 --- a/rel/d/a/obj/d_a_obj_zdoor/Makefile +++ b/rel/d/a/obj/d_a_obj_zdoor/Makefile @@ -38,10 +38,17 @@ $(M696_TARGET): $(M696_O_FILES) $(M696_LIBS) @python3 tools/lcf.py rel 696 --output $(M696_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M696_LDFLAGS) -o $(M696_TARGET) @build/M696_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zdoor/%.o: rel/d/a/obj/d_a_obj_zdoor/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zdoor/%.o: rel/d/a/obj/d_a_obj_zdoor/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_zdoor/%.d @echo [696] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M696_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M696_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M696_D_FILES := $(M696_O_FILES:.o=.d) +$(M696_D_FILES): +include $(wildcard $(M696_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_zrTurara/Makefile b/rel/d/a/obj/d_a_obj_zrTurara/Makefile index bbf6a50767..3fe315c4f8 100644 --- a/rel/d/a/obj/d_a_obj_zrTurara/Makefile +++ b/rel/d/a/obj/d_a_obj_zrTurara/Makefile @@ -40,10 +40,17 @@ $(M697_TARGET): $(M697_O_FILES) $(M697_LIBS) @python3 tools/lcf.py rel 697 --output $(M697_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M697_LDFLAGS) -o $(M697_TARGET) @build/M697_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zrTurara/%.o: rel/d/a/obj/d_a_obj_zrTurara/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zrTurara/%.o: rel/d/a/obj/d_a_obj_zrTurara/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_zrTurara/%.d @echo [697] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M697_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M697_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M697_D_FILES := $(M697_O_FILES:.o=.d) +$(M697_D_FILES): +include $(wildcard $(M697_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_zrTuraraRock/Makefile b/rel/d/a/obj/d_a_obj_zrTuraraRock/Makefile index 7f6f2db8fa..1dd14ce9ad 100644 --- a/rel/d/a/obj/d_a_obj_zrTuraraRock/Makefile +++ b/rel/d/a/obj/d_a_obj_zrTuraraRock/Makefile @@ -40,10 +40,17 @@ $(M698_TARGET): $(M698_O_FILES) $(M698_LIBS) @python3 tools/lcf.py rel 698 --output $(M698_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M698_LDFLAGS) -o $(M698_TARGET) @build/M698_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zrTuraraRock/%.o: rel/d/a/obj/d_a_obj_zrTuraraRock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zrTuraraRock/%.o: rel/d/a/obj/d_a_obj_zrTuraraRock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_zrTuraraRock/%.d @echo [698] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M698_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M698_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M698_D_FILES := $(M698_O_FILES:.o=.d) +$(M698_D_FILES): +include $(wildcard $(M698_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_zraMark/Makefile b/rel/d/a/obj/d_a_obj_zraMark/Makefile index 85dfcbbcb8..d91d6360bc 100644 --- a/rel/d/a/obj/d_a_obj_zraMark/Makefile +++ b/rel/d/a/obj/d_a_obj_zraMark/Makefile @@ -38,10 +38,17 @@ $(M699_TARGET): $(M699_O_FILES) $(M699_LIBS) @python3 tools/lcf.py rel 699 --output $(M699_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M699_LDFLAGS) -o $(M699_TARGET) @build/M699_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zraMark/%.o: rel/d/a/obj/d_a_obj_zraMark/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zraMark/%.o: rel/d/a/obj/d_a_obj_zraMark/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_zraMark/%.d @echo [699] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M699_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M699_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M699_D_FILES := $(M699_O_FILES:.o=.d) +$(M699_D_FILES): +include $(wildcard $(M699_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_zra_freeze/Makefile b/rel/d/a/obj/d_a_obj_zra_freeze/Makefile index 84fbf63ddc..3a3d73d5df 100644 --- a/rel/d/a/obj/d_a_obj_zra_freeze/Makefile +++ b/rel/d/a/obj/d_a_obj_zra_freeze/Makefile @@ -38,10 +38,17 @@ $(M700_TARGET): $(M700_O_FILES) $(M700_LIBS) @python3 tools/lcf.py rel 700 --output $(M700_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M700_LDFLAGS) -o $(M700_TARGET) @build/M700_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zra_freeze/%.o: rel/d/a/obj/d_a_obj_zra_freeze/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zra_freeze/%.o: rel/d/a/obj/d_a_obj_zra_freeze/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_zra_freeze/%.d @echo [700] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M700_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M700_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M700_D_FILES := $(M700_O_FILES:.o=.d) +$(M700_D_FILES): +include $(wildcard $(M700_D_FILES)) +endif diff --git a/rel/d/a/obj/d_a_obj_zra_rock/Makefile b/rel/d/a/obj/d_a_obj_zra_rock/Makefile index 4fbb56cb21..ce37412b3c 100644 --- a/rel/d/a/obj/d_a_obj_zra_rock/Makefile +++ b/rel/d/a/obj/d_a_obj_zra_rock/Makefile @@ -38,10 +38,17 @@ $(M701_TARGET): $(M701_O_FILES) $(M701_LIBS) @python3 tools/lcf.py rel 701 --output $(M701_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M701_LDFLAGS) -o $(M701_TARGET) @build/M701_ofiles -$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zra_rock/%.o: rel/d/a/obj/d_a_obj_zra_rock/%.cpp +$(BUILD_DIR)/rel/d/a/obj/d_a_obj_zra_rock/%.o: rel/d/a/obj/d_a_obj_zra_rock/%.cpp $(BUILD_DIR)/rel/d/a/obj/d_a_obj_zra_rock/%.d @echo [701] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M701_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M701_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M701_D_FILES := $(M701_O_FILES:.o=.d) +$(M701_D_FILES): +include $(wildcard $(M701_D_FILES)) +endif diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/Makefile b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/Makefile index 7099495b4e..733afa3bce 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/Makefile +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/Makefile @@ -38,10 +38,17 @@ $(M572_TARGET): $(M572_O_FILES) $(M572_LIBS) @python3 tools/lcf.py rel 572 --output $(M572_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M572_LDFLAGS) -o $(M572_TARGET) @build/M572_ofiles -$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_6pole/%.cpp +$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_6pole/%.cpp $(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/%.d @echo [572] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M572_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M572_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M572_D_FILES := $(M572_O_FILES:.o=.d) +$(M572_D_FILES): +include $(wildcard $(M572_D_FILES)) +endif diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/Makefile b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/Makefile index be91d7376f..0d551ceaee 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/Makefile +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/Makefile @@ -38,10 +38,17 @@ $(M573_TARGET): $(M573_O_FILES) $(M573_LIBS) @python3 tools/lcf.py rel 573 --output $(M573_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M573_LDFLAGS) -o $(M573_TARGET) @build/M573_ofiles -$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_chain/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_chain/%.cpp +$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_chain/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_chain/%.cpp $(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_chain/%.d @echo [573] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M573_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M573_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M573_D_FILES := $(M573_O_FILES:.o=.d) +$(M573_D_FILES): +include $(wildcard $(M573_D_FILES)) +endif diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/Makefile b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/Makefile index adcfc52bd9..54e3d98b5d 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/Makefile +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/Makefile @@ -38,10 +38,17 @@ $(M574_TARGET): $(M574_O_FILES) $(M574_LIBS) @python3 tools/lcf.py rel 574 --output $(M574_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M574_LDFLAGS) -o $(M574_TARGET) @build/M574_ofiles -$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_sand/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_sand/%.cpp +$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_sand/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_sand/%.cpp $(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_sand/%.d @echo [574] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M574_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M574_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M574_D_FILES := $(M574_O_FILES:.o=.d) +$(M574_D_FILES): +include $(wildcard $(M574_D_FILES)) +endif diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/Makefile b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/Makefile index 6e7472bfa9..aef5974c09 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/Makefile +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/Makefile @@ -38,10 +38,17 @@ $(M575_TARGET): $(M575_O_FILES) $(M575_LIBS) @python3 tools/lcf.py rel 575 --output $(M575_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M575_LDFLAGS) -o $(M575_TARGET) @build/M575_ofiles -$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_screw/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_screw/%.cpp +$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_screw/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_screw/%.cpp $(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_screw/%.d @echo [575] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M575_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M575_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M575_D_FILES := $(M575_O_FILES:.o=.d) +$(M575_D_FILES): +include $(wildcard $(M575_D_FILES)) +endif diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_table/Makefile b/rel/d/a/obj/mirror/d_a_obj_mirror_table/Makefile index 84a889fd1b..dbc0c85bbd 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_table/Makefile +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_table/Makefile @@ -38,10 +38,17 @@ $(M576_TARGET): $(M576_O_FILES) $(M576_LIBS) @python3 tools/lcf.py rel 576 --output $(M576_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M576_LDFLAGS) -o $(M576_TARGET) @build/M576_ofiles -$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_table/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_table/%.cpp +$(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_table/%.o: rel/d/a/obj/mirror/d_a_obj_mirror_table/%.cpp $(BUILD_DIR)/rel/d/a/obj/mirror/d_a_obj_mirror_table/%.d @echo [576] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M576_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M576_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M576_D_FILES := $(M576_O_FILES:.o=.d) +$(M576_D_FILES): +include $(wildcard $(M576_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_Lv6Gate/Makefile b/rel/d/a/tag/d_a_tag_Lv6Gate/Makefile index 82c080ac89..7ed339737c 100644 --- a/rel/d/a/tag/d_a_tag_Lv6Gate/Makefile +++ b/rel/d/a/tag/d_a_tag_Lv6Gate/Makefile @@ -38,10 +38,17 @@ $(M710_TARGET): $(M710_O_FILES) $(M710_LIBS) @python3 tools/lcf.py rel 710 --output $(M710_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M710_LDFLAGS) -o $(M710_TARGET) @build/M710_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_Lv6Gate/%.o: rel/d/a/tag/d_a_tag_Lv6Gate/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_Lv6Gate/%.o: rel/d/a/tag/d_a_tag_Lv6Gate/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_Lv6Gate/%.d @echo [710] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M710_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M710_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M710_D_FILES := $(M710_O_FILES:.o=.d) +$(M710_D_FILES): +include $(wildcard $(M710_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_Lv7Gate/Makefile b/rel/d/a/tag/d_a_tag_Lv7Gate/Makefile index 6eef1c2bf5..8d5d062337 100644 --- a/rel/d/a/tag/d_a_tag_Lv7Gate/Makefile +++ b/rel/d/a/tag/d_a_tag_Lv7Gate/Makefile @@ -38,10 +38,17 @@ $(M711_TARGET): $(M711_O_FILES) $(M711_LIBS) @python3 tools/lcf.py rel 711 --output $(M711_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M711_LDFLAGS) -o $(M711_TARGET) @build/M711_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_Lv7Gate/%.o: rel/d/a/tag/d_a_tag_Lv7Gate/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_Lv7Gate/%.o: rel/d/a/tag/d_a_tag_Lv7Gate/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_Lv7Gate/%.d @echo [711] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M711_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M711_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M711_D_FILES := $(M711_O_FILES:.o=.d) +$(M711_D_FILES): +include $(wildcard $(M711_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_Lv8Gate/Makefile b/rel/d/a/tag/d_a_tag_Lv8Gate/Makefile index f708c8da2f..2e5e57f4a3 100644 --- a/rel/d/a/tag/d_a_tag_Lv8Gate/Makefile +++ b/rel/d/a/tag/d_a_tag_Lv8Gate/Makefile @@ -38,10 +38,17 @@ $(M712_TARGET): $(M712_O_FILES) $(M712_LIBS) @python3 tools/lcf.py rel 712 --output $(M712_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M712_LDFLAGS) -o $(M712_TARGET) @build/M712_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_Lv8Gate/%.o: rel/d/a/tag/d_a_tag_Lv8Gate/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_Lv8Gate/%.o: rel/d/a/tag/d_a_tag_Lv8Gate/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_Lv8Gate/%.d @echo [712] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M712_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M712_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M712_D_FILES := $(M712_O_FILES:.o=.d) +$(M712_D_FILES): +include $(wildcard $(M712_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_TWgate/Makefile b/rel/d/a/tag/d_a_tag_TWgate/Makefile index 9452c95f3d..52fb7c85bf 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/Makefile +++ b/rel/d/a/tag/d_a_tag_TWgate/Makefile @@ -38,10 +38,17 @@ $(M713_TARGET): $(M713_O_FILES) $(M713_LIBS) @python3 tools/lcf.py rel 713 --output $(M713_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M713_LDFLAGS) -o $(M713_TARGET) @build/M713_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_TWgate/%.o: rel/d/a/tag/d_a_tag_TWgate/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_TWgate/%.o: rel/d/a/tag/d_a_tag_TWgate/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_TWgate/%.d @echo [713] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M713_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M713_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M713_D_FILES := $(M713_O_FILES:.o=.d) +$(M713_D_FILES): +include $(wildcard $(M713_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_ajnot/Makefile b/rel/d/a/tag/d_a_tag_ajnot/Makefile index 4895ca8e76..29377decff 100644 --- a/rel/d/a/tag/d_a_tag_ajnot/Makefile +++ b/rel/d/a/tag/d_a_tag_ajnot/Makefile @@ -38,10 +38,17 @@ $(M122_TARGET): $(M122_O_FILES) $(M122_LIBS) @python3 tools/lcf.py rel 122 --output $(M122_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M122_LDFLAGS) -o $(M122_TARGET) @build/M122_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_ajnot/%.o: rel/d/a/tag/d_a_tag_ajnot/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_ajnot/%.o: rel/d/a/tag/d_a_tag_ajnot/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_ajnot/%.d @echo [122] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M122_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M122_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M122_D_FILES := $(M122_O_FILES:.o=.d) +$(M122_D_FILES): +include $(wildcard $(M122_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_allmato/Makefile b/rel/d/a/tag/d_a_tag_allmato/Makefile index ce28d56bc3..28c79ed760 100644 --- a/rel/d/a/tag/d_a_tag_allmato/Makefile +++ b/rel/d/a/tag/d_a_tag_allmato/Makefile @@ -38,10 +38,17 @@ $(M27_TARGET): $(M27_O_FILES) $(M27_LIBS) @python3 tools/lcf.py rel 27 --output $(M27_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M27_LDFLAGS) -o $(M27_TARGET) @build/M27_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_allmato/%.o: rel/d/a/tag/d_a_tag_allmato/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_allmato/%.o: rel/d/a/tag/d_a_tag_allmato/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_allmato/%.d @echo [ 27] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M27_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M27_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M27_D_FILES := $(M27_O_FILES:.o=.d) +$(M27_D_FILES): +include $(wildcard $(M27_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_arena/Makefile b/rel/d/a/tag/d_a_tag_arena/Makefile index 454e6fb0bd..d0036c788d 100644 --- a/rel/d/a/tag/d_a_tag_arena/Makefile +++ b/rel/d/a/tag/d_a_tag_arena/Makefile @@ -38,10 +38,17 @@ $(M714_TARGET): $(M714_O_FILES) $(M714_LIBS) @python3 tools/lcf.py rel 714 --output $(M714_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M714_LDFLAGS) -o $(M714_TARGET) @build/M714_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_arena/%.o: rel/d/a/tag/d_a_tag_arena/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_arena/%.o: rel/d/a/tag/d_a_tag_arena/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_arena/%.d @echo [714] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M714_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M714_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M714_D_FILES := $(M714_O_FILES:.o=.d) +$(M714_D_FILES): +include $(wildcard $(M714_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_assistance/Makefile b/rel/d/a/tag/d_a_tag_assistance/Makefile index 31ca6b2722..5937ed197c 100644 --- a/rel/d/a/tag/d_a_tag_assistance/Makefile +++ b/rel/d/a/tag/d_a_tag_assistance/Makefile @@ -38,10 +38,17 @@ $(M715_TARGET): $(M715_O_FILES) $(M715_LIBS) @python3 tools/lcf.py rel 715 --output $(M715_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M715_LDFLAGS) -o $(M715_TARGET) @build/M715_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_assistance/%.o: rel/d/a/tag/d_a_tag_assistance/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_assistance/%.o: rel/d/a/tag/d_a_tag_assistance/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_assistance/%.d @echo [715] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M715_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M715_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M715_D_FILES := $(M715_O_FILES:.o=.d) +$(M715_D_FILES): +include $(wildcard $(M715_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_attack_item/Makefile b/rel/d/a/tag/d_a_tag_attack_item/Makefile index 2b2cbe5603..b5d4a94027 100644 --- a/rel/d/a/tag/d_a_tag_attack_item/Makefile +++ b/rel/d/a/tag/d_a_tag_attack_item/Makefile @@ -38,10 +38,17 @@ $(M123_TARGET): $(M123_O_FILES) $(M123_LIBS) @python3 tools/lcf.py rel 123 --output $(M123_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M123_LDFLAGS) -o $(M123_TARGET) @build/M123_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_attack_item/%.o: rel/d/a/tag/d_a_tag_attack_item/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_attack_item/%.o: rel/d/a/tag/d_a_tag_attack_item/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_attack_item/%.d @echo [123] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M123_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M123_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M123_D_FILES := $(M123_O_FILES:.o=.d) +$(M123_D_FILES): +include $(wildcard $(M123_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_attention/Makefile b/rel/d/a/tag/d_a_tag_attention/Makefile index 8fc2dec83a..edb385115a 100644 --- a/rel/d/a/tag/d_a_tag_attention/Makefile +++ b/rel/d/a/tag/d_a_tag_attention/Makefile @@ -38,10 +38,17 @@ $(M57_TARGET): $(M57_O_FILES) $(M57_LIBS) @python3 tools/lcf.py rel 57 --output $(M57_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M57_LDFLAGS) -o $(M57_TARGET) @build/M57_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_attention/%.o: rel/d/a/tag/d_a_tag_attention/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_attention/%.o: rel/d/a/tag/d_a_tag_attention/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_attention/%.d @echo [ 57] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M57_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M57_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M57_D_FILES := $(M57_O_FILES:.o=.d) +$(M57_D_FILES): +include $(wildcard $(M57_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_bottle_item/Makefile b/rel/d/a/tag/d_a_tag_bottle_item/Makefile index 54df538e88..36f2477fb2 100644 --- a/rel/d/a/tag/d_a_tag_bottle_item/Makefile +++ b/rel/d/a/tag/d_a_tag_bottle_item/Makefile @@ -38,10 +38,17 @@ $(M716_TARGET): $(M716_O_FILES) $(M716_LIBS) @python3 tools/lcf.py rel 716 --output $(M716_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M716_LDFLAGS) -o $(M716_TARGET) @build/M716_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_bottle_item/%.o: rel/d/a/tag/d_a_tag_bottle_item/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_bottle_item/%.o: rel/d/a/tag/d_a_tag_bottle_item/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_bottle_item/%.d @echo [716] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M716_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M716_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M716_D_FILES := $(M716_O_FILES:.o=.d) +$(M716_D_FILES): +include $(wildcard $(M716_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_camera/Makefile b/rel/d/a/tag/d_a_tag_camera/Makefile index 621caf660e..488d2941bc 100644 --- a/rel/d/a/tag/d_a_tag_camera/Makefile +++ b/rel/d/a/tag/d_a_tag_camera/Makefile @@ -38,10 +38,17 @@ $(M28_TARGET): $(M28_O_FILES) $(M28_LIBS) @python3 tools/lcf.py rel 28 --output $(M28_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M28_LDFLAGS) -o $(M28_TARGET) @build/M28_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_camera/%.o: rel/d/a/tag/d_a_tag_camera/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_camera/%.o: rel/d/a/tag/d_a_tag_camera/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_camera/%.d @echo [ 28] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M28_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M28_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M28_D_FILES := $(M28_O_FILES:.o=.d) +$(M28_D_FILES): +include $(wildcard $(M28_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_chgrestart/Makefile b/rel/d/a/tag/d_a_tag_chgrestart/Makefile index 0cdf46635f..21ea1db606 100644 --- a/rel/d/a/tag/d_a_tag_chgrestart/Makefile +++ b/rel/d/a/tag/d_a_tag_chgrestart/Makefile @@ -38,10 +38,17 @@ $(M717_TARGET): $(M717_O_FILES) $(M717_LIBS) @python3 tools/lcf.py rel 717 --output $(M717_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M717_LDFLAGS) -o $(M717_TARGET) @build/M717_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_chgrestart/%.o: rel/d/a/tag/d_a_tag_chgrestart/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_chgrestart/%.o: rel/d/a/tag/d_a_tag_chgrestart/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_chgrestart/%.d @echo [717] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M717_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M717_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M717_D_FILES := $(M717_O_FILES:.o=.d) +$(M717_D_FILES): +include $(wildcard $(M717_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_chkpoint/Makefile b/rel/d/a/tag/d_a_tag_chkpoint/Makefile index 408efd4370..3c84d67920 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/Makefile +++ b/rel/d/a/tag/d_a_tag_chkpoint/Makefile @@ -38,10 +38,17 @@ $(M29_TARGET): $(M29_O_FILES) $(M29_LIBS) @python3 tools/lcf.py rel 29 --output $(M29_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M29_LDFLAGS) -o $(M29_TARGET) @build/M29_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_chkpoint/%.o: rel/d/a/tag/d_a_tag_chkpoint/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_chkpoint/%.o: rel/d/a/tag/d_a_tag_chkpoint/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_chkpoint/%.d @echo [ 29] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M29_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M29_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M29_D_FILES := $(M29_O_FILES:.o=.d) +$(M29_D_FILES): +include $(wildcard $(M29_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_cstasw/Makefile b/rel/d/a/tag/d_a_tag_cstasw/Makefile index 8099bd0117..d6a17eda60 100644 --- a/rel/d/a/tag/d_a_tag_cstasw/Makefile +++ b/rel/d/a/tag/d_a_tag_cstasw/Makefile @@ -40,10 +40,17 @@ $(M121_TARGET): $(M121_O_FILES) $(M121_LIBS) @python3 tools/lcf.py rel 121 --output $(M121_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M121_LDFLAGS) -o $(M121_TARGET) @build/M121_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_cstasw/%.o: rel/d/a/tag/d_a_tag_cstasw/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_cstasw/%.o: rel/d/a/tag/d_a_tag_cstasw/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_cstasw/%.d @echo [121] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M121_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M121_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M121_D_FILES := $(M121_O_FILES:.o=.d) +$(M121_D_FILES): +include $(wildcard $(M121_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_csw/Makefile b/rel/d/a/tag/d_a_tag_csw/Makefile index 931fd7664b..2eacc2bc88 100644 --- a/rel/d/a/tag/d_a_tag_csw/Makefile +++ b/rel/d/a/tag/d_a_tag_csw/Makefile @@ -38,10 +38,17 @@ $(M718_TARGET): $(M718_O_FILES) $(M718_LIBS) @python3 tools/lcf.py rel 718 --output $(M718_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M718_LDFLAGS) -o $(M718_TARGET) @build/M718_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_csw/%.o: rel/d/a/tag/d_a_tag_csw/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_csw/%.o: rel/d/a/tag/d_a_tag_csw/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_csw/%.d @echo [718] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M718_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M718_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M718_D_FILES := $(M718_O_FILES:.o=.d) +$(M718_D_FILES): +include $(wildcard $(M718_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_escape/Makefile b/rel/d/a/tag/d_a_tag_escape/Makefile index 43acb1f3a9..30b617bbf4 100644 --- a/rel/d/a/tag/d_a_tag_escape/Makefile +++ b/rel/d/a/tag/d_a_tag_escape/Makefile @@ -38,10 +38,17 @@ $(M719_TARGET): $(M719_O_FILES) $(M719_LIBS) @python3 tools/lcf.py rel 719 --output $(M719_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M719_LDFLAGS) -o $(M719_TARGET) @build/M719_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_escape/%.o: rel/d/a/tag/d_a_tag_escape/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_escape/%.o: rel/d/a/tag/d_a_tag_escape/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_escape/%.d @echo [719] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M719_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M719_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M719_D_FILES := $(M719_O_FILES:.o=.d) +$(M719_D_FILES): +include $(wildcard $(M719_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_event/Makefile b/rel/d/a/tag/d_a_tag_event/Makefile index 2a88a417fe..89b8cce84f 100644 --- a/rel/d/a/tag/d_a_tag_event/Makefile +++ b/rel/d/a/tag/d_a_tag_event/Makefile @@ -38,10 +38,17 @@ $(M30_TARGET): $(M30_O_FILES) $(M30_LIBS) @python3 tools/lcf.py rel 30 --output $(M30_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M30_LDFLAGS) -o $(M30_TARGET) @build/M30_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_event/%.o: rel/d/a/tag/d_a_tag_event/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_event/%.o: rel/d/a/tag/d_a_tag_event/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_event/%.d @echo [ 30] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M30_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M30_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M30_D_FILES := $(M30_O_FILES:.o=.d) +$(M30_D_FILES): +include $(wildcard $(M30_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_evt/Makefile b/rel/d/a/tag/d_a_tag_evt/Makefile index 0a8bb8d1ad..5f273948eb 100644 --- a/rel/d/a/tag/d_a_tag_evt/Makefile +++ b/rel/d/a/tag/d_a_tag_evt/Makefile @@ -38,10 +38,17 @@ $(M31_TARGET): $(M31_O_FILES) $(M31_LIBS) @python3 tools/lcf.py rel 31 --output $(M31_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M31_LDFLAGS) -o $(M31_TARGET) @build/M31_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_evt/%.o: rel/d/a/tag/d_a_tag_evt/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_evt/%.o: rel/d/a/tag/d_a_tag_evt/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_evt/%.d @echo [ 31] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M31_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M31_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M31_D_FILES := $(M31_O_FILES:.o=.d) +$(M31_D_FILES): +include $(wildcard $(M31_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_evtarea/Makefile b/rel/d/a/tag/d_a_tag_evtarea/Makefile index 5d7d3bdcb1..c4ab0e9771 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/Makefile +++ b/rel/d/a/tag/d_a_tag_evtarea/Makefile @@ -38,10 +38,17 @@ $(M32_TARGET): $(M32_O_FILES) $(M32_LIBS) @python3 tools/lcf.py rel 32 --output $(M32_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M32_LDFLAGS) -o $(M32_TARGET) @build/M32_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_evtarea/%.o: rel/d/a/tag/d_a_tag_evtarea/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_evtarea/%.o: rel/d/a/tag/d_a_tag_evtarea/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_evtarea/%.d @echo [ 32] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M32_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M32_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M32_D_FILES := $(M32_O_FILES:.o=.d) +$(M32_D_FILES): +include $(wildcard $(M32_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_evtmsg/Makefile b/rel/d/a/tag/d_a_tag_evtmsg/Makefile index f1cd575ae0..66a586a0fc 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/Makefile +++ b/rel/d/a/tag/d_a_tag_evtmsg/Makefile @@ -38,10 +38,17 @@ $(M33_TARGET): $(M33_O_FILES) $(M33_LIBS) @python3 tools/lcf.py rel 33 --output $(M33_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M33_LDFLAGS) -o $(M33_TARGET) @build/M33_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_evtmsg/%.o: rel/d/a/tag/d_a_tag_evtmsg/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_evtmsg/%.o: rel/d/a/tag/d_a_tag_evtmsg/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_evtmsg/%.d @echo [ 33] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M33_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M33_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M33_D_FILES := $(M33_O_FILES:.o=.d) +$(M33_D_FILES): +include $(wildcard $(M33_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_firewall/Makefile b/rel/d/a/tag/d_a_tag_firewall/Makefile index 7d5b210eba..25dfa1c0d1 100644 --- a/rel/d/a/tag/d_a_tag_firewall/Makefile +++ b/rel/d/a/tag/d_a_tag_firewall/Makefile @@ -38,10 +38,17 @@ $(M720_TARGET): $(M720_O_FILES) $(M720_LIBS) @python3 tools/lcf.py rel 720 --output $(M720_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M720_LDFLAGS) -o $(M720_TARGET) @build/M720_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_firewall/%.o: rel/d/a/tag/d_a_tag_firewall/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_firewall/%.o: rel/d/a/tag/d_a_tag_firewall/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_firewall/%.d @echo [720] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M720_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M720_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M720_D_FILES := $(M720_O_FILES:.o=.d) +$(M720_D_FILES): +include $(wildcard $(M720_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_gra/Makefile b/rel/d/a/tag/d_a_tag_gra/Makefile index 877af27ea2..beb8c1ef6b 100644 --- a/rel/d/a/tag/d_a_tag_gra/Makefile +++ b/rel/d/a/tag/d_a_tag_gra/Makefile @@ -38,10 +38,17 @@ $(M721_TARGET): $(M721_O_FILES) $(M721_LIBS) @python3 tools/lcf.py rel 721 --output $(M721_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M721_LDFLAGS) -o $(M721_TARGET) @build/M721_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_gra/%.o: rel/d/a/tag/d_a_tag_gra/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_gra/%.o: rel/d/a/tag/d_a_tag_gra/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_gra/%.d @echo [721] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M721_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M721_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M721_D_FILES := $(M721_O_FILES:.o=.d) +$(M721_D_FILES): +include $(wildcard $(M721_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_gstart/Makefile b/rel/d/a/tag/d_a_tag_gstart/Makefile index bc3a55dcc2..1aeb47f78a 100644 --- a/rel/d/a/tag/d_a_tag_gstart/Makefile +++ b/rel/d/a/tag/d_a_tag_gstart/Makefile @@ -38,10 +38,17 @@ $(M124_TARGET): $(M124_O_FILES) $(M124_LIBS) @python3 tools/lcf.py rel 124 --output $(M124_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M124_LDFLAGS) -o $(M124_TARGET) @build/M124_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_gstart/%.o: rel/d/a/tag/d_a_tag_gstart/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_gstart/%.o: rel/d/a/tag/d_a_tag_gstart/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_gstart/%.d @echo [124] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M124_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M124_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M124_D_FILES := $(M124_O_FILES:.o=.d) +$(M124_D_FILES): +include $(wildcard $(M124_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_guard/Makefile b/rel/d/a/tag/d_a_tag_guard/Makefile index 9796efa405..39245e0748 100644 --- a/rel/d/a/tag/d_a_tag_guard/Makefile +++ b/rel/d/a/tag/d_a_tag_guard/Makefile @@ -38,10 +38,17 @@ $(M722_TARGET): $(M722_O_FILES) $(M722_LIBS) @python3 tools/lcf.py rel 722 --output $(M722_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M722_LDFLAGS) -o $(M722_TARGET) @build/M722_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_guard/%.o: rel/d/a/tag/d_a_tag_guard/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_guard/%.o: rel/d/a/tag/d_a_tag_guard/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_guard/%.d @echo [722] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M722_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M722_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M722_D_FILES := $(M722_O_FILES:.o=.d) +$(M722_D_FILES): +include $(wildcard $(M722_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_hinit/Makefile b/rel/d/a/tag/d_a_tag_hinit/Makefile index a9272d71e1..bc43465ef6 100644 --- a/rel/d/a/tag/d_a_tag_hinit/Makefile +++ b/rel/d/a/tag/d_a_tag_hinit/Makefile @@ -38,10 +38,17 @@ $(M125_TARGET): $(M125_O_FILES) $(M125_LIBS) @python3 tools/lcf.py rel 125 --output $(M125_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M125_LDFLAGS) -o $(M125_TARGET) @build/M125_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_hinit/%.o: rel/d/a/tag/d_a_tag_hinit/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_hinit/%.o: rel/d/a/tag/d_a_tag_hinit/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_hinit/%.d @echo [125] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M125_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M125_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M125_D_FILES := $(M125_O_FILES:.o=.d) +$(M125_D_FILES): +include $(wildcard $(M125_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_hjump/Makefile b/rel/d/a/tag/d_a_tag_hjump/Makefile index 09d4e9503a..f3d5b51676 100644 --- a/rel/d/a/tag/d_a_tag_hjump/Makefile +++ b/rel/d/a/tag/d_a_tag_hjump/Makefile @@ -38,10 +38,17 @@ $(M126_TARGET): $(M126_O_FILES) $(M126_LIBS) @python3 tools/lcf.py rel 126 --output $(M126_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M126_LDFLAGS) -o $(M126_TARGET) @build/M126_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_hjump/%.o: rel/d/a/tag/d_a_tag_hjump/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_hjump/%.o: rel/d/a/tag/d_a_tag_hjump/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_hjump/%.d @echo [126] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M126_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M126_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M126_D_FILES := $(M126_O_FILES:.o=.d) +$(M126_D_FILES): +include $(wildcard $(M126_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_howl/Makefile b/rel/d/a/tag/d_a_tag_howl/Makefile index 456693b166..46fcf0edcd 100644 --- a/rel/d/a/tag/d_a_tag_howl/Makefile +++ b/rel/d/a/tag/d_a_tag_howl/Makefile @@ -38,10 +38,17 @@ $(M34_TARGET): $(M34_O_FILES) $(M34_LIBS) @python3 tools/lcf.py rel 34 --output $(M34_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M34_LDFLAGS) -o $(M34_TARGET) @build/M34_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_howl/%.o: rel/d/a/tag/d_a_tag_howl/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_howl/%.o: rel/d/a/tag/d_a_tag_howl/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_howl/%.d @echo [ 34] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M34_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M34_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M34_D_FILES := $(M34_O_FILES:.o=.d) +$(M34_D_FILES): +include $(wildcard $(M34_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_hstop/Makefile b/rel/d/a/tag/d_a_tag_hstop/Makefile index 5012179a52..3342925ade 100644 --- a/rel/d/a/tag/d_a_tag_hstop/Makefile +++ b/rel/d/a/tag/d_a_tag_hstop/Makefile @@ -40,10 +40,17 @@ $(M127_TARGET): $(M127_O_FILES) $(M127_LIBS) @python3 tools/lcf.py rel 127 --output $(M127_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M127_LDFLAGS) -o $(M127_TARGET) @build/M127_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_hstop/%.o: rel/d/a/tag/d_a_tag_hstop/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_hstop/%.o: rel/d/a/tag/d_a_tag_hstop/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_hstop/%.d @echo [127] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M127_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M127_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M127_D_FILES := $(M127_O_FILES:.o=.d) +$(M127_D_FILES): +include $(wildcard $(M127_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_instruction/Makefile b/rel/d/a/tag/d_a_tag_instruction/Makefile index 4c9367a72a..d0efb78639 100644 --- a/rel/d/a/tag/d_a_tag_instruction/Makefile +++ b/rel/d/a/tag/d_a_tag_instruction/Makefile @@ -38,10 +38,17 @@ $(M723_TARGET): $(M723_O_FILES) $(M723_LIBS) @python3 tools/lcf.py rel 723 --output $(M723_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M723_LDFLAGS) -o $(M723_TARGET) @build/M723_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_instruction/%.o: rel/d/a/tag/d_a_tag_instruction/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_instruction/%.o: rel/d/a/tag/d_a_tag_instruction/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_instruction/%.d @echo [723] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M723_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M723_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M723_D_FILES := $(M723_O_FILES:.o=.d) +$(M723_D_FILES): +include $(wildcard $(M723_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_kago_fall/Makefile b/rel/d/a/tag/d_a_tag_kago_fall/Makefile index f69407bbad..ebce17154a 100644 --- a/rel/d/a/tag/d_a_tag_kago_fall/Makefile +++ b/rel/d/a/tag/d_a_tag_kago_fall/Makefile @@ -38,10 +38,17 @@ $(M724_TARGET): $(M724_O_FILES) $(M724_LIBS) @python3 tools/lcf.py rel 724 --output $(M724_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M724_LDFLAGS) -o $(M724_TARGET) @build/M724_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_kago_fall/%.o: rel/d/a/tag/d_a_tag_kago_fall/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_kago_fall/%.o: rel/d/a/tag/d_a_tag_kago_fall/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_kago_fall/%.d @echo [724] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M724_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M724_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M724_D_FILES := $(M724_O_FILES:.o=.d) +$(M724_D_FILES): +include $(wildcard $(M724_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_kmsg/Makefile b/rel/d/a/tag/d_a_tag_kmsg/Makefile index ebdcf24480..aa5df9df2a 100644 --- a/rel/d/a/tag/d_a_tag_kmsg/Makefile +++ b/rel/d/a/tag/d_a_tag_kmsg/Makefile @@ -38,10 +38,17 @@ $(M35_TARGET): $(M35_O_FILES) $(M35_LIBS) @python3 tools/lcf.py rel 35 --output $(M35_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M35_LDFLAGS) -o $(M35_TARGET) @build/M35_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_kmsg/%.o: rel/d/a/tag/d_a_tag_kmsg/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_kmsg/%.o: rel/d/a/tag/d_a_tag_kmsg/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_kmsg/%.d @echo [ 35] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M35_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M35_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M35_D_FILES := $(M35_O_FILES:.o=.d) +$(M35_D_FILES): +include $(wildcard $(M35_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_lantern/Makefile b/rel/d/a/tag/d_a_tag_lantern/Makefile index 28ff87d0c3..d175760b4a 100644 --- a/rel/d/a/tag/d_a_tag_lantern/Makefile +++ b/rel/d/a/tag/d_a_tag_lantern/Makefile @@ -40,10 +40,17 @@ $(M36_TARGET): $(M36_O_FILES) $(M36_LIBS) @python3 tools/lcf.py rel 36 --output $(M36_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M36_LDFLAGS) -o $(M36_TARGET) @build/M36_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lantern/%.o: rel/d/a/tag/d_a_tag_lantern/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lantern/%.o: rel/d/a/tag/d_a_tag_lantern/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_lantern/%.d @echo [ 36] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M36_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M36_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M36_D_FILES := $(M36_O_FILES:.o=.d) +$(M36_D_FILES): +include $(wildcard $(M36_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_lightball/Makefile b/rel/d/a/tag/d_a_tag_lightball/Makefile index 75d82bcff2..f3ae91e65f 100644 --- a/rel/d/a/tag/d_a_tag_lightball/Makefile +++ b/rel/d/a/tag/d_a_tag_lightball/Makefile @@ -38,10 +38,17 @@ $(M725_TARGET): $(M725_O_FILES) $(M725_LIBS) @python3 tools/lcf.py rel 725 --output $(M725_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M725_LDFLAGS) -o $(M725_TARGET) @build/M725_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lightball/%.o: rel/d/a/tag/d_a_tag_lightball/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lightball/%.o: rel/d/a/tag/d_a_tag_lightball/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_lightball/%.d @echo [725] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M725_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M725_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M725_D_FILES := $(M725_O_FILES:.o=.d) +$(M725_D_FILES): +include $(wildcard $(M725_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/Makefile b/rel/d/a/tag/d_a_tag_lv2prchk/Makefile index 1fc6b41071..2ac9618a26 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/Makefile +++ b/rel/d/a/tag/d_a_tag_lv2prchk/Makefile @@ -40,10 +40,17 @@ $(M128_TARGET): $(M128_O_FILES) $(M128_LIBS) @python3 tools/lcf.py rel 128 --output $(M128_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M128_LDFLAGS) -o $(M128_TARGET) @build/M128_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv2prchk/%.o: rel/d/a/tag/d_a_tag_lv2prchk/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv2prchk/%.o: rel/d/a/tag/d_a_tag_lv2prchk/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv2prchk/%.d @echo [128] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M128_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M128_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M128_D_FILES := $(M128_O_FILES:.o=.d) +$(M128_D_FILES): +include $(wildcard $(M128_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_lv5soup/Makefile b/rel/d/a/tag/d_a_tag_lv5soup/Makefile index ae7d06432d..3bfd8f0a83 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/Makefile +++ b/rel/d/a/tag/d_a_tag_lv5soup/Makefile @@ -38,10 +38,17 @@ $(M726_TARGET): $(M726_O_FILES) $(M726_LIBS) @python3 tools/lcf.py rel 726 --output $(M726_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M726_LDFLAGS) -o $(M726_TARGET) @build/M726_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv5soup/%.o: rel/d/a/tag/d_a_tag_lv5soup/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv5soup/%.o: rel/d/a/tag/d_a_tag_lv5soup/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv5soup/%.d @echo [726] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M726_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M726_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M726_D_FILES := $(M726_O_FILES:.o=.d) +$(M726_D_FILES): +include $(wildcard $(M726_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/Makefile b/rel/d/a/tag/d_a_tag_lv6CstaSw/Makefile index 00b4c27585..81b956649c 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/Makefile +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/Makefile @@ -40,10 +40,17 @@ $(M727_TARGET): $(M727_O_FILES) $(M727_LIBS) @python3 tools/lcf.py rel 727 --output $(M727_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M727_LDFLAGS) -o $(M727_TARGET) @build/M727_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv6CstaSw/%.o: rel/d/a/tag/d_a_tag_lv6CstaSw/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv6CstaSw/%.o: rel/d/a/tag/d_a_tag_lv6CstaSw/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv6CstaSw/%.d @echo [727] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M727_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M727_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M727_D_FILES := $(M727_O_FILES:.o=.d) +$(M727_D_FILES): +include $(wildcard $(M727_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_magne/Makefile b/rel/d/a/tag/d_a_tag_magne/Makefile index 714c3afb03..6aeaef2c94 100644 --- a/rel/d/a/tag/d_a_tag_magne/Makefile +++ b/rel/d/a/tag/d_a_tag_magne/Makefile @@ -38,10 +38,17 @@ $(M129_TARGET): $(M129_O_FILES) $(M129_LIBS) @python3 tools/lcf.py rel 129 --output $(M129_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M129_LDFLAGS) -o $(M129_TARGET) @build/M129_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_magne/%.o: rel/d/a/tag/d_a_tag_magne/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_magne/%.o: rel/d/a/tag/d_a_tag_magne/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_magne/%.d @echo [129] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M129_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M129_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M129_D_FILES := $(M129_O_FILES:.o=.d) +$(M129_D_FILES): +include $(wildcard $(M129_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_mhint/Makefile b/rel/d/a/tag/d_a_tag_mhint/Makefile index 381732a6bf..c43a013fae 100644 --- a/rel/d/a/tag/d_a_tag_mhint/Makefile +++ b/rel/d/a/tag/d_a_tag_mhint/Makefile @@ -38,10 +38,17 @@ $(M130_TARGET): $(M130_O_FILES) $(M130_LIBS) @python3 tools/lcf.py rel 130 --output $(M130_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M130_LDFLAGS) -o $(M130_TARGET) @build/M130_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mhint/%.o: rel/d/a/tag/d_a_tag_mhint/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mhint/%.o: rel/d/a/tag/d_a_tag_mhint/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_mhint/%.d @echo [130] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M130_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M130_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M130_D_FILES := $(M130_O_FILES:.o=.d) +$(M130_D_FILES): +include $(wildcard $(M130_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_mist/Makefile b/rel/d/a/tag/d_a_tag_mist/Makefile index fe249433b7..58849e347a 100644 --- a/rel/d/a/tag/d_a_tag_mist/Makefile +++ b/rel/d/a/tag/d_a_tag_mist/Makefile @@ -38,10 +38,17 @@ $(M37_TARGET): $(M37_O_FILES) $(M37_LIBS) @python3 tools/lcf.py rel 37 --output $(M37_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M37_LDFLAGS) -o $(M37_TARGET) @build/M37_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mist/%.o: rel/d/a/tag/d_a_tag_mist/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mist/%.o: rel/d/a/tag/d_a_tag_mist/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_mist/%.d @echo [ 37] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M37_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M37_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M37_D_FILES := $(M37_O_FILES:.o=.d) +$(M37_D_FILES): +include $(wildcard $(M37_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_mmsg/Makefile b/rel/d/a/tag/d_a_tag_mmsg/Makefile index 5ba4dc5844..aea0988742 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/Makefile +++ b/rel/d/a/tag/d_a_tag_mmsg/Makefile @@ -38,10 +38,17 @@ $(M728_TARGET): $(M728_O_FILES) $(M728_LIBS) @python3 tools/lcf.py rel 728 --output $(M728_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M728_LDFLAGS) -o $(M728_TARGET) @build/M728_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mmsg/%.o: rel/d/a/tag/d_a_tag_mmsg/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mmsg/%.o: rel/d/a/tag/d_a_tag_mmsg/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_mmsg/%.d @echo [728] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M728_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M728_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M728_D_FILES := $(M728_O_FILES:.o=.d) +$(M728_D_FILES): +include $(wildcard $(M728_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_msg/Makefile b/rel/d/a/tag/d_a_tag_msg/Makefile index d313c8c011..58365093d8 100644 --- a/rel/d/a/tag/d_a_tag_msg/Makefile +++ b/rel/d/a/tag/d_a_tag_msg/Makefile @@ -38,10 +38,17 @@ $(M38_TARGET): $(M38_O_FILES) $(M38_LIBS) @python3 tools/lcf.py rel 38 --output $(M38_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M38_LDFLAGS) -o $(M38_TARGET) @build/M38_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_msg/%.o: rel/d/a/tag/d_a_tag_msg/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_msg/%.o: rel/d/a/tag/d_a_tag_msg/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_msg/%.d @echo [ 38] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M38_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M38_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M38_D_FILES := $(M38_O_FILES:.o=.d) +$(M38_D_FILES): +include $(wildcard $(M38_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_mstop/Makefile b/rel/d/a/tag/d_a_tag_mstop/Makefile index acdb616d37..170c4384c8 100644 --- a/rel/d/a/tag/d_a_tag_mstop/Makefile +++ b/rel/d/a/tag/d_a_tag_mstop/Makefile @@ -38,10 +38,17 @@ $(M131_TARGET): $(M131_O_FILES) $(M131_LIBS) @python3 tools/lcf.py rel 131 --output $(M131_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M131_LDFLAGS) -o $(M131_TARGET) @build/M131_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mstop/%.o: rel/d/a/tag/d_a_tag_mstop/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mstop/%.o: rel/d/a/tag/d_a_tag_mstop/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_mstop/%.d @echo [131] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M131_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M131_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M131_D_FILES := $(M131_O_FILES:.o=.d) +$(M131_D_FILES): +include $(wildcard $(M131_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_mwait/Makefile b/rel/d/a/tag/d_a_tag_mwait/Makefile index 668c11313a..e4c0017c4a 100644 --- a/rel/d/a/tag/d_a_tag_mwait/Makefile +++ b/rel/d/a/tag/d_a_tag_mwait/Makefile @@ -38,10 +38,17 @@ $(M729_TARGET): $(M729_O_FILES) $(M729_LIBS) @python3 tools/lcf.py rel 729 --output $(M729_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M729_LDFLAGS) -o $(M729_TARGET) @build/M729_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mwait/%.o: rel/d/a/tag/d_a_tag_mwait/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_mwait/%.o: rel/d/a/tag/d_a_tag_mwait/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_mwait/%.d @echo [729] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M729_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M729_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M729_D_FILES := $(M729_O_FILES:.o=.d) +$(M729_D_FILES): +include $(wildcard $(M729_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_myna2/Makefile b/rel/d/a/tag/d_a_tag_myna2/Makefile index 22f6f5254b..43af892c47 100644 --- a/rel/d/a/tag/d_a_tag_myna2/Makefile +++ b/rel/d/a/tag/d_a_tag_myna2/Makefile @@ -38,10 +38,17 @@ $(M730_TARGET): $(M730_O_FILES) $(M730_LIBS) @python3 tools/lcf.py rel 730 --output $(M730_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M730_LDFLAGS) -o $(M730_TARGET) @build/M730_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_myna2/%.o: rel/d/a/tag/d_a_tag_myna2/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_myna2/%.o: rel/d/a/tag/d_a_tag_myna2/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_myna2/%.d @echo [730] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M730_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M730_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M730_D_FILES := $(M730_O_FILES:.o=.d) +$(M730_D_FILES): +include $(wildcard $(M730_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_myna_light/Makefile b/rel/d/a/tag/d_a_tag_myna_light/Makefile index 08f51a4e1b..b1318dcc63 100644 --- a/rel/d/a/tag/d_a_tag_myna_light/Makefile +++ b/rel/d/a/tag/d_a_tag_myna_light/Makefile @@ -38,10 +38,17 @@ $(M731_TARGET): $(M731_O_FILES) $(M731_LIBS) @python3 tools/lcf.py rel 731 --output $(M731_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M731_LDFLAGS) -o $(M731_TARGET) @build/M731_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_myna_light/%.o: rel/d/a/tag/d_a_tag_myna_light/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_myna_light/%.o: rel/d/a/tag/d_a_tag_myna_light/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_myna_light/%.d @echo [731] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M731_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M731_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M731_D_FILES := $(M731_O_FILES:.o=.d) +$(M731_D_FILES): +include $(wildcard $(M731_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_pachi/Makefile b/rel/d/a/tag/d_a_tag_pachi/Makefile index 232ac412cc..1b026de0db 100644 --- a/rel/d/a/tag/d_a_tag_pachi/Makefile +++ b/rel/d/a/tag/d_a_tag_pachi/Makefile @@ -38,10 +38,17 @@ $(M732_TARGET): $(M732_O_FILES) $(M732_LIBS) @python3 tools/lcf.py rel 732 --output $(M732_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M732_LDFLAGS) -o $(M732_TARGET) @build/M732_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_pachi/%.o: rel/d/a/tag/d_a_tag_pachi/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_pachi/%.o: rel/d/a/tag/d_a_tag_pachi/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_pachi/%.d @echo [732] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M732_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M732_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M732_D_FILES := $(M732_O_FILES:.o=.d) +$(M732_D_FILES): +include $(wildcard $(M732_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_poFire/Makefile b/rel/d/a/tag/d_a_tag_poFire/Makefile index 727669b2f0..f55740d1fa 100644 --- a/rel/d/a/tag/d_a_tag_poFire/Makefile +++ b/rel/d/a/tag/d_a_tag_poFire/Makefile @@ -40,10 +40,17 @@ $(M733_TARGET): $(M733_O_FILES) $(M733_LIBS) @python3 tools/lcf.py rel 733 --output $(M733_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M733_LDFLAGS) -o $(M733_TARGET) @build/M733_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_poFire/%.o: rel/d/a/tag/d_a_tag_poFire/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_poFire/%.o: rel/d/a/tag/d_a_tag_poFire/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_poFire/%.d @echo [733] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M733_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M733_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M733_D_FILES := $(M733_O_FILES:.o=.d) +$(M733_D_FILES): +include $(wildcard $(M733_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_push/Makefile b/rel/d/a/tag/d_a_tag_push/Makefile index e37621ecc7..a8db48b4f5 100644 --- a/rel/d/a/tag/d_a_tag_push/Makefile +++ b/rel/d/a/tag/d_a_tag_push/Makefile @@ -38,10 +38,17 @@ $(M39_TARGET): $(M39_O_FILES) $(M39_LIBS) @python3 tools/lcf.py rel 39 --output $(M39_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M39_LDFLAGS) -o $(M39_TARGET) @build/M39_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_push/%.o: rel/d/a/tag/d_a_tag_push/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_push/%.o: rel/d/a/tag/d_a_tag_push/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_push/%.d @echo [ 39] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M39_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M39_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M39_D_FILES := $(M39_O_FILES:.o=.d) +$(M39_D_FILES): +include $(wildcard $(M39_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_qs/Makefile b/rel/d/a/tag/d_a_tag_qs/Makefile index bcbbfe72a6..052659ac2c 100644 --- a/rel/d/a/tag/d_a_tag_qs/Makefile +++ b/rel/d/a/tag/d_a_tag_qs/Makefile @@ -38,10 +38,17 @@ $(M734_TARGET): $(M734_O_FILES) $(M734_LIBS) @python3 tools/lcf.py rel 734 --output $(M734_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M734_LDFLAGS) -o $(M734_TARGET) @build/M734_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_qs/%.o: rel/d/a/tag/d_a_tag_qs/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_qs/%.o: rel/d/a/tag/d_a_tag_qs/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_qs/%.d @echo [734] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M734_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M734_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M734_D_FILES := $(M734_O_FILES:.o=.d) +$(M734_D_FILES): +include $(wildcard $(M734_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_ret_room/Makefile b/rel/d/a/tag/d_a_tag_ret_room/Makefile index 397bb97f75..91371070f9 100644 --- a/rel/d/a/tag/d_a_tag_ret_room/Makefile +++ b/rel/d/a/tag/d_a_tag_ret_room/Makefile @@ -38,10 +38,17 @@ $(M735_TARGET): $(M735_O_FILES) $(M735_LIBS) @python3 tools/lcf.py rel 735 --output $(M735_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M735_LDFLAGS) -o $(M735_TARGET) @build/M735_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_ret_room/%.o: rel/d/a/tag/d_a_tag_ret_room/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_ret_room/%.o: rel/d/a/tag/d_a_tag_ret_room/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_ret_room/%.d @echo [735] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M735_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M735_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M735_D_FILES := $(M735_O_FILES:.o=.d) +$(M735_D_FILES): +include $(wildcard $(M735_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_river_back/Makefile b/rel/d/a/tag/d_a_tag_river_back/Makefile index bc08cd553d..75f3db3e6c 100644 --- a/rel/d/a/tag/d_a_tag_river_back/Makefile +++ b/rel/d/a/tag/d_a_tag_river_back/Makefile @@ -40,10 +40,17 @@ $(M736_TARGET): $(M736_O_FILES) $(M736_LIBS) @python3 tools/lcf.py rel 736 --output $(M736_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M736_LDFLAGS) -o $(M736_TARGET) @build/M736_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_river_back/%.o: rel/d/a/tag/d_a_tag_river_back/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_river_back/%.o: rel/d/a/tag/d_a_tag_river_back/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_river_back/%.d @echo [736] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M736_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M736_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M736_D_FILES := $(M736_O_FILES:.o=.d) +$(M736_D_FILES): +include $(wildcard $(M736_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_rmbit_sw/Makefile b/rel/d/a/tag/d_a_tag_rmbit_sw/Makefile index afea547906..994bb64b9b 100644 --- a/rel/d/a/tag/d_a_tag_rmbit_sw/Makefile +++ b/rel/d/a/tag/d_a_tag_rmbit_sw/Makefile @@ -38,10 +38,17 @@ $(M737_TARGET): $(M737_O_FILES) $(M737_LIBS) @python3 tools/lcf.py rel 737 --output $(M737_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M737_LDFLAGS) -o $(M737_TARGET) @build/M737_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_rmbit_sw/%.o: rel/d/a/tag/d_a_tag_rmbit_sw/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_rmbit_sw/%.o: rel/d/a/tag/d_a_tag_rmbit_sw/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_rmbit_sw/%.d @echo [737] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M737_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M737_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M737_D_FILES := $(M737_O_FILES:.o=.d) +$(M737_D_FILES): +include $(wildcard $(M737_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_schedule/Makefile b/rel/d/a/tag/d_a_tag_schedule/Makefile index a3c4a3ad7f..6fffd39a13 100644 --- a/rel/d/a/tag/d_a_tag_schedule/Makefile +++ b/rel/d/a/tag/d_a_tag_schedule/Makefile @@ -38,10 +38,17 @@ $(M738_TARGET): $(M738_O_FILES) $(M738_LIBS) @python3 tools/lcf.py rel 738 --output $(M738_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M738_LDFLAGS) -o $(M738_TARGET) @build/M738_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_schedule/%.o: rel/d/a/tag/d_a_tag_schedule/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_schedule/%.o: rel/d/a/tag/d_a_tag_schedule/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_schedule/%.d @echo [738] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M738_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M738_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M738_D_FILES := $(M738_O_FILES:.o=.d) +$(M738_D_FILES): +include $(wildcard $(M738_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_setBall/Makefile b/rel/d/a/tag/d_a_tag_setBall/Makefile index 4a82589fb4..af53ee8e10 100644 --- a/rel/d/a/tag/d_a_tag_setBall/Makefile +++ b/rel/d/a/tag/d_a_tag_setBall/Makefile @@ -38,10 +38,17 @@ $(M739_TARGET): $(M739_O_FILES) $(M739_LIBS) @python3 tools/lcf.py rel 739 --output $(M739_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M739_LDFLAGS) -o $(M739_TARGET) @build/M739_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_setBall/%.o: rel/d/a/tag/d_a_tag_setBall/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_setBall/%.o: rel/d/a/tag/d_a_tag_setBall/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_setBall/%.d @echo [739] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M739_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M739_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M739_D_FILES := $(M739_O_FILES:.o=.d) +$(M739_D_FILES): +include $(wildcard $(M739_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_setrestart/Makefile b/rel/d/a/tag/d_a_tag_setrestart/Makefile index 26fd65b82f..15ff40b09f 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/Makefile +++ b/rel/d/a/tag/d_a_tag_setrestart/Makefile @@ -38,10 +38,17 @@ $(M740_TARGET): $(M740_O_FILES) $(M740_LIBS) @python3 tools/lcf.py rel 740 --output $(M740_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M740_LDFLAGS) -o $(M740_TARGET) @build/M740_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_setrestart/%.o: rel/d/a/tag/d_a_tag_setrestart/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_setrestart/%.o: rel/d/a/tag/d_a_tag_setrestart/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_setrestart/%.d @echo [740] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M740_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M740_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M740_D_FILES := $(M740_O_FILES:.o=.d) +$(M740_D_FILES): +include $(wildcard $(M740_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_shop_camera/Makefile b/rel/d/a/tag/d_a_tag_shop_camera/Makefile index 0c4cfdb055..5bb64d202e 100644 --- a/rel/d/a/tag/d_a_tag_shop_camera/Makefile +++ b/rel/d/a/tag/d_a_tag_shop_camera/Makefile @@ -38,10 +38,17 @@ $(M741_TARGET): $(M741_O_FILES) $(M741_LIBS) @python3 tools/lcf.py rel 741 --output $(M741_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M741_LDFLAGS) -o $(M741_TARGET) @build/M741_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_shop_camera/%.o: rel/d/a/tag/d_a_tag_shop_camera/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_shop_camera/%.o: rel/d/a/tag/d_a_tag_shop_camera/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_shop_camera/%.d @echo [741] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M741_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M741_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M741_D_FILES := $(M741_O_FILES:.o=.d) +$(M741_D_FILES): +include $(wildcard $(M741_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_shop_item/Makefile b/rel/d/a/tag/d_a_tag_shop_item/Makefile index d82ebbc021..5b0fc30b6f 100644 --- a/rel/d/a/tag/d_a_tag_shop_item/Makefile +++ b/rel/d/a/tag/d_a_tag_shop_item/Makefile @@ -38,10 +38,17 @@ $(M742_TARGET): $(M742_O_FILES) $(M742_LIBS) @python3 tools/lcf.py rel 742 --output $(M742_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M742_LDFLAGS) -o $(M742_TARGET) @build/M742_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_shop_item/%.o: rel/d/a/tag/d_a_tag_shop_item/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_shop_item/%.o: rel/d/a/tag/d_a_tag_shop_item/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_shop_item/%.d @echo [742] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M742_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M742_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M742_D_FILES := $(M742_O_FILES:.o=.d) +$(M742_D_FILES): +include $(wildcard $(M742_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_smk_emt/Makefile b/rel/d/a/tag/d_a_tag_smk_emt/Makefile index e0e5c56a7f..9fb7ff7c4c 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/Makefile +++ b/rel/d/a/tag/d_a_tag_smk_emt/Makefile @@ -38,10 +38,17 @@ $(M743_TARGET): $(M743_O_FILES) $(M743_LIBS) @python3 tools/lcf.py rel 743 --output $(M743_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M743_LDFLAGS) -o $(M743_TARGET) @build/M743_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_smk_emt/%.o: rel/d/a/tag/d_a_tag_smk_emt/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_smk_emt/%.o: rel/d/a/tag/d_a_tag_smk_emt/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_smk_emt/%.d @echo [743] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M743_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M743_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M743_D_FILES := $(M743_O_FILES:.o=.d) +$(M743_D_FILES): +include $(wildcard $(M743_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_spinner/Makefile b/rel/d/a/tag/d_a_tag_spinner/Makefile index 1644778a03..b6bdb2bd8e 100644 --- a/rel/d/a/tag/d_a_tag_spinner/Makefile +++ b/rel/d/a/tag/d_a_tag_spinner/Makefile @@ -38,10 +38,17 @@ $(M744_TARGET): $(M744_O_FILES) $(M744_LIBS) @python3 tools/lcf.py rel 744 --output $(M744_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M744_LDFLAGS) -o $(M744_TARGET) @build/M744_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_spinner/%.o: rel/d/a/tag/d_a_tag_spinner/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_spinner/%.o: rel/d/a/tag/d_a_tag_spinner/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_spinner/%.d @echo [744] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M744_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M744_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M744_D_FILES := $(M744_O_FILES:.o=.d) +$(M744_D_FILES): +include $(wildcard $(M744_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_sppath/Makefile b/rel/d/a/tag/d_a_tag_sppath/Makefile index c7031227f9..d9e5aed13d 100644 --- a/rel/d/a/tag/d_a_tag_sppath/Makefile +++ b/rel/d/a/tag/d_a_tag_sppath/Makefile @@ -38,10 +38,17 @@ $(M745_TARGET): $(M745_O_FILES) $(M745_LIBS) @python3 tools/lcf.py rel 745 --output $(M745_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M745_LDFLAGS) -o $(M745_TARGET) @build/M745_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_sppath/%.o: rel/d/a/tag/d_a_tag_sppath/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_sppath/%.o: rel/d/a/tag/d_a_tag_sppath/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_sppath/%.d @echo [745] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M745_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M745_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M745_D_FILES := $(M745_O_FILES:.o=.d) +$(M745_D_FILES): +include $(wildcard $(M745_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_spring/Makefile b/rel/d/a/tag/d_a_tag_spring/Makefile index 33710312c2..048dcd9bf9 100644 --- a/rel/d/a/tag/d_a_tag_spring/Makefile +++ b/rel/d/a/tag/d_a_tag_spring/Makefile @@ -38,10 +38,17 @@ $(M132_TARGET): $(M132_O_FILES) $(M132_LIBS) @python3 tools/lcf.py rel 132 --output $(M132_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M132_LDFLAGS) -o $(M132_TARGET) @build/M132_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_spring/%.o: rel/d/a/tag/d_a_tag_spring/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_spring/%.o: rel/d/a/tag/d_a_tag_spring/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_spring/%.d @echo [132] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M132_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M132_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M132_D_FILES := $(M132_O_FILES:.o=.d) +$(M132_D_FILES): +include $(wildcard $(M132_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_ss_drink/Makefile b/rel/d/a/tag/d_a_tag_ss_drink/Makefile index 6ee08b07f9..72615e15cc 100644 --- a/rel/d/a/tag/d_a_tag_ss_drink/Makefile +++ b/rel/d/a/tag/d_a_tag_ss_drink/Makefile @@ -38,10 +38,17 @@ $(M746_TARGET): $(M746_O_FILES) $(M746_LIBS) @python3 tools/lcf.py rel 746 --output $(M746_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M746_LDFLAGS) -o $(M746_TARGET) @build/M746_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_ss_drink/%.o: rel/d/a/tag/d_a_tag_ss_drink/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_ss_drink/%.o: rel/d/a/tag/d_a_tag_ss_drink/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_ss_drink/%.d @echo [746] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M746_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M746_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M746_D_FILES := $(M746_O_FILES:.o=.d) +$(M746_D_FILES): +include $(wildcard $(M746_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_statue_evt/Makefile b/rel/d/a/tag/d_a_tag_statue_evt/Makefile index 20b6d7eeaf..a491f8db1f 100644 --- a/rel/d/a/tag/d_a_tag_statue_evt/Makefile +++ b/rel/d/a/tag/d_a_tag_statue_evt/Makefile @@ -40,10 +40,17 @@ $(M133_TARGET): $(M133_O_FILES) $(M133_LIBS) @python3 tools/lcf.py rel 133 --output $(M133_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M133_LDFLAGS) -o $(M133_TARGET) @build/M133_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_statue_evt/%.o: rel/d/a/tag/d_a_tag_statue_evt/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_statue_evt/%.o: rel/d/a/tag/d_a_tag_statue_evt/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_statue_evt/%.d @echo [133] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M133_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M133_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M133_D_FILES := $(M133_O_FILES:.o=.d) +$(M133_D_FILES): +include $(wildcard $(M133_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_stream/Makefile b/rel/d/a/tag/d_a_tag_stream/Makefile index b7bf5fb673..32c2d03782 100644 --- a/rel/d/a/tag/d_a_tag_stream/Makefile +++ b/rel/d/a/tag/d_a_tag_stream/Makefile @@ -38,10 +38,17 @@ $(M747_TARGET): $(M747_O_FILES) $(M747_LIBS) @python3 tools/lcf.py rel 747 --output $(M747_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M747_LDFLAGS) -o $(M747_TARGET) @build/M747_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_stream/%.o: rel/d/a/tag/d_a_tag_stream/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_stream/%.o: rel/d/a/tag/d_a_tag_stream/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_stream/%.d @echo [747] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M747_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M747_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M747_D_FILES := $(M747_O_FILES:.o=.d) +$(M747_D_FILES): +include $(wildcard $(M747_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_telop/Makefile b/rel/d/a/tag/d_a_tag_telop/Makefile index 4540f9d08e..18734afa71 100644 --- a/rel/d/a/tag/d_a_tag_telop/Makefile +++ b/rel/d/a/tag/d_a_tag_telop/Makefile @@ -38,10 +38,17 @@ $(M40_TARGET): $(M40_O_FILES) $(M40_LIBS) @python3 tools/lcf.py rel 40 --output $(M40_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M40_LDFLAGS) -o $(M40_TARGET) @build/M40_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_telop/%.o: rel/d/a/tag/d_a_tag_telop/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_telop/%.o: rel/d/a/tag/d_a_tag_telop/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_telop/%.d @echo [ 40] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M40_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M40_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M40_D_FILES := $(M40_O_FILES:.o=.d) +$(M40_D_FILES): +include $(wildcard $(M40_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_theB_hint/Makefile b/rel/d/a/tag/d_a_tag_theB_hint/Makefile index 8d2c128ba4..a87e01829a 100644 --- a/rel/d/a/tag/d_a_tag_theB_hint/Makefile +++ b/rel/d/a/tag/d_a_tag_theB_hint/Makefile @@ -38,10 +38,17 @@ $(M748_TARGET): $(M748_O_FILES) $(M748_LIBS) @python3 tools/lcf.py rel 748 --output $(M748_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M748_LDFLAGS) -o $(M748_TARGET) @build/M748_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_theB_hint/%.o: rel/d/a/tag/d_a_tag_theB_hint/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_theB_hint/%.o: rel/d/a/tag/d_a_tag_theB_hint/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_theB_hint/%.d @echo [748] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M748_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M748_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M748_D_FILES := $(M748_O_FILES:.o=.d) +$(M748_D_FILES): +include $(wildcard $(M748_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_wara_howl/Makefile b/rel/d/a/tag/d_a_tag_wara_howl/Makefile index 7c3eeb0179..9a6acad37a 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/Makefile +++ b/rel/d/a/tag/d_a_tag_wara_howl/Makefile @@ -38,10 +38,17 @@ $(M749_TARGET): $(M749_O_FILES) $(M749_LIBS) @python3 tools/lcf.py rel 749 --output $(M749_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M749_LDFLAGS) -o $(M749_TARGET) @build/M749_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_wara_howl/%.o: rel/d/a/tag/d_a_tag_wara_howl/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_wara_howl/%.o: rel/d/a/tag/d_a_tag_wara_howl/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_wara_howl/%.d @echo [749] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M749_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M749_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M749_D_FILES := $(M749_O_FILES:.o=.d) +$(M749_D_FILES): +include $(wildcard $(M749_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_watchge/Makefile b/rel/d/a/tag/d_a_tag_watchge/Makefile index 5560d0506e..360f968c0d 100644 --- a/rel/d/a/tag/d_a_tag_watchge/Makefile +++ b/rel/d/a/tag/d_a_tag_watchge/Makefile @@ -38,10 +38,17 @@ $(M750_TARGET): $(M750_O_FILES) $(M750_LIBS) @python3 tools/lcf.py rel 750 --output $(M750_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M750_LDFLAGS) -o $(M750_TARGET) @build/M750_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_watchge/%.o: rel/d/a/tag/d_a_tag_watchge/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_watchge/%.o: rel/d/a/tag/d_a_tag_watchge/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_watchge/%.d @echo [750] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M750_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M750_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M750_D_FILES := $(M750_O_FILES:.o=.d) +$(M750_D_FILES): +include $(wildcard $(M750_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_waterfall/Makefile b/rel/d/a/tag/d_a_tag_waterfall/Makefile index 0443091ec3..f487378ebf 100644 --- a/rel/d/a/tag/d_a_tag_waterfall/Makefile +++ b/rel/d/a/tag/d_a_tag_waterfall/Makefile @@ -40,10 +40,17 @@ $(M751_TARGET): $(M751_O_FILES) $(M751_LIBS) @python3 tools/lcf.py rel 751 --output $(M751_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M751_LDFLAGS) -o $(M751_TARGET) @build/M751_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_waterfall/%.o: rel/d/a/tag/d_a_tag_waterfall/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_waterfall/%.o: rel/d/a/tag/d_a_tag_waterfall/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_waterfall/%.d @echo [751] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M751_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M751_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M751_D_FILES := $(M751_O_FILES:.o=.d) +$(M751_D_FILES): +include $(wildcard $(M751_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_wljump/Makefile b/rel/d/a/tag/d_a_tag_wljump/Makefile index 1360fa867a..bfe7c9986c 100644 --- a/rel/d/a/tag/d_a_tag_wljump/Makefile +++ b/rel/d/a/tag/d_a_tag_wljump/Makefile @@ -38,10 +38,17 @@ $(M752_TARGET): $(M752_O_FILES) $(M752_LIBS) @python3 tools/lcf.py rel 752 --output $(M752_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M752_LDFLAGS) -o $(M752_TARGET) @build/M752_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_wljump/%.o: rel/d/a/tag/d_a_tag_wljump/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_wljump/%.o: rel/d/a/tag/d_a_tag_wljump/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_wljump/%.d @echo [752] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M752_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M752_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M752_D_FILES := $(M752_O_FILES:.o=.d) +$(M752_D_FILES): +include $(wildcard $(M752_D_FILES)) +endif diff --git a/rel/d/a/tag/d_a_tag_yami/Makefile b/rel/d/a/tag/d_a_tag_yami/Makefile index 5bbd2f909d..da98777558 100644 --- a/rel/d/a/tag/d_a_tag_yami/Makefile +++ b/rel/d/a/tag/d_a_tag_yami/Makefile @@ -38,10 +38,17 @@ $(M753_TARGET): $(M753_O_FILES) $(M753_LIBS) @python3 tools/lcf.py rel 753 --output $(M753_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M753_LDFLAGS) -o $(M753_TARGET) @build/M753_ofiles -$(BUILD_DIR)/rel/d/a/tag/d_a_tag_yami/%.o: rel/d/a/tag/d_a_tag_yami/%.cpp +$(BUILD_DIR)/rel/d/a/tag/d_a_tag_yami/%.o: rel/d/a/tag/d_a_tag_yami/%.cpp $(BUILD_DIR)/rel/d/a/tag/d_a_tag_yami/%.d @echo [753] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M753_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M753_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M753_D_FILES := $(M753_O_FILES:.o=.d) +$(M753_D_FILES): +include $(wildcard $(M753_D_FILES)) +endif diff --git a/rel/f_pc/f_pc_profile_lst/Makefile b/rel/f_pc/f_pc_profile_lst/Makefile index 300ac3cb5c..120b2e5820 100644 --- a/rel/f_pc/f_pc_profile_lst/Makefile +++ b/rel/f_pc/f_pc_profile_lst/Makefile @@ -38,10 +38,17 @@ $(M1_TARGET): $(M1_O_FILES) $(M1_LIBS) @python3 tools/lcf.py rel 1 --output $(M1_LDSCRIPT) @$(LD) -opt_partial -strip_partial $(M1_LDFLAGS) -o $(M1_TARGET) @build/M1_ofiles -$(BUILD_DIR)/rel/f_pc/f_pc_profile_lst/%.o: rel/f_pc/f_pc_profile_lst/%.cpp +$(BUILD_DIR)/rel/f_pc/f_pc_profile_lst/%.o: rel/f_pc/f_pc_profile_lst/%.cpp $(BUILD_DIR)/rel/f_pc/f_pc_profile_lst/%.d @echo [ 1] building $@ @mkdir -p $(@D) @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(M1_CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(M1_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +M1_D_FILES := $(M1_O_FILES:.o=.d) +$(M1_D_FILES): +include $(wildcard $(M1_D_FILES)) +endif From 2112d5d992e8805533db693148e423fed5b51b53 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 6 Jan 2023 18:28:25 -0800 Subject: [PATCH 09/19] header dependency tracking might be useful for main.dol too --- Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8a5cbc7ff9..2ff44c50cf 100644 --- a/Makefile +++ b/Makefile @@ -192,17 +192,25 @@ rungame: game dolphin-emu $(BUILD_DIR)/game/sys/main.dol # -$(BUILD_DIR)/%.o: %.c +$(BUILD_DIR)/%.o: %.c $(BUILD_DIR)/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(CC) $(CFLAGS) -c -o $@ $(basename $@).c + @$(CC) $(CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi -$(BUILD_DIR)/%.o: %.cpp +$(BUILD_DIR)/%.o: %.cpp $(BUILD_DIR)/%.d @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) -c -o $@ $(basename $@).cpp + @$(CC) $(CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +D_FILES := $(O_FILES:.o=.d) +$(D_FILES): +include $(wildcard $(D_FILES)) +endif # shared cpp files for RELs $(BUILD_DIR)/rel/%.o: rel/%.cpp From df2391faa70882e5f539afef20317fc6e90a2f95 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 6 Jan 2023 18:50:13 -0800 Subject: [PATCH 10/19] diff.py: invoke make with DISABLE_DEPS --- diff_settings.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/diff_settings.py b/diff_settings.py index c23703fc0b..986d363945 100644 --- a/diff_settings.py +++ b/diff_settings.py @@ -10,7 +10,9 @@ def apply(config, args): config['expected_build_dir'] = 'expected/build/' config['myimg'] = 'build/dolzel2/main.elf' config['baseimg'] = 'expected/build/dolzel2/main.elf' - config['makeflags'] = [] + config['makeflags'] = [ + 'DISABLE_DEPS=1', + ] if args.show_source: config['makeflags'].append('DEBUG=1') config['source_directories'] = ['src', 'libs', 'include'] From c7b54ac74945bf23b444b40f575364e984f28f43 Mon Sep 17 00:00:00 2001 From: erin petra sofiya moon Date: Mon, 9 Jan 2023 00:47:33 -0600 Subject: [PATCH 11/19] tp.py: allow use of the --no-print-rels inverse flag --- tools/tp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tp.py b/tools/tp.py index e679b95de9..9245f21ee7 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -293,7 +293,7 @@ def setup(debug: bool, game_path: Path, tools_path: Path): @tp.command(name="progress") @click.option("--debug/--no-debug") @click.option("--matching/--no-matching", default=True, is_flag=True) -@click.option("--print-rels", default=True, is_flag=True) +@click.option("--print-rels/--no-print-rels", default=True, is_flag=True) @click.option( "--format", "-f", @@ -583,7 +583,7 @@ def calculate_progress(build_path: Path, matching: bool, format: str, print_rels tableString = tableString+"Total | "+f"{100 * (rel_decompiled / rel_size):10.6f}%"+" | "+f"{rel_decompiled}"+" | "+f"{rel_size}"+"\n" CONSOLE.print(table) - + table = Table(title="Total") table.add_column("Section", justify="right", style="cyan", no_wrap=True) table.add_column("Percentage", style="green") @@ -596,7 +596,7 @@ def calculate_progress(build_path: Path, matching: bool, format: str, print_rels f"{dol_progress.decompiled}", f"{dol_progress.size}", ) - + if rels_progress: table.add_row( "RELs", From e8b4775fe08421ab522fec06aea337a88bce9949 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Sat, 14 Jan 2023 08:18:31 +0200 Subject: [PATCH 12/19] WSL compilation fixes --- src/d/d_kyeff.cpp | 2 +- tools/tp.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 209563d338..ffbbc54ae0 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -9,7 +9,7 @@ #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_kankyo.h" -#include "OS/OSTime.h" +#include "os/OSTime.h" #include "d/kankyo/d_kankyo.h" #include "d/kankyo/d_kankyo_wether.h" #include "dol2asm.h" diff --git a/tools/tp.py b/tools/tp.py index 9245f21ee7..a62a7ae68c 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -12,6 +12,8 @@ import json import subprocess import multiprocessing as mp import shutil +import platform +import stat from dataclasses import dataclass, field from typing import Dict, List, Set, Tuple @@ -167,6 +169,16 @@ def setup(debug: bool, game_path: Path, tools_path: Path): ) sys.exit(1) + c125 = compilers.joinpath("1.2.5") + if not c125.exists() or not c125.is_dir(): + LOG.error( + ( + f"Unable to find MWCC compiler version 1.2.5: missing directory '{c125}'\n" + f"Check the README for instructions on how to obtain the compilers" + ) + ) + sys.exit(1) + c27_lmgr326b = c27.joinpath("Lmgr326b.dll") if not c27_lmgr326b.exists() or not c27_lmgr326b.is_file(): c27_lmgr326b = c27.joinpath("lmgr326b.dll") @@ -188,6 +200,11 @@ def setup(debug: bool, game_path: Path, tools_path: Path): LOG.debug(f"copy: '{c27_lmgr326b}', to: '{c27_lmgr326b_cc}'") shutil.copy(c27_lmgr326b, c27_lmgr326b_cc) + c125_lmgr326b_cc = c125.joinpath("LMGR326B.dll") + if not c125_lmgr326b_cc.exists() or not c125_lmgr326b_cc.is_file(): + LOG.debug(f"copy: '{c27_lmgr326b}', to: '{c125_lmgr326b_cc}'") + shutil.copy(c27_lmgr326b, c125_lmgr326b_cc) + c27_mwcceppc = c27.joinpath("mwcceppc.exe") if not c27_mwcceppc.exists() or not c27_mwcceppc.is_file(): LOG.error( @@ -231,6 +248,8 @@ def setup(debug: bool, game_path: Path, tools_path: Path): else: data[0x001C6A54] = 0x69 dst_file.write(data) + if platform.system() == "Linux": + os.chmod(dst, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) if mwcceppc_sha1 == MWCCEPPC_SHA1: LOG.debug(f"found original compiler: '{c27_mwcceppc}' ('{mwcceppc_sha1}')") From 5e05ae38f8541fddd79341bdcf75488b07ca9122 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sun, 15 Jan 2023 11:10:23 -0800 Subject: [PATCH 13/19] d_a_b_oh2 / d_a_obj_web0 / d_a_obj_web1 (#243) * d_a_obj_web0 / d_a_obj_web1 * remove asm * d_a_set_bgobj * d_cc_s work * remove asm * build fix * fix tp.py progress check and rel sha1 check * clean up some bg files --- .clang-format | 15 +- Progress.md | 36 +- asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s | 32 - asm/d/bg/d_bg_s_chk/func_80077574.s | 3 - .../d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s | 39 - asm/d/bg/d_bg_s_roof_chk/func_8007914C.s | 3 - asm/d/bg/d_bg_s_roof_chk/func_80079154.s | 3 - asm/d/bg/d_bg_s_roof_chk/func_8007915C.s | 3 - asm/d/bg/d_bg_s_sph_chk/func_80078B70.s | 3 - asm/d/bg/d_bg_s_sph_chk/func_80078B78.s | 3 - asm/d/bg/d_bg_s_sph_chk/func_80078B80.s | 3 - asm/d/bg/d_bg_s_sph_chk/func_80078B88.s | 3 - asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s | 3 - asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s | 3 - asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s | 3 - asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s | 26 - ...CcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s | 72 -- asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s | 8 - ...fP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s | 147 --- ...12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s | 28 - ...ange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s | 127 --- ...ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s | 52 - asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s | 51 - ..._4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s | 223 ----- asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s | 39 - ...hapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s | 161 --- asm/d/cc/d_cc_s/func_800861B4.s | 38 - asm/d/cc/d_cc_s/func_80086AC0.s | 192 ---- .../d_a_b_oh2/__dt__12J3DFrameCtrlFv.s | 20 - .../d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s | 17 - .../a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s | 17 - .../d_a_b_oh2/action__FP11b_oh2_class.s | 146 --- .../daB_OH2_Create__FP10fopAc_ac_c.s | 104 -- .../daB_OH2_Delete__FP11b_oh2_class.s | 22 - .../d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s | 40 - .../daB_OH2_Execute__FP11b_oh2_class.s | 62 -- .../d_a_b_oh2/dmcalc__FP11b_oh2_class.s | 223 ----- .../d_a_b_oh2/nodeCallBack__FP8J3DJointi.s | 64 -- .../d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s | 198 ---- .../d_a_mg_rod/uki_catch__FP13dmg_rod_class.s | 8 +- .../CreateInit__12daSetBgObj_cFv.s | 34 - .../d_a_set_bgobj/Delete__12daSetBgObj_cFv.s | 13 - .../d_a_set_bgobj/create__12daSetBgObj_cFv.s | 39 - .../daSetBgObj_Create__FP10fopAc_ac_c.s | 9 - .../daSetBgObj_Delete__FP12daSetBgObj_c.s | 9 - .../daNpc_Henna_Create__FP10fopAc_ac_c.s | 20 +- .../demo_camera_shop__FP15npc_henna_class.s | 8 +- .../env_control__FP15npc_henna_class.s | 8 +- .../henna_shop__FP15npc_henna_class.s | 8 +- .../daNpc_Inko_Execute__FP14npc_inko_class.s | 16 +- .../d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s | 7 - .../d_a_obj_web0/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s | 20 - .../d_a_obj_web0/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_web0/__dt__8cM3dGSphFv.s | 20 - .../d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s | 16 - .../daObj_Web0_Create__FP10fopAc_ac_c.s | 189 ---- .../daObj_Web0_Delete__FP14obj_web0_class.s | 28 - .../daObj_Web0_Draw__FP14obj_web0_class.s | 32 - .../useHeapInit__FP10fopAc_ac_c.s | 117 --- .../d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s | 7 - .../d_a_obj_web1/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s | 20 - .../d_a_obj_web1/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_web1/__dt__8cM3dGCylFv.s | 20 - .../d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s | 16 - .../d_a_obj_web1/action__FP14obj_web1_class.s | 172 ---- .../daObj_Web1_Create__FP10fopAc_ac_c.s | 184 ---- .../daObj_Web1_Delete__FP14obj_web1_class.s | 34 - .../daObj_Web1_Draw__FP14obj_web1_class.s | 32 - .../daObj_Web1_Execute__FP14obj_web1_class.s | 186 ---- ..._back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s | 57 -- .../useHeapInit__FP10fopAc_ac_c.s | 128 --- include/JSystem/J3DGraphAnimator/J3DModel.h | 1 + .../JSystem/J3DGraphAnimator/J3DMtxBuffer.h | 1 + include/SSystem/SComponent/c_bg_w.h | 2 +- include/SSystem/SComponent/c_cc_d.h | 46 +- include/SSystem/SComponent/c_cc_s.h | 3 +- include/SSystem/SComponent/c_m3d_g_cps.h | 8 +- include/SSystem/SComponent/c_m3d_g_sph.h | 6 +- include/SSystem/SComponent/c_xyz.h | 1 + include/Z2AudioLib/Z2Creature.h | 9 +- include/c/c_damagereaction.h | 4 + include/d/a/d_a_item_static.h | 4 +- include/d/a/d_a_obj_item.h | 8 + include/d/a/d_a_player.h | 6 +- include/d/bg/d_bg_s.h | 2 + include/d/bg/d_bg_w.h | 1 + include/d/cc/d_cc_d.h | 167 +++- include/d/cc/d_cc_s.h | 12 +- include/d/com/d_com_inf_game.h | 86 +- include/d/d_item_data.h | 4 +- include/d/d_jnt_col.h | 12 +- include/d/particle/d_particle.h | 1 + include/dolphin/gx/GX.h | 4 + include/f_op/f_op_actor_mng.h | 18 + include/m_Do/m_Do_mtx.h | 16 +- include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h | 39 +- include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h | 13 +- .../rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h | 31 +- .../rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h | 36 +- rel/d/a/b/d_a_b_go/d_a_b_go.cpp | 1 - rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp | 763 ++++++--------- rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp | 2 +- rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp | 219 ++--- rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp | 2 +- rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp | 2 +- rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp | 681 ++++++------- rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp | 918 ++++++------------ src/c/c_damagereaction.cpp | 13 +- src/d/a/d_a_obj_item.cpp | 150 ++- src/d/bg/d_bg_pc.cpp | 7 +- src/d/bg/d_bg_s.cpp | 21 - src/d/bg/d_bg_s_chk.cpp | 61 +- src/d/bg/d_bg_s_movebg_actor.cpp | 15 - src/d/bg/d_bg_s_roof_chk.cpp | 97 +- src/d/bg/d_bg_s_sph_chk.cpp | 103 +- src/d/bg/d_bg_s_spl_grp_chk.cpp | 88 +- src/d/bg/d_bg_s_wtr_chk.cpp | 7 +- src/d/bg/d_bg_w_base.cpp | 121 +-- src/d/cc/d_cc_mass_s.cpp | 13 +- src/d/cc/d_cc_s.cpp | 847 ++++++++++------ src/d/com/d_com_static.cpp | 4 +- src/d/d_jnt_col.cpp | 21 +- src/m_Do/m_Do_machine_exception.cpp | 17 - tools/tp.py | 11 +- 126 files changed, 2217 insertions(+), 6277 deletions(-) delete mode 100644 asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s delete mode 100644 asm/d/bg/d_bg_s_chk/func_80077574.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/func_8007914C.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/func_80079154.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/func_8007915C.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/func_80078B70.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/func_80078B78.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/func_80078B80.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/func_80078B88.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s delete mode 100644 asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s delete mode 100644 asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s delete mode 100644 asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s delete mode 100644 asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s delete mode 100644 asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s delete mode 100644 asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s delete mode 100644 asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s delete mode 100644 asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s delete mode 100644 asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s delete mode 100644 asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s delete mode 100644 asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s delete mode 100644 asm/d/cc/d_cc_s/func_800861B4.s delete mode 100644 asm/d/cc/d_cc_s/func_80086AC0.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s diff --git a/.clang-format b/.clang-format index 79d9ae3b2e..867b90cecc 100644 --- a/.clang-format +++ b/.clang-format @@ -20,7 +20,19 @@ AlwaysBreakTemplateDeclarations: true BinPackArguments: true BinPackParameters: true BreakBeforeBinaryOperators: None -BreakBeforeBraces: Attach +BreakBeforeBraces: Custom +BraceWrapping: + AfterControlStatement: MultiLine + AfterFunction: false + AfterEnum: false + AfterClass: false + AfterCaseLabel: false + AfterNamespace: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeElse: false + BeforeWhile: false BreakBeforeTernaryOperators: false BreakConstructorInitializersBeforeComma: false ColumnLimit: 100 @@ -57,6 +69,7 @@ PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Left +ReferenceAlignment: Left ReflowComments: true SortIncludes: true SpaceAfterCStyleCast: false diff --git a/Progress.md b/Progress.md index de4e5c62a2..583bcfc3c5 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 21.920933% | 788396 | 3596544 +.text | 22.050391% | 793052 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 30.152472% | 1212332 | 4020672 +Total | 30.268274% | 1216988 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 30.152472% | 1212332 | 4020672 -RELs | 33.321461% | 3832076 | 11500324 -Total | 32.500543% | 5044408 | 15520996 +main.dol | 30.268274% | 1216988 | 4020672 +RELs | 33.041295% | 3799856 | 11500324 +Total | 32.322951% | 5016844 | 15520996 ## RELs @@ -37,7 +37,7 @@ d_a_vrbox | 48.327138% | 1040 | 2152 d_a_sq | 35.488722% | 3776 | 10640 d_a_ppolamp | 42.341463% | 1736 | 4100 d_a_demo_item | 33.863165% | 3920 | 11576 -d_a_cstaf | 100.000000% | 11860 | 11860 +d_a_cstaf | 32.377740% | 3840 | 11860 d_a_bg | 41.505376% | 3860 | 9300 d_a_tboxSw | 100.000000% | 1016 | 1016 d_a_title | 39.558574% | 2796 | 7068 @@ -94,7 +94,7 @@ d_a_grass | 49.074395% | 28312 | 57692 d_a_dshutter | 46.003263% | 2256 | 4904 d_a_tbox | 30.165503% | 9332 | 30936 d_a_peru | 33.139234% | 10244 | 30912 -d_a_set_bgobj | 65.342960% | 724 | 1108 +d_a_set_bgobj | 100.000000% | 1108 | 1108 d_a_mant | 86.020312% | 40316 | 46868 d_a_cstatue | 29.155833% | 6728 | 23076 d_a_swTime | 63.076923% | 656 | 1040 @@ -167,7 +167,7 @@ d_a_tag_mwait | 35.082873% | 1016 | 2896 d_a_tag_ajnot | 56.493506% | 696 | 1232 d_a_tag_hstop | 100.000000% | 3424 | 3424 d_a_tag_chgrestart | 48.868778% | 864 | 1768 -d_a_tag_cstasw | 100.000000% | 2560 | 2560 +d_a_tag_cstasw | 51.406250% | 1316 | 2560 d_a_tag_lv5soup | 100.000000% | 1908 | 1908 d_a_tag_lantern | 52.013423% | 1240 | 2384 d_a_tag_guard | 54.421769% | 640 | 1176 @@ -181,7 +181,7 @@ d_a_door_push | 37.997725% | 2672 | 7032 d_a_door_shutter | 37.465797% | 14240 | 38008 d_a_door_bossL5 | 39.221790% | 4032 | 10280 d_a_door_mbossL1 | 34.467633% | 10372 | 30092 -d_a_door_bossl1 | 100.000000% | 18732 | 18732 +d_a_door_bossl1 | 39.355114% | 7372 | 18732 d_a_door_knob00 | 37.500000% | 4608 | 12288 d_a_door_boss | 40.856890% | 3700 | 9056 d_a_kytag10 | 31.720430% | 944 | 2976 @@ -300,7 +300,7 @@ d_a_obj_gm | 35.212957% | 4696 | 13336 d_a_obj_szbridge | 43.280632% | 1752 | 4048 d_a_obj_lv3Water | 44.263566% | 4568 | 10320 d_a_obj_lv1Candle00 | 41.348158% | 2380 | 5756 -d_a_obj_ktonfire | 100.000000% | 4404 | 4404 +d_a_obj_ktonfire | 45.504087% | 2004 | 4404 d_a_obj_sw | 27.590884% | 4068 | 14744 d_a_obj_lv6bemos2 | 32.122093% | 7072 | 22016 d_a_obj_kazeneko | 45.277127% | 2320 | 5124 @@ -354,7 +354,7 @@ d_a_obj_bubblePilar | 44.760583% | 2580 | 5764 d_a_obj_well_cover | 45.704467% | 1596 | 3492 d_a_obj_mato | 37.093023% | 2552 | 6880 d_a_obj_lv4RailWall | 41.496973% | 3016 | 7268 -d_a_obj_stonemark | 100.000000% | 2040 | 2040 +d_a_obj_stonemark | 52.549020% | 1072 | 2040 d_a_obj_gomikabe | 37.032799% | 3884 | 10488 d_a_obj_lv5IceWall | 39.937435% | 3064 | 7672 d_a_obj_life_container | 34.456243% | 3764 | 10924 @@ -384,7 +384,7 @@ d_a_obj_stopper | 31.675996% | 3848 | 12148 d_a_obj_ten | 30.064631% | 5396 | 17948 d_a_obj_mhole | 35.548173% | 2140 | 6020 d_a_obj_fmobj | 55.200000% | 1104 | 2000 -d_a_obj_swallshutter | 100.000000% | 5864 | 5864 +d_a_obj_swallshutter | 41.268759% | 2420 | 5864 d_a_obj_takaraDai | 46.376812% | 2304 | 4968 d_a_obj_ice_l | 34.815373% | 1848 | 5308 d_a_obj_fallobj | 31.929604% | 2032 | 6364 @@ -403,7 +403,7 @@ d_a_obj_swBallA | 35.803945% | 2396 | 6692 d_a_obj_cwall | 30.455195% | 5968 | 19596 d_a_obj_picture | 35.041841% | 4020 | 11472 d_a_obj_ladder | 42.348485% | 2236 | 5280 -d_a_obj_gptaru | 100.000000% | 14020 | 14020 +d_a_obj_gptaru | 33.238231% | 4660 | 14020 d_a_obj_rotTrap | 45.877144% | 3316 | 7228 d_a_obj_swspinner | 39.141631% | 1824 | 4660 d_a_obj_lv3saka00 | 50.576369% | 1404 | 2776 @@ -461,7 +461,7 @@ d_a_obj_lv8Lift | 35.532359% | 3404 | 9580 d_a_obj_zcloth | 52.373418% | 1324 | 2528 d_a_obj_katatsumuri | 31.170697% | 5208 | 16708 d_a_obj_togeTrap | 41.746183% | 3500 | 8384 -d_a_obj_web0 | 44.054441% | 2460 | 5584 +d_a_obj_web0 | 75.286533% | 4204 | 5584 d_a_obj_ganonwall | 38.930481% | 1456 | 3740 d_a_obj_kantera | 37.623762% | 2432 | 6464 d_a_obj_gra_rock | 37.947123% | 2928 | 7716 @@ -523,9 +523,9 @@ d_a_obj_kbacket | 33.053127% | 3932 | 11896 d_a_obj_lv4prelvtr | 48.664688% | 1312 | 2696 d_a_obj_ihasi | 43.372216% | 1636 | 3772 d_a_obj_pdwall | 40.192308% | 1672 | 4160 -d_a_obj_web1 | 42.480942% | 2452 | 5772 +d_a_obj_web1 | 100.000000% | 5772 | 5772 d_a_obj_hfuta | 39.073970% | 2768 | 7084 -d_a_obj_lv2candle | 100.000000% | 6960 | 6960 +d_a_obj_lv2candle | 38.160920% | 2656 | 6960 d_a_obj_wood_pendulum | 44.455748% | 1748 | 3932 d_a_obj_onsen | 49.239281% | 1424 | 2892 d_a_obj_hasu2 | 41.190476% | 1384 | 3360 @@ -781,8 +781,8 @@ d_a_b_zant | 22.203940% | 19432 | 87516 d_a_b_gos | 43.551689% | 3404 | 7816 d_a_b_dr | 27.536664% | 18476 | 67096 d_a_b_zant_mobile | 36.326402% | 4612 | 12696 -d_a_b_oh2 | 37.960954% | 2100 | 5532 +d_a_b_oh2 | 100.000000% | 5532 | 5532 d_a_b_bq | 28.033347% | 11164 | 39824 d_a_b_zant_sima | 40.995025% | 1648 | 4020 d_a_b_gm | 30.376176% | 11628 | 38280 -Total | 33.321461% | 3832076 | 11500324 +Total | 33.041295% | 3799856 | 11500324 diff --git a/asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s b/asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s deleted file mode 100644 index 6a2e31a820..0000000000 --- a/asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800774E8: -/* 800774E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800774EC 7C 08 02 A6 */ mflr r0 -/* 800774F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800774F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800774F8 93 C1 00 08 */ stw r30, 8(r1) -/* 800774FC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077500 7C 9F 23 78 */ mr r31, r4 -/* 80077504 41 82 00 40 */ beq lbl_80077544 -/* 80077508 3C 60 80 3B */ lis r3, __vt__8dBgS_Chk@ha /* 0x803AB670@ha */ -/* 8007750C 38 63 B6 70 */ addi r3, r3, __vt__8dBgS_Chk@l /* 0x803AB670@l */ -/* 80077510 90 7E 00 00 */ stw r3, 0(r30) -/* 80077514 38 03 00 0C */ addi r0, r3, 0xc -/* 80077518 90 1E 00 10 */ stw r0, 0x10(r30) -/* 8007751C 38 7E 00 10 */ addi r3, r30, 0x10 -/* 80077520 38 80 00 00 */ li r4, 0 -/* 80077524 48 00 06 A1 */ bl __dt__15dBgS_GrpPassChkFv -/* 80077528 7F C3 F3 78 */ mr r3, r30 -/* 8007752C 38 80 00 00 */ li r4, 0 -/* 80077530 48 00 18 81 */ bl __dt__16dBgS_PolyPassChkFv -/* 80077534 7F E0 07 35 */ extsh. r0, r31 -/* 80077538 40 81 00 0C */ ble lbl_80077544 -/* 8007753C 7F C3 F3 78 */ mr r3, r30 -/* 80077540 48 25 77 FD */ bl __dl__FPv -lbl_80077544: -/* 80077544 7F C3 F3 78 */ mr r3, r30 -/* 80077548 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007754C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80077550 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077554 7C 08 03 A6 */ mtlr r0 -/* 80077558 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007755C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_chk/func_80077574.s b/asm/d/bg/d_bg_s_chk/func_80077574.s deleted file mode 100644 index a8786a3ad1..0000000000 --- a/asm/d/bg/d_bg_s_chk/func_80077574.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077574: -/* 80077574 38 63 FF F0 */ addi r3, r3, -16 -/* 80077578 4B FF FF 70 */ b __dt__8dBgS_ChkFv diff --git a/asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s b/asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s deleted file mode 100644 index 0889f89f37..0000000000 --- a/asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80079090: -/* 80079090 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80079094 7C 08 02 A6 */ mflr r0 -/* 80079098 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007909C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800790A0 93 C1 00 08 */ stw r30, 8(r1) -/* 800790A4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 800790A8 7C 9F 23 78 */ mr r31, r4 -/* 800790AC 41 82 00 5C */ beq lbl_80079108 -/* 800790B0 3C 60 80 3B */ lis r3, __vt__12dBgS_RoofChk@ha /* 0x803ABA50@ha */ -/* 800790B4 38 63 BA 50 */ addi r3, r3, __vt__12dBgS_RoofChk@l /* 0x803ABA50@l */ -/* 800790B8 90 7E 00 0C */ stw r3, 0xc(r30) -/* 800790BC 38 03 00 0C */ addi r0, r3, 0xc -/* 800790C0 90 1E 00 20 */ stw r0, 0x20(r30) -/* 800790C4 38 03 00 18 */ addi r0, r3, 0x18 -/* 800790C8 90 1E 00 24 */ stw r0, 0x24(r30) -/* 800790CC 38 03 00 24 */ addi r0, r3, 0x24 -/* 800790D0 90 1E 00 34 */ stw r0, 0x34(r30) -/* 800790D4 38 7E 00 24 */ addi r3, r30, 0x24 -/* 800790D8 38 80 00 00 */ li r4, 0 -/* 800790DC 4B FF E4 0D */ bl __dt__8dBgS_ChkFv -/* 800790E0 38 7E 00 10 */ addi r3, r30, 0x10 -/* 800790E4 38 80 00 00 */ li r4, 0 -/* 800790E8 48 1E EA 89 */ bl __dt__8cBgS_ChkFv -/* 800790EC 7F C3 F3 78 */ mr r3, r30 -/* 800790F0 38 80 00 00 */ li r4, 0 -/* 800790F4 48 1E EF BD */ bl __dt__13cBgS_PolyInfoFv -/* 800790F8 7F E0 07 35 */ extsh. r0, r31 -/* 800790FC 40 81 00 0C */ ble lbl_80079108 -/* 80079100 7F C3 F3 78 */ mr r3, r30 -/* 80079104 48 25 5C 39 */ bl __dl__FPv -lbl_80079108: -/* 80079108 7F C3 F3 78 */ mr r3, r30 -/* 8007910C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80079110 83 C1 00 08 */ lwz r30, 8(r1) -/* 80079114 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80079118 7C 08 03 A6 */ mtlr r0 -/* 8007911C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80079120 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_roof_chk/func_8007914C.s b/asm/d/bg/d_bg_s_roof_chk/func_8007914C.s deleted file mode 100644 index d0be4b2777..0000000000 --- a/asm/d/bg/d_bg_s_roof_chk/func_8007914C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007914C: -/* 8007914C 38 63 FF F0 */ addi r3, r3, -16 -/* 80079150 4B FF FF 40 */ b __dt__12dBgS_RoofChkFv diff --git a/asm/d/bg/d_bg_s_roof_chk/func_80079154.s b/asm/d/bg/d_bg_s_roof_chk/func_80079154.s deleted file mode 100644 index 60f8eb63c2..0000000000 --- a/asm/d/bg/d_bg_s_roof_chk/func_80079154.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80079154: -/* 80079154 38 63 FF CC */ addi r3, r3, -52 -/* 80079158 4B FF FF 38 */ b __dt__12dBgS_RoofChkFv diff --git a/asm/d/bg/d_bg_s_roof_chk/func_8007915C.s b/asm/d/bg/d_bg_s_roof_chk/func_8007915C.s deleted file mode 100644 index 1d3e4b92cb..0000000000 --- a/asm/d/bg/d_bg_s_roof_chk/func_8007915C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007915C: -/* 8007915C 38 63 FF DC */ addi r3, r3, -36 -/* 80079160 4B FF FF 30 */ b __dt__12dBgS_RoofChkFv diff --git a/asm/d/bg/d_bg_s_sph_chk/func_80078B70.s b/asm/d/bg/d_bg_s_sph_chk/func_80078B70.s deleted file mode 100644 index b819d5414b..0000000000 --- a/asm/d/bg/d_bg_s_sph_chk/func_80078B70.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078B70: -/* 80078B70 38 63 FF EC */ addi r3, r3, -20 -/* 80078B74 4B FF FF 4C */ b __dt__11dBgS_SphChkFv diff --git a/asm/d/bg/d_bg_s_sph_chk/func_80078B78.s b/asm/d/bg/d_bg_s_sph_chk/func_80078B78.s deleted file mode 100644 index 03f2360f7e..0000000000 --- a/asm/d/bg/d_bg_s_sph_chk/func_80078B78.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078B78: -/* 80078B78 38 63 FF DC */ addi r3, r3, -36 -/* 80078B7C 4B FF FF 44 */ b __dt__11dBgS_SphChkFv diff --git a/asm/d/bg/d_bg_s_sph_chk/func_80078B80.s b/asm/d/bg/d_bg_s_sph_chk/func_80078B80.s deleted file mode 100644 index cbea27e447..0000000000 --- a/asm/d/bg/d_bg_s_sph_chk/func_80078B80.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078B80: -/* 80078B80 38 63 FF B8 */ addi r3, r3, -72 -/* 80078B84 4B FF FF 3C */ b __dt__11dBgS_SphChkFv diff --git a/asm/d/bg/d_bg_s_sph_chk/func_80078B88.s b/asm/d/bg/d_bg_s_sph_chk/func_80078B88.s deleted file mode 100644 index 926bf7e4f1..0000000000 --- a/asm/d/bg/d_bg_s_sph_chk/func_80078B88.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078B88: -/* 80078B88 38 63 FF C8 */ addi r3, r3, -56 -/* 80078B8C 4B FF FF 34 */ b __dt__11dBgS_SphChkFv diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s b/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s deleted file mode 100644 index 7642295c53..0000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078D4C: -/* 80078D4C 38 63 FF F0 */ addi r3, r3, -16 -/* 80078D50 4B FF FF 28 */ b __dt__14dBgS_SplGrpChkFv diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s b/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s deleted file mode 100644 index f1167fcc89..0000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078D54: -/* 80078D54 38 63 FF CC */ addi r3, r3, -52 -/* 80078D58 4B FF FF 20 */ b __dt__14dBgS_SplGrpChkFv diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s b/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s deleted file mode 100644 index faafca6cac..0000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078D5C: -/* 80078D5C 38 63 FF DC */ addi r3, r3, -36 -/* 80078D60 4B FF FF 18 */ b __dt__14dBgS_SplGrpChkFv diff --git a/asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s b/asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s deleted file mode 100644 index e75aedc044..0000000000 --- a/asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8007E640: -/* 8007E640 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007E644 7C 08 02 A6 */ mflr r0 -/* 8007E648 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007E64C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007E650 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8007E654 41 82 00 30 */ beq lbl_8007E684 -/* 8007E658 3C 60 80 3B */ lis r3, __vt__9dBgW_Base@ha /* 0x803ABCC8@ha */ -/* 8007E65C 38 03 BC C8 */ addi r0, r3, __vt__9dBgW_Base@l /* 0x803ABCC8@l */ -/* 8007E660 90 1F 00 04 */ stw r0, 4(r31) -/* 8007E664 41 82 00 10 */ beq lbl_8007E674 -/* 8007E668 3C 60 80 3B */ lis r3, __vt__9cBgW_BgId@ha /* 0x803ABDB8@ha */ -/* 8007E66C 38 03 BD B8 */ addi r0, r3, __vt__9cBgW_BgId@l /* 0x803ABDB8@l */ -/* 8007E670 90 1F 00 04 */ stw r0, 4(r31) -lbl_8007E674: -/* 8007E674 7C 80 07 35 */ extsh. r0, r4 -/* 8007E678 40 81 00 0C */ ble lbl_8007E684 -/* 8007E67C 7F E3 FB 78 */ mr r3, r31 -/* 8007E680 48 25 06 BD */ bl __dl__FPv -lbl_8007E684: -/* 8007E684 7F E3 FB 78 */ mr r3, r31 -/* 8007E688 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007E68C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007E690 7C 08 03 A6 */ mtlr r0 -/* 8007E694 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007E698 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s b/asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s deleted file mode 100644 index 591d09f8a3..0000000000 --- a/asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80086754: -/* 80086754 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80086758 7C 08 02 A6 */ mflr r0 -/* 8008675C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086760 39 61 00 30 */ addi r11, r1, 0x30 -/* 80086764 48 2D BA 79 */ bl _savegpr_29 -/* 80086768 7C BD 2B 78 */ mr r29, r5 -/* 8008676C 7C DE 33 78 */ mr r30, r6 -/* 80086770 7C FF 3B 78 */ mr r31, r7 -/* 80086774 C0 04 00 84 */ lfs f0, 0x84(r4) -/* 80086778 D0 01 00 08 */ stfs f0, 8(r1) -/* 8008677C C0 04 00 88 */ lfs f0, 0x88(r4) -/* 80086780 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80086784 C0 04 00 8C */ lfs f0, 0x8c(r4) -/* 80086788 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8008678C 38 61 00 08 */ addi r3, r1, 8 -/* 80086790 48 2C 09 C1 */ bl PSVECMag -/* 80086794 FC 00 0A 10 */ fabs f0, f1 -/* 80086798 FC 20 00 18 */ frsp f1, f0 -/* 8008679C C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 800867A0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800867A4 40 80 00 88 */ bge lbl_8008682C -/* 800867A8 80 9D 00 0C */ lwz r4, 0xc(r29) -/* 800867AC 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 800867B0 28 04 00 00 */ cmplwi r4, 0 -/* 800867B4 41 82 00 0C */ beq lbl_800867C0 -/* 800867B8 28 03 00 00 */ cmplwi r3, 0 -/* 800867BC 40 82 00 1C */ bne lbl_800867D8 -lbl_800867C0: -/* 800867C0 C0 02 8D 78 */ lfs f0, lit_3705(r2) -/* 800867C4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800867C8 D0 01 00 08 */ stfs f0, 8(r1) -/* 800867CC C0 02 8D 80 */ lfs f0, lit_3925(r2) -/* 800867D0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800867D4 48 00 00 64 */ b lbl_80086838 -lbl_800867D8: -/* 800867D8 38 63 04 D0 */ addi r3, r3, 0x4d0 -/* 800867DC 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 800867E0 38 A1 00 08 */ addi r5, r1, 8 -/* 800867E4 48 2C 08 D1 */ bl PSVECSubtract -/* 800867E8 38 61 00 08 */ addi r3, r1, 8 -/* 800867EC 48 2C 09 65 */ bl PSVECMag -/* 800867F0 FC 00 0A 10 */ fabs f0, f1 -/* 800867F4 FC 20 00 18 */ frsp f1, f0 -/* 800867F8 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 800867FC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80086800 40 80 00 1C */ bge lbl_8008681C -/* 80086804 C0 02 8D 78 */ lfs f0, lit_3705(r2) -/* 80086808 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8008680C D0 01 00 08 */ stfs f0, 8(r1) -/* 80086810 C0 02 8D 80 */ lfs f0, lit_3925(r2) -/* 80086814 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80086818 48 00 00 20 */ b lbl_80086838 -lbl_8008681C: -/* 8008681C 38 61 00 08 */ addi r3, r1, 8 -/* 80086820 7C 64 1B 78 */ mr r4, r3 -/* 80086824 48 2C 08 D1 */ bl PSVECNormalize -/* 80086828 48 00 00 10 */ b lbl_80086838 -lbl_8008682C: -/* 8008682C 38 61 00 08 */ addi r3, r1, 8 -/* 80086830 7C 64 1B 78 */ mr r4, r3 -/* 80086834 48 2C 08 C1 */ bl PSVECNormalize -lbl_80086838: -/* 80086838 38 61 00 08 */ addi r3, r1, 8 -/* 8008683C 7F E4 FB 78 */ mr r4, r31 -/* 80086840 48 1E 7D 31 */ bl cM3d_CalcVecZAngle__FRC3VecP5csXyz -/* 80086844 39 61 00 30 */ addi r11, r1, 0x30 -/* 80086848 48 2D B9 E1 */ bl _restgpr_29 -/* 8008684C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80086850 7C 08 03 A6 */ mtlr r0 -/* 80086854 38 21 00 30 */ addi r1, r1, 0x30 -/* 80086858 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s b/asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s deleted file mode 100644 index b28c4c267f..0000000000 --- a/asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80087330: -/* 80087330 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80087334 3C 60 80 3B */ lis r3, m_mtrl_hit_tbl__4dCcS@ha /* 0x803AC3A4@ha */ -/* 80087338 38 03 C3 A4 */ addi r0, r3, m_mtrl_hit_tbl__4dCcS@l /* 0x803AC3A4@l */ -/* 8008733C 7C 60 22 14 */ add r3, r0, r4 -/* 80087340 54 A0 1D 78 */ rlwinm r0, r5, 3, 0x15, 0x1c -/* 80087344 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80087348 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s b/asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 63b64691d2..0000000000 --- a/asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,147 +0,0 @@ -lbl_80086D8C: -/* 80086D8C 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80086D90 7C 08 02 A6 */ mflr r0 -/* 80086D94 90 01 00 94 */ stw r0, 0x94(r1) -/* 80086D98 DB E1 00 88 */ stfd f31, 0x88(r1) -/* 80086D9C 39 61 00 88 */ addi r11, r1, 0x88 -/* 80086DA0 48 2D B4 25 */ bl _savegpr_23 -/* 80086DA4 7C 79 1B 78 */ mr r25, r3 -/* 80086DA8 7C 97 23 78 */ mr r23, r4 -/* 80086DAC 7C B8 2B 78 */ mr r24, r5 -/* 80086DB0 FF E0 08 90 */ fmr f31, f1 -/* 80086DB4 7C DA 33 78 */ mr r26, r6 -/* 80086DB8 7C FB 3B 78 */ mr r27, r7 -/* 80086DBC 7D 1C 43 78 */ mr r28, r8 -/* 80086DC0 A0 03 28 04 */ lhz r0, 0x2804(r3) -/* 80086DC4 28 00 00 00 */ cmplwi r0, 0 -/* 80086DC8 40 82 00 0C */ bne lbl_80086DD4 -/* 80086DCC 38 60 00 00 */ li r3, 0 -/* 80086DD0 48 00 01 D0 */ b lbl_80086FA0 -lbl_80086DD4: -/* 80086DD4 54 03 13 BA */ rlwinm r3, r0, 2, 0xe, 0x1d -/* 80086DD8 3B A3 10 00 */ addi r29, r3, 0x1000 -/* 80086DDC 7F B9 EA 14 */ add r29, r25, r29 -/* 80086DE0 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80086DE4 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80086DE8 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086DEC 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80086DF0 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80086DF4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086DF8 38 61 00 3C */ addi r3, r1, 0x3c -/* 80086DFC 48 1E 81 8D */ bl __ct__8cM3dGCpsFv -/* 80086E00 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80086E04 38 63 36 08 */ addi r3, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80086E08 90 61 00 38 */ stw r3, 0x38(r1) -/* 80086E0C 3B E3 00 58 */ addi r31, r3, 0x58 -/* 80086E10 93 E1 00 54 */ stw r31, 0x54(r1) -/* 80086E14 3B C1 00 3C */ addi r30, r1, 0x3c -/* 80086E18 7F C3 F3 78 */ mr r3, r30 -/* 80086E1C 7E E4 BB 78 */ mr r4, r23 -/* 80086E20 7F 05 C3 78 */ mr r5, r24 -/* 80086E24 FC 20 F8 90 */ fmr f1, f31 -/* 80086E28 48 1E 81 D9 */ bl Set__8cM3dGCpsFRC4cXyzRC4cXyzf -/* 80086E2C 38 61 00 1C */ addi r3, r1, 0x1c -/* 80086E30 48 1D D1 95 */ bl CalcAabBox__12cCcD_CpsAttrFv -/* 80086E34 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80086E38 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80086E3C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80086E40 38 79 28 08 */ addi r3, r25, 0x2808 -/* 80086E44 38 81 00 0C */ addi r4, r1, 0xc -/* 80086E48 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80086E4C 48 1D C8 55 */ bl CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab -/* 80086E50 3B 39 10 00 */ addi r25, r25, 0x1000 -/* 80086E54 48 00 01 00 */ b lbl_80086F54 -lbl_80086E58: -/* 80086E58 80 79 00 00 */ lwz r3, 0(r25) -/* 80086E5C 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80086E60 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80086E64 41 82 00 EC */ beq lbl_80086F50 -/* 80086E68 48 1D CB E1 */ bl GetAc__8cCcD_ObjFv -/* 80086E6C 7C 03 D0 40 */ cmplw r3, r26 -/* 80086E70 41 82 00 E0 */ beq lbl_80086F50 -/* 80086E74 80 79 00 00 */ lwz r3, 0(r25) -/* 80086E78 48 1D CB D1 */ bl GetAc__8cCcD_ObjFv -/* 80086E7C 7C 03 D8 40 */ cmplw r3, r27 -/* 80086E80 41 82 00 D0 */ beq lbl_80086F50 -/* 80086E84 80 79 00 00 */ lwz r3, 0(r25) -/* 80086E88 48 1D CB C1 */ bl GetAc__8cCcD_ObjFv -/* 80086E8C 7C 03 E0 40 */ cmplw r3, r28 -/* 80086E90 41 82 00 C0 */ beq lbl_80086F50 -/* 80086E94 80 79 00 00 */ lwz r3, 0(r25) -/* 80086E98 38 63 00 48 */ addi r3, r3, 0x48 -/* 80086E9C 38 81 00 0C */ addi r4, r1, 0xc -/* 80086EA0 48 1D C4 C9 */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo -/* 80086EA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086EA8 41 82 00 A8 */ beq lbl_80086F50 -/* 80086EAC 80 79 00 00 */ lwz r3, 0(r25) -/* 80086EB0 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80086EB4 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80086EB8 7D 89 03 A6 */ mtctr r12 -/* 80086EBC 4E 80 04 21 */ bctrl -/* 80086EC0 28 03 00 00 */ cmplwi r3, 0 -/* 80086EC4 41 82 00 10 */ beq lbl_80086ED4 -/* 80086EC8 80 03 00 E8 */ lwz r0, 0xe8(r3) -/* 80086ECC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80086ED0 40 82 00 80 */ bne lbl_80086F50 -lbl_80086ED4: -/* 80086ED4 80 79 00 00 */ lwz r3, 0(r25) -/* 80086ED8 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80086EDC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80086EE0 7D 89 03 A6 */ mtctr r12 -/* 80086EE4 4E 80 04 21 */ bctrl -/* 80086EE8 38 81 00 1C */ addi r4, r1, 0x1c -/* 80086EEC 38 A1 00 08 */ addi r5, r1, 8 -/* 80086EF0 81 83 00 1C */ lwz r12, 0x1c(r3) -/* 80086EF4 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80086EF8 7D 89 03 A6 */ mtctr r12 -/* 80086EFC 4E 80 04 21 */ bctrl -/* 80086F00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086F04 41 82 00 4C */ beq lbl_80086F50 -/* 80086F08 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80086F0C 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80086F10 90 01 00 18 */ stw r0, 0x18(r1) -/* 80086F14 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80086F18 38 03 36 08 */ addi r0, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80086F1C 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086F20 93 E1 00 54 */ stw r31, 0x54(r1) -/* 80086F24 7F C3 F3 78 */ mr r3, r30 -/* 80086F28 38 80 00 00 */ li r4, 0 -/* 80086F2C 48 1E 80 79 */ bl __dt__8cM3dGCpsFv -/* 80086F30 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80086F34 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80086F38 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086F3C 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80086F40 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80086F44 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086F48 38 60 00 01 */ li r3, 1 -/* 80086F4C 48 00 00 54 */ b lbl_80086FA0 -lbl_80086F50: -/* 80086F50 3B 39 00 04 */ addi r25, r25, 4 -lbl_80086F54: -/* 80086F54 7C 19 E8 40 */ cmplw r25, r29 -/* 80086F58 41 80 FF 00 */ blt lbl_80086E58 -/* 80086F5C 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80086F60 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80086F64 90 01 00 18 */ stw r0, 0x18(r1) -/* 80086F68 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80086F6C 38 03 36 08 */ addi r0, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80086F70 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086F74 93 E1 00 54 */ stw r31, 0x54(r1) -/* 80086F78 7F C3 F3 78 */ mr r3, r30 -/* 80086F7C 38 80 00 00 */ li r4, 0 -/* 80086F80 48 1E 80 25 */ bl __dt__8cM3dGCpsFv -/* 80086F84 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80086F88 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80086F8C 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086F90 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80086F94 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80086F98 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086F9C 38 60 00 00 */ li r3, 0 -lbl_80086FA0: -/* 80086FA0 CB E1 00 88 */ lfd f31, 0x88(r1) -/* 80086FA4 39 61 00 88 */ addi r11, r1, 0x88 -/* 80086FA8 48 2D B2 69 */ bl _restgpr_23 -/* 80086FAC 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80086FB0 7C 08 03 A6 */ mtlr r0 -/* 80086FB4 38 21 00 90 */ addi r1, r1, 0x90 -/* 80086FB8 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s b/asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s deleted file mode 100644 index f9c8d890c5..0000000000 --- a/asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8008734C: -/* 8008734C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80087350 7C 08 02 A6 */ mflr r0 -/* 80087354 90 01 00 14 */ stw r0, 0x14(r1) -/* 80087358 80 05 00 9C */ lwz r0, 0x9c(r5) -/* 8008735C 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 -/* 80087360 41 82 00 2C */ beq lbl_8008738C -/* 80087364 88 04 00 75 */ lbz r0, 0x75(r4) -/* 80087368 28 00 00 00 */ cmplwi r0, 0 -/* 8008736C 40 82 00 20 */ bne lbl_8008738C -/* 80087370 80 E4 00 10 */ lwz r7, 0x10(r4) -/* 80087374 3C C0 00 10 */ lis r6, 0x0010 /* 0x00101C00@ha */ -/* 80087378 38 06 1C 00 */ addi r0, r6, 0x1C00 /* 0x00101C00@l */ -/* 8008737C 7C E0 00 39 */ and. r0, r7, r0 -/* 80087380 41 82 00 0C */ beq lbl_8008738C -/* 80087384 38 60 00 01 */ li r3, 1 -/* 80087388 48 00 00 18 */ b lbl_800873A0 -lbl_8008738C: -/* 8008738C 88 84 00 75 */ lbz r4, 0x75(r4) -/* 80087390 88 A5 00 B9 */ lbz r5, 0xb9(r5) -/* 80087394 4B FF FF 9D */ bl ChkAtTgMtrlHit__4dCcSFUcUc -/* 80087398 7C 60 00 34 */ cntlzw r0, r3 -/* 8008739C 54 03 D9 7E */ srwi r3, r0, 5 -lbl_800873A0: -/* 800873A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800873A4 7C 08 03 A6 */ mtlr r0 -/* 800873A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800873AC 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s b/asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s deleted file mode 100644 index 2029fe74d1..0000000000 --- a/asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_80085F28: -/* 80085F28 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80085F2C 7C 08 02 A6 */ mflr r0 -/* 80085F30 90 01 00 54 */ stw r0, 0x54(r1) -/* 80085F34 39 61 00 50 */ addi r11, r1, 0x50 -/* 80085F38 48 2D C2 91 */ bl _savegpr_24 -/* 80085F3C 7C 78 1B 78 */ mr r24, r3 -/* 80085F40 7C 99 23 78 */ mr r25, r4 -/* 80085F44 7C BA 2B 78 */ mr r26, r5 -/* 80085F48 7C DB 33 78 */ mr r27, r6 -/* 80085F4C 7C FC 3B 78 */ mr r28, r7 -/* 80085F50 7F 23 CB 78 */ mr r3, r25 -/* 80085F54 81 99 00 3C */ lwz r12, 0x3c(r25) -/* 80085F58 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80085F5C 7D 89 03 A6 */ mtctr r12 -/* 80085F60 4E 80 04 21 */ bctrl -/* 80085F64 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80085F68 40 82 00 0C */ bne lbl_80085F74 -/* 80085F6C 38 60 00 00 */ li r3, 0 -/* 80085F70 48 00 01 70 */ b lbl_800860E0 -lbl_80085F74: -/* 80085F74 7F 43 D3 78 */ mr r3, r26 -/* 80085F78 81 9A 00 3C */ lwz r12, 0x3c(r26) -/* 80085F7C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80085F80 7D 89 03 A6 */ mtctr r12 -/* 80085F84 4E 80 04 21 */ bctrl -/* 80085F88 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80085F8C 40 82 00 0C */ bne lbl_80085F98 -/* 80085F90 38 60 00 00 */ li r3, 0 -/* 80085F94 48 00 01 4C */ b lbl_800860E0 -lbl_80085F98: -/* 80085F98 48 1D DA B1 */ bl GetAc__8cCcD_ObjFv -/* 80085F9C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80085FA0 40 82 00 0C */ bne lbl_80085FAC -/* 80085FA4 38 60 00 00 */ li r3, 0 -/* 80085FA8 48 00 01 38 */ b lbl_800860E0 -lbl_80085FAC: -/* 80085FAC 7F 03 C3 78 */ mr r3, r24 -/* 80085FB0 7F A4 EB 78 */ mr r4, r29 -/* 80085FB4 80 B9 00 44 */ lwz r5, 0x44(r25) -/* 80085FB8 80 DA 00 44 */ lwz r6, 0x44(r26) -/* 80085FBC 38 E1 00 10 */ addi r7, r1, 0x10 -/* 80085FC0 81 98 28 48 */ lwz r12, 0x2848(r24) -/* 80085FC4 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80085FC8 7D 89 03 A6 */ mtctr r12 -/* 80085FCC 4E 80 04 21 */ bctrl -/* 80085FD0 2C 1B 00 00 */ cmpwi r27, 0 -/* 80085FD4 41 82 00 B4 */ beq lbl_80086088 -/* 80085FD8 83 BF 05 28 */ lwz r29, 0x528(r31) -/* 80085FDC 28 1D 00 00 */ cmplwi r29, 0 -/* 80085FE0 41 82 00 A8 */ beq lbl_80086088 -/* 80085FE4 7F A3 EB 78 */ mr r3, r29 -/* 80085FE8 7F 84 E3 78 */ mr r4, r28 -/* 80085FEC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80085FF0 38 C1 00 24 */ addi r6, r1, 0x24 -/* 80085FF4 38 E1 00 08 */ addi r7, r1, 8 -/* 80085FF8 39 00 00 00 */ li r8, 0 -/* 80085FFC 4B FB 0C 49 */ bl getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi -/* 80086000 2C 03 00 00 */ cmpwi r3, 0 -/* 80086004 41 80 00 7C */ blt lbl_80086080 -/* 80086008 80 9D 00 00 */ lwz r4, 0(r29) -/* 8008600C 1C 03 00 0C */ mulli r0, r3, 0xc -/* 80086010 7C 64 02 14 */ add r3, r4, r0 -/* 80086014 88 03 00 01 */ lbz r0, 1(r3) -/* 80086018 2C 00 00 03 */ cmpwi r0, 3 -/* 8008601C 40 82 00 64 */ bne lbl_80086080 -/* 80086020 38 61 00 10 */ addi r3, r1, 0x10 -/* 80086024 4B F8 6E E9 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz -/* 80086028 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8008602C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80086030 3C 80 80 43 */ lis r4, BaseZ__4cXyz@ha /* 0x80430D3C@ha */ -/* 80086034 38 84 0D 3C */ addi r4, r4, BaseZ__4cXyz@l /* 0x80430D3C@l */ -/* 80086038 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8008603C 48 2C 0E 11 */ bl PSMTXMultVecSR -/* 80086040 38 61 00 08 */ addi r3, r1, 8 -/* 80086044 4B F8 6E C9 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz -/* 80086048 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8008604C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80086050 3C 80 80 43 */ lis r4, BaseZ__4cXyz@ha /* 0x80430D3C@ha */ -/* 80086054 38 84 0D 3C */ addi r4, r4, BaseZ__4cXyz@l /* 0x80430D3C@l */ -/* 80086058 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8008605C 48 2C 0D F1 */ bl PSMTXMultVecSR -/* 80086060 38 61 00 24 */ addi r3, r1, 0x24 -/* 80086064 38 81 00 18 */ addi r4, r1, 0x18 -/* 80086068 48 2C 11 2D */ bl PSVECDotProduct -/* 8008606C C0 02 8D 78 */ lfs f0, lit_3705(r2) -/* 80086070 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80086074 7C 00 00 26 */ mfcr r0 -/* 80086078 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 8008607C 48 00 00 64 */ b lbl_800860E0 -lbl_80086080: -/* 80086080 38 60 00 00 */ li r3, 0 -/* 80086084 48 00 00 5C */ b lbl_800860E0 -lbl_80086088: -/* 80086088 80 7E 00 E0 */ lwz r3, 0xe0(r30) -/* 8008608C 28 03 00 00 */ cmplwi r3, 0 -/* 80086090 41 82 00 0C */ beq lbl_8008609C -/* 80086094 A8 83 00 00 */ lha r4, 0(r3) -/* 80086098 48 00 00 08 */ b lbl_800860A0 -lbl_8008609C: -/* 8008609C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -lbl_800860A0: -/* 800860A0 AB BE 00 E4 */ lha r29, 0xe4(r30) -/* 800860A4 2C 1B 00 00 */ cmpwi r27, 0 -/* 800860A8 41 82 00 0C */ beq lbl_800860B4 -/* 800860AC 7F A0 0E 70 */ srawi r0, r29, 1 -/* 800860B0 7C 1D 07 34 */ extsh r29, r0 -lbl_800860B4: -/* 800860B4 A8 61 00 12 */ lha r3, 0x12(r1) -/* 800860B8 3C 63 00 01 */ addis r3, r3, 1 -/* 800860BC 38 03 80 00 */ addi r0, r3, -32768 -/* 800860C0 7C 03 07 34 */ extsh r3, r0 -/* 800860C4 48 1E AD 61 */ bl cLib_distanceAngleS__Fss -/* 800860C8 7F A0 07 34 */ extsh r0, r29 -/* 800860CC 7C 03 00 00 */ cmpw r3, r0 -/* 800860D0 40 81 00 0C */ ble lbl_800860DC -/* 800860D4 38 60 00 00 */ li r3, 0 -/* 800860D8 48 00 00 08 */ b lbl_800860E0 -lbl_800860DC: -/* 800860DC 38 60 00 01 */ li r3, 1 -lbl_800860E0: -/* 800860E0 39 61 00 50 */ addi r11, r1, 0x50 -/* 800860E4 48 2D C1 31 */ bl _restgpr_24 -/* 800860E8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 800860EC 7C 08 03 A6 */ mtlr r0 -/* 800860F0 38 21 00 50 */ addi r1, r1, 0x50 -/* 800860F4 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s b/asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s deleted file mode 100644 index a5cd524ee8..0000000000 --- a/asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_800860F8: -/* 800860F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800860FC 7C 08 02 A6 */ mflr r0 -/* 80086100 90 01 00 24 */ stw r0, 0x24(r1) -/* 80086104 39 61 00 20 */ addi r11, r1, 0x20 -/* 80086108 48 2D C0 C9 */ bl _savegpr_26 -/* 8008610C 7C 7A 1B 78 */ mr r26, r3 -/* 80086110 7C 9B 23 78 */ mr r27, r4 -/* 80086114 7C BC 2B 78 */ mr r28, r5 -/* 80086118 7C DD 33 78 */ mr r29, r6 -/* 8008611C 7C FE 3B 78 */ mr r30, r7 -/* 80086120 7D 1F 43 78 */ mr r31, r8 -/* 80086124 7F A3 EB 78 */ mr r3, r29 -/* 80086128 4B FF E2 B5 */ bl ChkAtNoGuard__12dCcD_GObjInfFv -/* 8008612C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086130 41 82 00 0C */ beq lbl_8008613C -/* 80086134 38 60 00 00 */ li r3, 0 -/* 80086138 48 00 00 60 */ b lbl_80086198 -lbl_8008613C: -/* 8008613C 80 7E 00 9C */ lwz r3, 0x9c(r30) -/* 80086140 54 66 07 FF */ clrlwi. r6, r3, 0x1f -/* 80086144 40 82 00 20 */ bne lbl_80086164 -/* 80086148 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 -/* 8008614C 40 82 00 18 */ bne lbl_80086164 -/* 80086150 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b -/* 80086154 41 82 00 40 */ beq lbl_80086194 -/* 80086158 88 1D 00 77 */ lbz r0, 0x77(r29) -/* 8008615C 2C 00 00 08 */ cmpwi r0, 8 -/* 80086160 40 82 00 34 */ bne lbl_80086194 -lbl_80086164: -/* 80086164 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c -/* 80086168 41 82 00 24 */ beq lbl_8008618C -/* 8008616C 7F 43 D3 78 */ mr r3, r26 -/* 80086170 7F 64 DB 78 */ mr r4, r27 -/* 80086174 7F 85 E3 78 */ mr r5, r28 -/* 80086178 7C C0 00 34 */ cntlzw r0, r6 -/* 8008617C 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 80086180 7F E7 FB 78 */ mr r7, r31 -/* 80086184 4B FF FD A5 */ bl ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz -/* 80086188 48 00 00 10 */ b lbl_80086198 -lbl_8008618C: -/* 8008618C 38 60 00 01 */ li r3, 1 -/* 80086190 48 00 00 08 */ b lbl_80086198 -lbl_80086194: -/* 80086194 38 60 00 00 */ li r3, 0 -lbl_80086198: -/* 80086198 39 61 00 20 */ addi r11, r1, 0x20 -/* 8008619C 48 2D C0 81 */ bl _restgpr_26 -/* 800861A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800861A4 7C 08 03 A6 */ mtlr r0 -/* 800861A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800861AC 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s b/asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s deleted file mode 100644 index 380d5e181e..0000000000 --- a/asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80086360: -/* 80086360 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80086364 28 00 00 FF */ cmplwi r0, 0xff -/* 80086368 40 82 00 0C */ bne lbl_80086374 -/* 8008636C 38 60 00 0A */ li r3, 0xa -/* 80086370 4E 80 00 20 */ blr -lbl_80086374: -/* 80086374 28 00 00 FE */ cmplwi r0, 0xfe -/* 80086378 40 82 00 0C */ bne lbl_80086384 -/* 8008637C 38 60 00 09 */ li r3, 9 -/* 80086380 4E 80 00 20 */ blr -lbl_80086384: -/* 80086384 28 00 00 D9 */ cmplwi r0, 0xd9 -/* 80086388 41 80 00 0C */ blt lbl_80086394 -/* 8008638C 38 60 00 08 */ li r3, 8 -/* 80086390 4E 80 00 20 */ blr -lbl_80086394: -/* 80086394 28 00 00 B5 */ cmplwi r0, 0xb5 -/* 80086398 41 80 00 0C */ blt lbl_800863A4 -/* 8008639C 38 60 00 07 */ li r3, 7 -/* 800863A0 4E 80 00 20 */ blr -lbl_800863A4: -/* 800863A4 28 00 00 91 */ cmplwi r0, 0x91 -/* 800863A8 41 80 00 0C */ blt lbl_800863B4 -/* 800863AC 38 60 00 06 */ li r3, 6 -/* 800863B0 4E 80 00 20 */ blr -lbl_800863B4: -/* 800863B4 28 00 00 6D */ cmplwi r0, 0x6d -/* 800863B8 41 80 00 0C */ blt lbl_800863C4 -/* 800863BC 38 60 00 05 */ li r3, 5 -/* 800863C0 4E 80 00 20 */ blr -lbl_800863C4: -/* 800863C4 28 00 00 49 */ cmplwi r0, 0x49 -/* 800863C8 41 80 00 0C */ blt lbl_800863D4 -/* 800863CC 38 60 00 04 */ li r3, 4 -/* 800863D0 4E 80 00 20 */ blr -lbl_800863D4: -/* 800863D4 28 00 00 25 */ cmplwi r0, 0x25 -/* 800863D8 41 80 00 0C */ blt lbl_800863E4 -/* 800863DC 38 60 00 03 */ li r3, 3 -/* 800863E0 4E 80 00 20 */ blr -lbl_800863E4: -/* 800863E4 28 00 00 02 */ cmplwi r0, 2 -/* 800863E8 41 80 00 0C */ blt lbl_800863F4 -/* 800863EC 38 60 00 02 */ li r3, 2 -/* 800863F0 4E 80 00 20 */ blr -lbl_800863F4: -/* 800863F4 20 00 00 01 */ subfic r0, r0, 1 -/* 800863F8 7C 00 00 34 */ cntlzw r0, r0 -/* 800863FC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80086400 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s b/asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s deleted file mode 100644 index 4a6279a88e..0000000000 --- a/asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s +++ /dev/null @@ -1,223 +0,0 @@ -lbl_8008640C: -/* 8008640C 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80086410 7C 08 02 A6 */ mflr r0 -/* 80086414 90 01 00 94 */ stw r0, 0x94(r1) -/* 80086418 DB E1 00 80 */ stfd f31, 0x80(r1) -/* 8008641C F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 80086420 DB C1 00 70 */ stfd f30, 0x70(r1) -/* 80086424 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 /* qr0 */ -/* 80086428 DB A1 00 60 */ stfd f29, 0x60(r1) -/* 8008642C F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 /* qr0 */ -/* 80086430 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086434 48 2D BD 99 */ bl _savegpr_25 -/* 80086438 7C 7A 1B 78 */ mr r26, r3 -/* 8008643C 7C 9B 23 78 */ mr r27, r4 -/* 80086440 7C BC 2B 78 */ mr r28, r5 -/* 80086444 7C DD 33 78 */ mr r29, r6 -/* 80086448 7C FE 3B 78 */ mr r30, r7 -/* 8008644C FF A0 08 90 */ fmr f29, f1 -/* 80086450 80 04 00 2C */ lwz r0, 0x2c(r4) -/* 80086454 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80086458 40 82 02 CC */ bne lbl_80086724 -/* 8008645C 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 80086460 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80086464 41 82 00 08 */ beq lbl_8008646C -/* 80086468 48 00 02 BC */ b lbl_80086724 -lbl_8008646C: -/* 8008646C 80 1B 00 44 */ lwz r0, 0x44(r27) -/* 80086470 28 00 00 00 */ cmplwi r0, 0 -/* 80086474 41 82 02 B0 */ beq lbl_80086724 -/* 80086478 80 1D 00 44 */ lwz r0, 0x44(r29) -/* 8008647C 28 00 00 00 */ cmplwi r0, 0 -/* 80086480 40 82 00 08 */ bne lbl_80086488 -/* 80086484 48 00 02 A0 */ b lbl_80086724 -lbl_80086488: -/* 80086488 FC 00 EA 10 */ fabs f0, f29 -/* 8008648C FC 20 00 18 */ frsp f1, f0 -/* 80086490 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 80086494 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80086498 41 80 02 8C */ blt lbl_80086724 -/* 8008649C 7F A5 EB 78 */ mr r5, r29 -/* 800864A0 81 83 28 48 */ lwz r12, 0x2848(r3) -/* 800864A4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 800864A8 7D 89 03 A6 */ mtctr r12 -/* 800864AC 4E 80 04 21 */ bctrl -/* 800864B0 3B E0 00 00 */ li r31, 0 -/* 800864B4 80 1B 00 2C */ lwz r0, 0x2c(r27) -/* 800864B8 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800864BC 41 82 00 14 */ beq lbl_800864D0 -/* 800864C0 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 800864C4 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800864C8 41 82 00 08 */ beq lbl_800864D0 -/* 800864CC 3B E0 00 01 */ li r31, 1 -lbl_800864D0: -/* 800864D0 80 9B 00 44 */ lwz r4, 0x44(r27) -/* 800864D4 88 04 00 14 */ lbz r0, 0x14(r4) -/* 800864D8 28 00 00 00 */ cmplwi r0, 0 -/* 800864DC 40 82 00 14 */ bne lbl_800864F0 -/* 800864E0 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 800864E4 88 03 00 14 */ lbz r0, 0x14(r3) -/* 800864E8 28 00 00 00 */ cmplwi r0, 0 -/* 800864EC 41 82 02 38 */ beq lbl_80086724 -lbl_800864F0: -/* 800864F0 88 04 00 14 */ lbz r0, 0x14(r4) -/* 800864F4 28 00 00 FF */ cmplwi r0, 0xff -/* 800864F8 40 82 00 18 */ bne lbl_80086510 -/* 800864FC 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 80086500 88 03 00 14 */ lbz r0, 0x14(r3) -/* 80086504 28 00 00 FF */ cmplwi r0, 0xff -/* 80086508 40 82 00 08 */ bne lbl_80086510 -/* 8008650C 48 00 02 18 */ b lbl_80086724 -lbl_80086510: -/* 80086510 88 84 00 14 */ lbz r4, 0x14(r4) -/* 80086514 7F 43 D3 78 */ mr r3, r26 -/* 80086518 4B FF FE 49 */ bl GetRank__4dCcSFUc -/* 8008651C 7C 79 1B 78 */ mr r25, r3 -/* 80086520 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 80086524 88 83 00 14 */ lbz r4, 0x14(r3) -/* 80086528 7F 43 D3 78 */ mr r3, r26 -/* 8008652C 4B FF FE 35 */ bl GetRank__4dCcSFUc -/* 80086530 1C B9 00 0B */ mulli r5, r25, 0xb -/* 80086534 3C 80 80 3B */ lis r4, rank_tbl@ha /* 0x803AC328@ha */ -/* 80086538 38 04 C3 28 */ addi r0, r4, rank_tbl@l /* 0x803AC328@l */ -/* 8008653C 7C 80 2A 14 */ add r4, r0, r5 -/* 80086540 7C 04 18 AE */ lbzx r0, r4, r3 -/* 80086544 C0 42 8D 7C */ lfs f2, lit_3924(r2) -/* 80086548 C8 22 8D 88 */ lfd f1, lit_3927(r2) -/* 8008654C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086550 3C 60 43 30 */ lis r3, 0x4330 -/* 80086554 90 61 00 30 */ stw r3, 0x30(r1) -/* 80086558 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8008655C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80086560 EF E2 00 32 */ fmuls f31, f2, f0 -/* 80086564 20 00 00 64 */ subfic r0, r0, 0x64 -/* 80086568 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8008656C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80086570 90 61 00 38 */ stw r3, 0x38(r1) -/* 80086574 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 80086578 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8008657C EF C2 00 32 */ fmuls f30, f2, f0 -/* 80086580 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80086584 41 82 00 20 */ beq lbl_800865A4 -/* 80086588 7F C3 F3 78 */ mr r3, r30 -/* 8008658C 7F 84 E3 78 */ mr r4, r28 -/* 80086590 38 A1 00 08 */ addi r5, r1, 8 -/* 80086594 48 2C 0B 21 */ bl PSVECSubtract -/* 80086598 38 61 00 08 */ addi r3, r1, 8 -/* 8008659C 48 2C 0B B5 */ bl PSVECMag -/* 800865A0 48 00 00 48 */ b lbl_800865E8 -lbl_800865A4: -/* 800865A4 C0 3E 00 00 */ lfs f1, 0(r30) -/* 800865A8 C0 1C 00 00 */ lfs f0, 0(r28) -/* 800865AC EC 61 00 28 */ fsubs f3, f1, f0 -/* 800865B0 D0 61 00 08 */ stfs f3, 8(r1) -/* 800865B4 C0 42 8D 78 */ lfs f2, lit_3705(r2) -/* 800865B8 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 800865BC C0 3E 00 08 */ lfs f1, 8(r30) -/* 800865C0 C0 1C 00 08 */ lfs f0, 8(r28) -/* 800865C4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800865C8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800865CC EC 23 00 F2 */ fmuls f1, f3, f3 -/* 800865D0 EC 00 00 32 */ fmuls f0, f0, f0 -/* 800865D4 EC 21 00 2A */ fadds f1, f1, f0 -/* 800865D8 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 800865DC 40 81 00 0C */ ble lbl_800865E8 -/* 800865E0 FC 00 08 34 */ frsqrte f0, f1 -/* 800865E4 EC 20 00 72 */ fmuls f1, f0, f1 -lbl_800865E8: -/* 800865E8 FC 00 0A 10 */ fabs f0, f1 -/* 800865EC FC 00 00 18 */ frsp f0, f0 -/* 800865F0 C0 4D 8C 00 */ lfs f2, G_CM3D_F_ABS_MIN(r13) -/* 800865F4 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 800865F8 41 80 00 9C */ blt lbl_80086694 -/* 800865FC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80086600 41 82 00 40 */ beq lbl_80086640 -/* 80086604 38 61 00 08 */ addi r3, r1, 8 -/* 80086608 7C 64 1B 78 */ mr r4, r3 -/* 8008660C EC 3D 08 24 */ fdivs f1, f29, f1 -/* 80086610 48 2C 0A C9 */ bl PSVECScale -/* 80086614 C0 02 8D 80 */ lfs f0, lit_3925(r2) -/* 80086618 EF FF 00 32 */ fmuls f31, f31, f0 -/* 8008661C 38 61 00 08 */ addi r3, r1, 8 -/* 80086620 38 81 00 20 */ addi r4, r1, 0x20 -/* 80086624 FC 20 F8 90 */ fmr f1, f31 -/* 80086628 48 2C 0A B1 */ bl PSVECScale -/* 8008662C 38 61 00 08 */ addi r3, r1, 8 -/* 80086630 38 81 00 14 */ addi r4, r1, 0x14 -/* 80086634 FC 20 F0 90 */ fmr f1, f30 -/* 80086638 48 2C 0A A1 */ bl PSVECScale -/* 8008663C 48 00 00 A0 */ b lbl_800866DC -lbl_80086640: -/* 80086640 EC 3D 08 24 */ fdivs f1, f29, f1 -/* 80086644 C0 01 00 08 */ lfs f0, 8(r1) -/* 80086648 EC 60 00 72 */ fmuls f3, f0, f1 -/* 8008664C D0 61 00 08 */ stfs f3, 8(r1) -/* 80086650 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80086654 EC 40 00 72 */ fmuls f2, f0, f1 -/* 80086658 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 8008665C FC 00 18 50 */ fneg f0, f3 -/* 80086660 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80086664 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80086668 C0 22 8D 78 */ lfs f1, lit_3705(r2) -/* 8008666C D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80086670 FC 00 10 50 */ fneg f0, f2 -/* 80086674 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80086678 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8008667C EC 03 07 B2 */ fmuls f0, f3, f30 -/* 80086680 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80086684 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80086688 EC 02 07 B2 */ fmuls f0, f2, f30 -/* 8008668C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80086690 48 00 00 4C */ b lbl_800866DC -lbl_80086694: -/* 80086694 C0 02 8D 78 */ lfs f0, lit_3705(r2) -/* 80086698 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8008669C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 800866A0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 800866A4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 800866A8 FC 00 EA 10 */ fabs f0, f29 -/* 800866AC FC 00 00 18 */ frsp f0, f0 -/* 800866B0 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 800866B4 41 80 00 1C */ blt lbl_800866D0 -/* 800866B8 FC 00 E8 50 */ fneg f0, f29 -/* 800866BC EC 00 07 F2 */ fmuls f0, f0, f31 -/* 800866C0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800866C4 EC 1D 07 B2 */ fmuls f0, f29, f30 -/* 800866C8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 800866CC 48 00 00 10 */ b lbl_800866DC -lbl_800866D0: -/* 800866D0 FC 00 F8 50 */ fneg f0, f31 -/* 800866D4 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800866D8 D3 C1 00 14 */ stfs f30, 0x14(r1) -lbl_800866DC: -/* 800866DC 80 7B 00 44 */ lwz r3, 0x44(r27) -/* 800866E0 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 800866E4 C0 41 00 24 */ lfs f2, 0x24(r1) -/* 800866E8 C0 61 00 28 */ lfs f3, 0x28(r1) -/* 800866EC 48 1D D2 49 */ bl PlusCcMove__9cCcD_SttsFfff -/* 800866F0 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 800866F4 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 800866F8 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 800866FC C0 61 00 1C */ lfs f3, 0x1c(r1) -/* 80086700 48 1D D2 35 */ bl PlusCcMove__9cCcD_SttsFfff -/* 80086704 7F 83 E3 78 */ mr r3, r28 -/* 80086708 38 81 00 20 */ addi r4, r1, 0x20 -/* 8008670C 7F 85 E3 78 */ mr r5, r28 -/* 80086710 48 2C 09 81 */ bl PSVECAdd -/* 80086714 7F C3 F3 78 */ mr r3, r30 -/* 80086718 38 81 00 14 */ addi r4, r1, 0x14 -/* 8008671C 7F C5 F3 78 */ mr r5, r30 -/* 80086720 48 2C 09 71 */ bl PSVECAdd -lbl_80086724: -/* 80086724 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 80086728 CB E1 00 80 */ lfd f31, 0x80(r1) -/* 8008672C E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 /* qr0 */ -/* 80086730 CB C1 00 70 */ lfd f30, 0x70(r1) -/* 80086734 E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 /* qr0 */ -/* 80086738 CB A1 00 60 */ lfd f29, 0x60(r1) -/* 8008673C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086740 48 2D BA D9 */ bl _restgpr_25 -/* 80086744 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80086748 7C 08 03 A6 */ mtlr r0 -/* 8008674C 38 21 00 90 */ addi r1, r1, 0x90 -/* 80086750 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s b/asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s deleted file mode 100644 index dcc8491adb..0000000000 --- a/asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8008721C: -/* 8008721C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80087220 7C 08 02 A6 */ mflr r0 -/* 80087224 90 01 00 14 */ stw r0, 0x14(r1) -/* 80087228 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8008722C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80087230 41 82 00 60 */ beq lbl_80087290 -/* 80087234 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80087238 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 8008723C 90 7F 00 1C */ stw r3, 0x1c(r31) -/* 80087240 38 03 00 58 */ addi r0, r3, 0x58 -/* 80087244 90 1F 00 30 */ stw r0, 0x30(r31) -/* 80087248 34 1F 00 20 */ addic. r0, r31, 0x20 -/* 8008724C 41 82 00 10 */ beq lbl_8008725C -/* 80087250 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 80087254 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 80087258 90 1F 00 30 */ stw r0, 0x30(r31) -lbl_8008725C: -/* 8008725C 28 1F 00 00 */ cmplwi r31, 0 -/* 80087260 41 82 00 20 */ beq lbl_80087280 -/* 80087264 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80087268 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8008726C 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 80087270 41 82 00 10 */ beq lbl_80087280 -/* 80087274 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80087278 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 8008727C 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_80087280: -/* 80087280 7C 80 07 35 */ extsh. r0, r4 -/* 80087284 40 81 00 0C */ ble lbl_80087290 -/* 80087288 7F E3 FB 78 */ mr r3, r31 -/* 8008728C 48 24 7A B1 */ bl __dl__FPv -lbl_80087290: -/* 80087290 7F E3 FB 78 */ mr r3, r31 -/* 80087294 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80087298 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8008729C 7C 08 03 A6 */ mtlr r0 -/* 800872A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800872A4 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s b/asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 439310d42a..0000000000 --- a/asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,161 +0,0 @@ -lbl_80086FBC: -/* 80086FBC 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80086FC0 7C 08 02 A6 */ mflr r0 -/* 80086FC4 90 01 00 84 */ stw r0, 0x84(r1) -/* 80086FC8 39 61 00 80 */ addi r11, r1, 0x80 -/* 80086FCC 48 2D B1 FD */ bl _savegpr_24 -/* 80086FD0 7C 7C 1B 78 */ mr r28, r3 -/* 80086FD4 7C B9 2B 78 */ mr r25, r5 -/* 80086FD8 7C DA 33 78 */ mr r26, r6 -/* 80086FDC 7C FB 3B 78 */ mr r27, r7 -/* 80086FE0 A0 03 28 04 */ lhz r0, 0x2804(r3) -/* 80086FE4 28 00 00 00 */ cmplwi r0, 0 -/* 80086FE8 40 82 00 0C */ bne lbl_80086FF4 -/* 80086FEC 38 60 00 00 */ li r3, 0 -/* 80086FF0 48 00 02 14 */ b lbl_80087204 -lbl_80086FF4: -/* 80086FF4 54 03 13 BA */ rlwinm r3, r0, 2, 0xe, 0x1d -/* 80086FF8 3B A3 10 00 */ addi r29, r3, 0x1000 -/* 80086FFC 7F BC EA 14 */ add r29, r28, r29 -/* 80087000 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80087004 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80087008 90 01 00 48 */ stw r0, 0x48(r1) -/* 8008700C 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80087010 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80087014 90 01 00 44 */ stw r0, 0x44(r1) -/* 80087018 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 8008701C 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 80087020 3B E1 00 4C */ addi r31, r1, 0x4c -/* 80087024 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80087028 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 8008702C 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80087030 90 61 00 48 */ stw r3, 0x48(r1) -/* 80087034 3B C3 00 58 */ addi r30, r3, 0x58 -/* 80087038 93 C1 00 5C */ stw r30, 0x5c(r1) -/* 8008703C C0 04 00 00 */ lfs f0, 0(r4) -/* 80087040 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80087044 C0 04 00 04 */ lfs f0, 4(r4) -/* 80087048 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8008704C C0 04 00 08 */ lfs f0, 8(r4) -/* 80087050 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80087054 C0 02 8D 90 */ lfs f0, lit_4336(r2) -/* 80087058 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8008705C 7F E3 FB 78 */ mr r3, r31 -/* 80087060 38 81 00 1C */ addi r4, r1, 0x1c -/* 80087064 48 1E 86 45 */ bl Set__8cM3dGSphFRC9cM3dGSphS -/* 80087068 38 61 00 2C */ addi r3, r1, 0x2c -/* 8008706C 48 1D D6 75 */ bl CalcAabBox__12cCcD_SphAttrFv -/* 80087070 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80087074 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80087078 90 01 00 18 */ stw r0, 0x18(r1) -/* 8008707C 38 7C 28 08 */ addi r3, r28, 0x2808 -/* 80087080 38 81 00 0C */ addi r4, r1, 0xc -/* 80087084 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80087088 48 1D C6 19 */ bl CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab -/* 8008708C 3B 9C 10 00 */ addi r28, r28, 0x1000 -/* 80087090 48 00 01 20 */ b lbl_800871B0 -lbl_80087094: -/* 80087094 80 7C 00 00 */ lwz r3, 0(r28) -/* 80087098 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 8008709C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800870A0 41 82 01 0C */ beq lbl_800871AC -/* 800870A4 48 1D C9 A5 */ bl GetAc__8cCcD_ObjFv -/* 800870A8 7C 03 D0 40 */ cmplw r3, r26 -/* 800870AC 41 82 01 00 */ beq lbl_800871AC -/* 800870B0 80 7C 00 00 */ lwz r3, 0(r28) -/* 800870B4 48 1D C9 95 */ bl GetAc__8cCcD_ObjFv -/* 800870B8 7C 03 D8 40 */ cmplw r3, r27 -/* 800870BC 41 82 00 F0 */ beq lbl_800871AC -/* 800870C0 80 7C 00 00 */ lwz r3, 0(r28) -/* 800870C4 38 63 00 48 */ addi r3, r3, 0x48 -/* 800870C8 38 81 00 0C */ addi r4, r1, 0xc -/* 800870CC 48 1D C2 9D */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo -/* 800870D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800870D4 41 82 00 D8 */ beq lbl_800871AC -/* 800870D8 80 7C 00 00 */ lwz r3, 0(r28) -/* 800870DC 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 800870E0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 800870E4 7D 89 03 A6 */ mtctr r12 -/* 800870E8 4E 80 04 21 */ bctrl -/* 800870EC 28 03 00 00 */ cmplwi r3, 0 -/* 800870F0 41 82 00 10 */ beq lbl_80087100 -/* 800870F4 80 03 00 E8 */ lwz r0, 0xe8(r3) -/* 800870F8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800870FC 40 82 00 B0 */ bne lbl_800871AC -lbl_80087100: -/* 80087100 80 7C 00 00 */ lwz r3, 0(r28) -/* 80087104 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80087108 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8008710C 7D 89 03 A6 */ mtctr r12 -/* 80087110 4E 80 04 21 */ bctrl -/* 80087114 7C 78 1B 78 */ mr r24, r3 -/* 80087118 38 81 00 2C */ addi r4, r1, 0x2c -/* 8008711C 38 A1 00 08 */ addi r5, r1, 8 -/* 80087120 81 83 00 1C */ lwz r12, 0x1c(r3) -/* 80087124 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 80087128 7D 89 03 A6 */ mtctr r12 -/* 8008712C 4E 80 04 21 */ bctrl -/* 80087130 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80087134 41 82 00 78 */ beq lbl_800871AC -/* 80087138 7F 03 C3 78 */ mr r3, r24 -/* 8008713C 7F 24 CB 78 */ mr r4, r25 -/* 80087140 81 98 00 1C */ lwz r12, 0x1c(r24) -/* 80087144 81 8C 00 54 */ lwz r12, 0x54(r12) -/* 80087148 7D 89 03 A6 */ mtctr r12 -/* 8008714C 4E 80 04 21 */ bctrl -/* 80087150 80 19 00 00 */ lwz r0, 0(r25) -/* 80087154 2C 00 00 02 */ cmpwi r0, 2 -/* 80087158 41 82 00 54 */ beq lbl_800871AC -/* 8008715C 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80087160 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80087164 90 01 00 18 */ stw r0, 0x18(r1) -/* 80087168 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 8008716C 38 03 35 40 */ addi r0, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80087170 90 01 00 48 */ stw r0, 0x48(r1) -/* 80087174 93 C1 00 5C */ stw r30, 0x5c(r1) -/* 80087178 28 1F 00 00 */ cmplwi r31, 0 -/* 8008717C 41 82 00 10 */ beq lbl_8008718C -/* 80087180 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 80087184 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 80087188 90 01 00 5C */ stw r0, 0x5c(r1) -lbl_8008718C: -/* 8008718C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80087190 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80087194 90 01 00 48 */ stw r0, 0x48(r1) -/* 80087198 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 8008719C 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 800871A0 90 01 00 44 */ stw r0, 0x44(r1) -/* 800871A4 38 60 00 01 */ li r3, 1 -/* 800871A8 48 00 00 5C */ b lbl_80087204 -lbl_800871AC: -/* 800871AC 3B 9C 00 04 */ addi r28, r28, 4 -lbl_800871B0: -/* 800871B0 7C 1C E8 40 */ cmplw r28, r29 -/* 800871B4 41 80 FE E0 */ blt lbl_80087094 -/* 800871B8 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 800871BC 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 800871C0 90 01 00 18 */ stw r0, 0x18(r1) -/* 800871C4 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 800871C8 38 03 35 40 */ addi r0, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 800871CC 90 01 00 48 */ stw r0, 0x48(r1) -/* 800871D0 93 C1 00 5C */ stw r30, 0x5c(r1) -/* 800871D4 28 1F 00 00 */ cmplwi r31, 0 -/* 800871D8 41 82 00 10 */ beq lbl_800871E8 -/* 800871DC 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 800871E0 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 800871E4 90 01 00 5C */ stw r0, 0x5c(r1) -lbl_800871E8: -/* 800871E8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 800871EC 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 800871F0 90 01 00 48 */ stw r0, 0x48(r1) -/* 800871F4 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 800871F8 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 800871FC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80087200 38 60 00 00 */ li r3, 0 -lbl_80087204: -/* 80087204 39 61 00 80 */ addi r11, r1, 0x80 -/* 80087208 48 2D B0 0D */ bl _restgpr_24 -/* 8008720C 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80087210 7C 08 03 A6 */ mtlr r0 -/* 80087214 38 21 00 80 */ addi r1, r1, 0x80 -/* 80087218 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/func_800861B4.s b/asm/d/cc/d_cc_s/func_800861B4.s deleted file mode 100644 index b228572942..0000000000 --- a/asm/d/cc/d_cc_s/func_800861B4.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800861B4: -/* 800861B4 81 81 00 08 */ lwz r12, 8(r1) -/* 800861B8 81 68 00 10 */ lwz r11, 0x10(r8) -/* 800861BC 80 69 00 10 */ lwz r3, 0x10(r9) -/* 800861C0 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 800861C4 41 82 00 38 */ beq lbl_800861FC -/* 800861C8 90 6A 00 0C */ stw r3, 0xc(r10) -/* 800861CC 80 06 00 58 */ lwz r0, 0x58(r6) -/* 800861D0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800861D4 41 82 00 28 */ beq lbl_800861FC -/* 800861D8 80 07 00 9C */ lwz r0, 0x9c(r7) -/* 800861DC 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 800861E0 40 82 00 1C */ bne lbl_800861FC -/* 800861E4 80 6A 00 10 */ lwz r3, 0x10(r10) -/* 800861E8 80 09 00 10 */ lwz r0, 0x10(r9) -/* 800861EC 7C 03 00 40 */ cmplw r3, r0 -/* 800861F0 40 82 00 0C */ bne lbl_800861FC -/* 800861F4 38 60 00 01 */ li r3, 1 -/* 800861F8 4E 80 00 20 */ blr -lbl_800861FC: -/* 800861FC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 80086200 41 82 00 38 */ beq lbl_80086238 -/* 80086204 91 6C 00 14 */ stw r11, 0x14(r12) -/* 80086208 80 07 00 9C */ lwz r0, 0x9c(r7) -/* 8008620C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80086210 41 82 00 28 */ beq lbl_80086238 -/* 80086214 80 06 00 58 */ lwz r0, 0x58(r6) -/* 80086218 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 8008621C 40 82 00 1C */ bne lbl_80086238 -/* 80086220 80 6C 00 18 */ lwz r3, 0x18(r12) -/* 80086224 80 08 00 10 */ lwz r0, 0x10(r8) -/* 80086228 7C 03 00 40 */ cmplw r3, r0 -/* 8008622C 40 82 00 0C */ bne lbl_80086238 -/* 80086230 38 60 00 01 */ li r3, 1 -/* 80086234 4E 80 00 20 */ blr -lbl_80086238: -/* 80086238 38 60 00 00 */ li r3, 0 -/* 8008623C 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/func_80086AC0.s b/asm/d/cc/d_cc_s/func_80086AC0.s deleted file mode 100644 index 9fefacd197..0000000000 --- a/asm/d/cc/d_cc_s/func_80086AC0.s +++ /dev/null @@ -1,192 +0,0 @@ -lbl_80086AC0: -/* 80086AC0 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80086AC4 7C 08 02 A6 */ mflr r0 -/* 80086AC8 90 01 00 64 */ stw r0, 0x64(r1) -/* 80086ACC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086AD0 48 2D B6 DD */ bl _savegpr_17 -/* 80086AD4 7C 76 1B 78 */ mr r22, r3 -/* 80086AD8 7C 97 23 78 */ mr r23, r4 -/* 80086ADC 7C B8 2B 78 */ mr r24, r5 -/* 80086AE0 7C D9 33 78 */ mr r25, r6 -/* 80086AE4 7C FA 3B 78 */ mr r26, r7 -/* 80086AE8 7D 5B 53 78 */ mr r27, r10 -/* 80086AEC 83 81 00 68 */ lwz r28, 0x68(r1) -/* 80086AF0 83 A1 00 6C */ lwz r29, 0x6c(r1) -/* 80086AF4 83 C1 00 70 */ lwz r30, 0x70(r1) -/* 80086AF8 83 E1 00 74 */ lwz r31, 0x74(r1) -/* 80086AFC 7D 14 43 78 */ mr r20, r8 -/* 80086B00 7D 33 4B 78 */ mr r19, r9 -/* 80086B04 7F 24 CB 78 */ mr r4, r25 -/* 80086B08 7F 45 D3 78 */ mr r5, r26 -/* 80086B0C 7E 86 A3 78 */ mr r6, r20 -/* 80086B10 7E 67 9B 78 */ mr r7, r19 -/* 80086B14 7F E8 FB 78 */ mr r8, r31 -/* 80086B18 4B FF F5 E1 */ bl ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz -/* 80086B1C 7C 75 1B 78 */ mr r21, r3 -/* 80086B20 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80086B24 41 82 00 BC */ beq lbl_80086BE0 -/* 80086B28 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80086B2C D0 14 00 78 */ stfs f0, 0x78(r20) -/* 80086B30 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80086B34 D0 14 00 7C */ stfs f0, 0x7c(r20) -/* 80086B38 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80086B3C D0 14 00 80 */ stfs f0, 0x80(r20) -/* 80086B40 C0 13 00 BC */ lfs f0, 0xbc(r19) -/* 80086B44 D0 14 00 90 */ stfs f0, 0x90(r20) -/* 80086B48 C0 13 00 C0 */ lfs f0, 0xc0(r19) -/* 80086B4C D0 14 00 94 */ stfs f0, 0x94(r20) -/* 80086B50 C0 13 00 C4 */ lfs f0, 0xc4(r19) -/* 80086B54 D0 14 00 98 */ stfs f0, 0x98(r20) -/* 80086B58 28 1D 00 00 */ cmplwi r29, 0 -/* 80086B5C 41 82 00 18 */ beq lbl_80086B74 -/* 80086B60 88 1D 00 05 */ lbz r0, 5(r29) -/* 80086B64 2C 00 00 00 */ cmpwi r0, 0 -/* 80086B68 40 82 00 0C */ bne lbl_80086B74 -/* 80086B6C 88 13 00 BB */ lbz r0, 0xbb(r19) -/* 80086B70 98 1D 00 05 */ stb r0, 5(r29) -lbl_80086B74: -/* 80086B74 80 9C 00 10 */ lwz r4, 0x10(r28) -/* 80086B78 38 74 00 58 */ addi r3, r20, 0x58 -/* 80086B7C 4B FF CA FD */ bl SetHitApid__22dCcD_GAtTgCoCommonBaseFUi -/* 80086B80 56 A0 06 3F */ clrlwi. r0, r21, 0x18 -/* 80086B84 40 82 00 38 */ bne lbl_80086BBC -/* 80086B88 88 13 00 BA */ lbz r0, 0xba(r19) -/* 80086B8C 2C 00 00 08 */ cmpwi r0, 8 -/* 80086B90 40 82 00 38 */ bne lbl_80086BC8 -/* 80086B94 88 14 00 75 */ lbz r0, 0x75(r20) -/* 80086B98 28 00 00 02 */ cmplwi r0, 2 -/* 80086B9C 41 82 00 2C */ beq lbl_80086BC8 -/* 80086BA0 88 14 00 77 */ lbz r0, 0x77(r20) -/* 80086BA4 2C 00 00 00 */ cmpwi r0, 0 -/* 80086BA8 41 82 00 14 */ beq lbl_80086BBC -/* 80086BAC 2C 00 00 05 */ cmpwi r0, 5 -/* 80086BB0 41 82 00 0C */ beq lbl_80086BBC -/* 80086BB4 2C 00 00 08 */ cmpwi r0, 8 -/* 80086BB8 40 82 00 10 */ bne lbl_80086BC8 -lbl_80086BBC: -/* 80086BBC 80 14 00 5C */ lwz r0, 0x5c(r20) -/* 80086BC0 60 00 00 01 */ ori r0, r0, 1 -/* 80086BC4 90 14 00 5C */ stw r0, 0x5c(r20) -lbl_80086BC8: -/* 80086BC8 80 1E 00 1C */ lwz r0, 0x1c(r30) -/* 80086BCC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80086BD0 41 82 00 10 */ beq lbl_80086BE0 -/* 80086BD4 80 14 00 5C */ lwz r0, 0x5c(r20) -/* 80086BD8 60 00 00 02 */ ori r0, r0, 2 -/* 80086BDC 90 14 00 5C */ stw r0, 0x5c(r20) -lbl_80086BE0: -/* 80086BE0 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80086BE4 41 82 00 98 */ beq lbl_80086C7C -/* 80086BE8 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80086BEC D0 13 00 D4 */ stfs f0, 0xd4(r19) -/* 80086BF0 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80086BF4 D0 13 00 D8 */ stfs f0, 0xd8(r19) -/* 80086BF8 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80086BFC D0 13 00 DC */ stfs f0, 0xdc(r19) -/* 80086C00 C0 14 00 84 */ lfs f0, 0x84(r20) -/* 80086C04 D0 13 00 C8 */ stfs f0, 0xc8(r19) -/* 80086C08 C0 14 00 88 */ lfs f0, 0x88(r20) -/* 80086C0C D0 13 00 CC */ stfs f0, 0xcc(r19) -/* 80086C10 C0 14 00 8C */ lfs f0, 0x8c(r20) -/* 80086C14 D0 13 00 D0 */ stfs f0, 0xd0(r19) -/* 80086C18 28 1E 00 00 */ cmplwi r30, 0 -/* 80086C1C 41 82 00 18 */ beq lbl_80086C34 -/* 80086C20 88 1D 00 04 */ lbz r0, 4(r29) -/* 80086C24 2C 00 00 00 */ cmpwi r0, 0 -/* 80086C28 40 82 00 0C */ bne lbl_80086C34 -/* 80086C2C 88 14 00 77 */ lbz r0, 0x77(r20) -/* 80086C30 98 1E 00 04 */ stb r0, 4(r30) -lbl_80086C34: -/* 80086C34 80 9B 00 10 */ lwz r4, 0x10(r27) -/* 80086C38 38 73 00 9C */ addi r3, r19, 0x9c -/* 80086C3C 4B FF CA 3D */ bl SetHitApid__22dCcD_GAtTgCoCommonBaseFUi -/* 80086C40 56 A0 06 3F */ clrlwi. r0, r21, 0x18 -/* 80086C44 41 82 00 14 */ beq lbl_80086C58 -/* 80086C48 80 13 00 A0 */ lwz r0, 0xa0(r19) -/* 80086C4C 60 00 00 02 */ ori r0, r0, 2 -/* 80086C50 90 13 00 A0 */ stw r0, 0xa0(r19) -/* 80086C54 48 00 00 10 */ b lbl_80086C64 -lbl_80086C58: -/* 80086C58 7F 83 E3 78 */ mr r3, r28 -/* 80086C5C 88 99 00 14 */ lbz r4, 0x14(r25) -/* 80086C60 48 1D CD 11 */ bl PlusDmg__9cCcD_SttsFi -lbl_80086C64: -/* 80086C64 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 80086C68 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80086C6C 41 82 00 10 */ beq lbl_80086C7C -/* 80086C70 80 13 00 A0 */ lwz r0, 0xa0(r19) -/* 80086C74 60 00 00 01 */ ori r0, r0, 1 -/* 80086C78 90 13 00 A0 */ stw r0, 0xa0(r19) -lbl_80086C7C: -/* 80086C7C 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80086C80 41 82 00 3C */ beq lbl_80086CBC -/* 80086C84 82 34 00 60 */ lwz r17, 0x60(r20) -/* 80086C88 28 11 00 00 */ cmplwi r17, 0 -/* 80086C8C 41 82 00 30 */ beq lbl_80086CBC -/* 80086C90 7E 63 9B 78 */ mr r3, r19 -/* 80086C94 48 1D CD B5 */ bl GetAc__8cCcD_ObjFv -/* 80086C98 7C 72 1B 78 */ mr r18, r3 -/* 80086C9C 7E 83 A3 78 */ mr r3, r20 -/* 80086CA0 48 1D CD A9 */ bl GetAc__8cCcD_ObjFv -/* 80086CA4 7E 84 A3 78 */ mr r4, r20 -/* 80086CA8 7E 45 93 78 */ mr r5, r18 -/* 80086CAC 7E 66 9B 78 */ mr r6, r19 -/* 80086CB0 7E 2C 8B 78 */ mr r12, r17 -/* 80086CB4 7D 89 03 A6 */ mtctr r12 -/* 80086CB8 4E 80 04 21 */ bctrl -lbl_80086CBC: -/* 80086CBC 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80086CC0 41 82 00 3C */ beq lbl_80086CFC -/* 80086CC4 82 33 00 A4 */ lwz r17, 0xa4(r19) -/* 80086CC8 28 11 00 00 */ cmplwi r17, 0 -/* 80086CCC 41 82 00 30 */ beq lbl_80086CFC -/* 80086CD0 7E 83 A3 78 */ mr r3, r20 -/* 80086CD4 48 1D CD 75 */ bl GetAc__8cCcD_ObjFv -/* 80086CD8 7C 72 1B 78 */ mr r18, r3 -/* 80086CDC 7E 63 9B 78 */ mr r3, r19 -/* 80086CE0 48 1D CD 69 */ bl GetAc__8cCcD_ObjFv -/* 80086CE4 7E 64 9B 78 */ mr r4, r19 -/* 80086CE8 7E 45 93 78 */ mr r5, r18 -/* 80086CEC 7E 86 A3 78 */ mr r6, r20 -/* 80086CF0 7E 2C 8B 78 */ mr r12, r17 -/* 80086CF4 7D 89 03 A6 */ mtctr r12 -/* 80086CF8 4E 80 04 21 */ bctrl -lbl_80086CFC: -/* 80086CFC 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80086D00 41 82 00 74 */ beq lbl_80086D74 -/* 80086D04 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80086D08 41 82 00 6C */ beq lbl_80086D74 -/* 80086D0C 38 74 00 58 */ addi r3, r20, 0x58 -/* 80086D10 4B FF CA 39 */ bl ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv -/* 80086D14 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086D18 41 82 00 14 */ beq lbl_80086D2C -/* 80086D1C 38 73 00 9C */ addi r3, r19, 0x9c -/* 80086D20 4B FF CA 29 */ bl ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv -/* 80086D24 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086D28 40 82 00 4C */ bne lbl_80086D74 -lbl_80086D2C: -/* 80086D2C 38 74 00 58 */ addi r3, r20, 0x58 -/* 80086D30 4B FF C9 E9 */ bl SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv -/* 80086D34 38 73 00 9C */ addi r3, r19, 0x9c -/* 80086D38 4B FF C9 E1 */ bl SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv -/* 80086D3C 93 81 00 08 */ stw r28, 8(r1) -/* 80086D40 93 A1 00 0C */ stw r29, 0xc(r1) -/* 80086D44 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80086D48 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80086D4C 92 A1 00 18 */ stw r21, 0x18(r1) -/* 80086D50 7E C3 B3 78 */ mr r3, r22 -/* 80086D54 7E E4 BB 78 */ mr r4, r23 -/* 80086D58 7F 05 C3 78 */ mr r5, r24 -/* 80086D5C 7F 26 CB 78 */ mr r6, r25 -/* 80086D60 7F 47 D3 78 */ mr r7, r26 -/* 80086D64 7E 88 A3 78 */ mr r8, r20 -/* 80086D68 7E 69 9B 78 */ mr r9, r19 -/* 80086D6C 7F 6A DB 78 */ mr r10, r27 -/* 80086D70 4B FF FA ED */ bl ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb -lbl_80086D74: -/* 80086D74 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086D78 48 2D B4 81 */ bl _restgpr_17 -/* 80086D7C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80086D80 7C 08 03 A6 */ mtlr r0 -/* 80086D84 38 21 00 60 */ addi r1, r1, 0x60 -/* 80086D88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index fa265f5446..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8061E820: -/* 8061E820 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061E824 7C 08 02 A6 */ mflr r0 -/* 8061E828 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061E82C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061E830 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8061E834 41 82 00 1C */ beq lbl_8061E850 -/* 8061E838 3C A0 80 62 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x8061EADC@ha */ -/* 8061E83C 38 05 EA DC */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x8061EADC@l */ -/* 8061E840 90 1F 00 00 */ stw r0, 0(r31) -/* 8061E844 7C 80 07 35 */ extsh. r0, r4 -/* 8061E848 40 81 00 08 */ ble lbl_8061E850 -/* 8061E84C 4B CB 04 F1 */ bl __dl__FPv -lbl_8061E850: -/* 8061E850 7F E3 FB 78 */ mr r3, r31 -/* 8061E854 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061E858 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061E85C 7C 08 03 A6 */ mtlr r0 -/* 8061E860 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061E864 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s deleted file mode 100644 index dc7737c20f..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8061E19C: -/* 8061E19C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061E1A0 7C 08 02 A6 */ mflr r0 -/* 8061E1A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061E1A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061E1AC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8061E1B0 41 82 00 10 */ beq lbl_8061E1C0 -/* 8061E1B4 7C 80 07 35 */ extsh. r0, r4 -/* 8061E1B8 40 81 00 08 */ ble lbl_8061E1C0 -/* 8061E1BC 4B CB 0B 81 */ bl __dl__FPv -lbl_8061E1C0: -/* 8061E1C0 7F E3 FB 78 */ mr r3, r31 -/* 8061E1C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061E1C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061E1CC 7C 08 03 A6 */ mtlr r0 -/* 8061E1D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061E1D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s deleted file mode 100644 index 9f7631614b..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8061E9EC: -/* 8061E9EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061E9F0 7C 08 02 A6 */ mflr r0 -/* 8061E9F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061E9F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061E9FC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8061EA00 41 82 00 10 */ beq lbl_8061EA10 -/* 8061EA04 7C 80 07 35 */ extsh. r0, r4 -/* 8061EA08 40 81 00 08 */ ble lbl_8061EA10 -/* 8061EA0C 4B CB 03 31 */ bl __dl__FPv -lbl_8061EA10: -/* 8061EA10 7F E3 FB 78 */ mr r3, r31 -/* 8061EA14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061EA18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061EA1C 7C 08 03 A6 */ mtlr r0 -/* 8061EA20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061EA24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s deleted file mode 100644 index 8142dc6077..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s +++ /dev/null @@ -1,146 +0,0 @@ -lbl_8061E1D8: -/* 8061E1D8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8061E1DC 7C 08 02 A6 */ mflr r0 -/* 8061E1E0 90 01 00 44 */ stw r0, 0x44(r1) -/* 8061E1E4 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 8061E1E8 93 C1 00 38 */ stw r30, 0x38(r1) -/* 8061E1EC 7C 7E 1B 78 */ mr r30, r3 -/* 8061E1F0 3C 60 80 62 */ lis r3, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061E1F4 3B E3 EA 38 */ addi r31, r3, lit_3678@l /* 0x8061EA38@l */ -/* 8061E1F8 A8 1E 05 CE */ lha r0, 0x5ce(r30) -/* 8061E1FC 2C 00 00 00 */ cmpwi r0, 0 -/* 8061E200 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061E204 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061E208 80 63 00 00 */ lwz r3, 0(r3) -/* 8061E20C 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 8061E210 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E214 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8061E218 80 83 00 0C */ lwz r4, 0xc(r3) -/* 8061E21C 80 7E 05 C8 */ lwz r3, 0x5c8(r30) -/* 8061E220 38 03 00 08 */ addi r0, r3, 8 -/* 8061E224 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 8061E228 7C 64 02 14 */ add r3, r4, r0 -/* 8061E22C 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E230 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E234 4B D2 82 7D */ bl PSMTXCopy -/* 8061E238 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E23C 38 83 D4 70 */ addi r4, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E240 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 8061E244 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 8061E248 C0 04 00 1C */ lfs f0, 0x1c(r4) -/* 8061E24C D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 8061E250 C0 04 00 2C */ lfs f0, 0x2c(r4) -/* 8061E254 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 8061E258 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061E25C 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061E260 80 63 00 00 */ lwz r3, 0(r3) -/* 8061E264 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 8061E268 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E26C 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8061E270 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8061E274 4B D2 82 3D */ bl PSMTXCopy -/* 8061E278 C0 7F 00 24 */ lfs f3, 0x24(r31) -/* 8061E27C C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 8061E280 80 1E 05 C8 */ lwz r0, 0x5c8(r30) -/* 8061E284 C8 3F 00 30 */ lfd f1, 0x30(r31) -/* 8061E288 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8061E28C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8061E290 3C 00 43 30 */ lis r0, 0x4330 -/* 8061E294 90 01 00 30 */ stw r0, 0x30(r1) -/* 8061E298 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8061E29C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8061E2A0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8061E2A4 EC 23 00 2A */ fadds f1, f3, f0 -/* 8061E2A8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8061E2AC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8061E2B0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8061E2B4 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 8061E2B8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E2BC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E2C0 38 81 00 20 */ addi r4, r1, 0x20 -/* 8061E2C4 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8061E2C8 4B D2 8A A5 */ bl PSMTXMultVec -/* 8061E2CC 38 61 00 08 */ addi r3, r1, 8 -/* 8061E2D0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8061E2D4 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8061E2D8 4B C4 88 5D */ bl __mi__4cXyzCFRC3Vec -/* 8061E2DC C0 21 00 08 */ lfs f1, 8(r1) -/* 8061E2E0 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 8061E2E4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8061E2E8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8061E2EC C0 41 00 10 */ lfs f2, 0x10(r1) -/* 8061E2F0 D0 41 00 28 */ stfs f2, 0x28(r1) -/* 8061E2F4 4B C4 93 81 */ bl cM_atan2s__Fff -/* 8061E2F8 B0 7E 04 E6 */ sth r3, 0x4e6(r30) -/* 8061E2FC C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8061E300 EC 20 00 32 */ fmuls f1, f0, f0 -/* 8061E304 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8061E308 EC 00 00 32 */ fmuls f0, f0, f0 -/* 8061E30C EC 41 00 2A */ fadds f2, f1, f0 -/* 8061E310 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8061E314 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8061E318 40 81 00 0C */ ble lbl_8061E324 -/* 8061E31C FC 00 10 34 */ frsqrte f0, f2 -/* 8061E320 EC 40 00 B2 */ fmuls f2, f0, f2 -lbl_8061E324: -/* 8061E324 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 8061E328 4B C4 93 4D */ bl cM_atan2s__Fff -/* 8061E32C 7C 03 00 D0 */ neg r0, r3 -/* 8061E330 B0 1E 04 E4 */ sth r0, 0x4e4(r30) -/* 8061E334 7F C3 F3 78 */ mr r3, r30 -/* 8061E338 4B FF FB 15 */ bl dmcalc__FP11b_oh2_class -/* 8061E33C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E340 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E344 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 8061E348 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 8061E34C C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 8061E350 4B D2 85 99 */ bl PSMTXTrans -/* 8061E354 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E358 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E35C A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 8061E360 4B 9E E0 D5 */ bl mDoMtx_YrotM__FPA4_fs -/* 8061E364 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E368 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E36C A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 8061E370 4B 9E E0 2D */ bl mDoMtx_XrotM__FPA4_fs -/* 8061E374 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E378 80 83 00 04 */ lwz r4, 4(r3) -/* 8061E37C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E380 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E384 38 84 00 24 */ addi r4, r4, 0x24 -/* 8061E388 4B D2 81 29 */ bl PSMTXCopy -/* 8061E38C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8061E390 7C 03 07 74 */ extsb r3, r0 -/* 8061E394 4B A0 EC D9 */ bl dComIfGp_getReverb__Fi -/* 8061E398 7C 65 1B 78 */ mr r5, r3 -/* 8061E39C 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E3A0 38 80 00 00 */ li r4, 0 -/* 8061E3A4 4B 9F 2D 0D */ bl play__16mDoExt_McaMorfSOFUlSc -/* 8061E3A8 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061E3AC 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061E3B0 80 63 00 00 */ lwz r3, 0(r3) -/* 8061E3B4 C0 23 05 2C */ lfs f1, 0x52c(r3) -/* 8061E3B8 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8061E3BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8061E3C0 4C 40 13 82 */ cror 2, 0, 2 -/* 8061E3C4 40 82 00 1C */ bne lbl_8061E3E0 -/* 8061E3C8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8061E3CC 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E3D0 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8061E3D4 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E3D8 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8061E3DC 48 00 00 14 */ b lbl_8061E3F0 -lbl_8061E3E0: -/* 8061E3E0 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E3E4 4B 9E F0 45 */ bl play__14mDoExt_baseAnmFv -/* 8061E3E8 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E3EC 4B 9E F0 3D */ bl play__14mDoExt_baseAnmFv -lbl_8061E3F0: -/* 8061E3F0 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E3F4 4B 9F 2D F9 */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 8061E3F8 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 8061E3FC 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 8061E400 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8061E404 7C 08 03 A6 */ mtlr r0 -/* 8061E408 38 21 00 40 */ addi r1, r1, 0x40 -/* 8061E40C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 4300d81248..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,104 +0,0 @@ -lbl_8061E868: -/* 8061E868 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8061E86C 7C 08 02 A6 */ mflr r0 -/* 8061E870 90 01 00 34 */ stw r0, 0x34(r1) -/* 8061E874 39 61 00 30 */ addi r11, r1, 0x30 -/* 8061E878 4B D4 39 65 */ bl _savegpr_29 -/* 8061E87C 7C 7E 1B 78 */ mr r30, r3 -/* 8061E880 3C 80 80 62 */ lis r4, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061E884 3B E4 EA 38 */ addi r31, r4, lit_3678@l /* 0x8061EA38@l */ -/* 8061E888 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8061E88C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8061E890 40 82 00 68 */ bne lbl_8061E8F8 -/* 8061E894 7F C0 F3 79 */ or. r0, r30, r30 -/* 8061E898 41 82 00 54 */ beq lbl_8061E8EC -/* 8061E89C 7C 1D 03 78 */ mr r29, r0 -/* 8061E8A0 4B 9F A2 C5 */ bl __ct__10fopAc_ac_cFv -/* 8061E8A4 38 7D 06 60 */ addi r3, r29, 0x660 -/* 8061E8A8 3C 80 80 62 */ lis r4, __ct__4cXyzFv@ha /* 0x8061EA2C@ha */ -/* 8061E8AC 38 84 EA 2C */ addi r4, r4, __ct__4cXyzFv@l /* 0x8061EA2C@l */ -/* 8061E8B0 3C A0 80 62 */ lis r5, __dt__4cXyzFv@ha /* 0x8061E19C@ha */ -/* 8061E8B4 38 A5 E1 9C */ addi r5, r5, __dt__4cXyzFv@l /* 0x8061E19C@l */ -/* 8061E8B8 38 C0 00 0C */ li r6, 0xc -/* 8061E8BC 38 E0 00 1F */ li r7, 0x1f -/* 8061E8C0 4B D4 34 A1 */ bl __construct_array -/* 8061E8C4 38 7D 07 D4 */ addi r3, r29, 0x7d4 -/* 8061E8C8 3C 80 80 62 */ lis r4, __ct__5csXyzFv@ha /* 0x8061EA28@ha */ -/* 8061E8CC 38 84 EA 28 */ addi r4, r4, __ct__5csXyzFv@l /* 0x8061EA28@l */ -/* 8061E8D0 3C A0 80 62 */ lis r5, __dt__5csXyzFv@ha /* 0x8061E9EC@ha */ -/* 8061E8D4 38 A5 E9 EC */ addi r5, r5, __dt__5csXyzFv@l /* 0x8061E9EC@l */ -/* 8061E8D8 38 C0 00 06 */ li r6, 6 -/* 8061E8DC 38 E0 00 1F */ li r7, 0x1f -/* 8061E8E0 4B D4 34 81 */ bl __construct_array -/* 8061E8E4 38 7D 08 98 */ addi r3, r29, 0x898 -/* 8061E8E8 4B CA 26 7D */ bl __ct__15Z2CreatureEnemyFv -lbl_8061E8EC: -/* 8061E8EC 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 8061E8F0 60 00 00 08 */ ori r0, r0, 8 -/* 8061E8F4 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_8061E8F8: -/* 8061E8F8 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 8061E8FC 3C 80 80 62 */ lis r4, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E900 38 84 EA 84 */ addi r4, r4, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E904 4B A0 E5 B9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8061E908 7C 7D 1B 78 */ mr r29, r3 -/* 8061E90C 2C 1D 00 04 */ cmpwi r29, 4 -/* 8061E910 40 82 00 C0 */ bne lbl_8061E9D0 -/* 8061E914 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8061E918 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8061E91C 90 1E 05 C8 */ stw r0, 0x5c8(r30) -/* 8061E920 7F C3 F3 78 */ mr r3, r30 -/* 8061E924 3C 80 80 62 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x8061E540@ha */ -/* 8061E928 38 84 E5 40 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x8061E540@l */ -/* 8061E92C 38 A0 23 E0 */ li r5, 0x23e0 -/* 8061E930 4B 9F BB 81 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8061E934 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8061E938 40 82 00 0C */ bne lbl_8061E944 -/* 8061E93C 38 60 00 05 */ li r3, 5 -/* 8061E940 48 00 00 94 */ b lbl_8061E9D4 -lbl_8061E944: -/* 8061E944 38 7E 08 98 */ addi r3, r30, 0x898 -/* 8061E948 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8061E94C 7C 85 23 78 */ mr r5, r4 -/* 8061E950 38 C0 00 03 */ li r6, 3 -/* 8061E954 38 E0 00 01 */ li r7, 1 -/* 8061E958 4B CA 27 3D */ bl init__15Z2CreatureEnemyFP3VecP3VecUcUc -/* 8061E95C C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8061E960 4B C4 8F F5 */ bl cM_rndF__Ff -/* 8061E964 FC 00 08 1E */ fctiwz f0, f1 -/* 8061E968 D8 01 00 08 */ stfd f0, 8(r1) -/* 8061E96C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8061E970 B0 1E 05 CC */ sth r0, 0x5cc(r30) -/* 8061E974 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8061E978 4B C4 8F DD */ bl cM_rndF__Ff -/* 8061E97C FC 00 08 1E */ fctiwz f0, f1 -/* 8061E980 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8061E984 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061E988 B0 1E 05 DC */ sth r0, 0x5dc(r30) -/* 8061E98C 38 60 00 00 */ li r3, 0 -/* 8061E990 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 8061E994 38 00 00 1F */ li r0, 0x1f -/* 8061E998 7C 09 03 A6 */ mtctr r0 -lbl_8061E99C: -/* 8061E99C 38 03 06 64 */ addi r0, r3, 0x664 -/* 8061E9A0 7C 1E 05 2E */ stfsx f0, r30, r0 -/* 8061E9A4 38 63 00 0C */ addi r3, r3, 0xc -/* 8061E9A8 42 00 FF F4 */ bdnz lbl_8061E99C -/* 8061E9AC 38 00 00 0A */ li r0, 0xa -/* 8061E9B0 B0 1E 05 D8 */ sth r0, 0x5d8(r30) -/* 8061E9B4 C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 8061E9B8 4B C4 8F D5 */ bl cM_rndFX__Ff -/* 8061E9BC C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 8061E9C0 EC 00 08 2A */ fadds f0, f0, f1 -/* 8061E9C4 D0 1E 05 E4 */ stfs f0, 0x5e4(r30) -/* 8061E9C8 7F C3 F3 78 */ mr r3, r30 -/* 8061E9CC 4B FF FA 45 */ bl daB_OH2_Execute__FP11b_oh2_class -lbl_8061E9D0: -/* 8061E9D0 7F A3 EB 78 */ mr r3, r29 -lbl_8061E9D4: -/* 8061E9D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8061E9D8 4B D4 38 51 */ bl _restgpr_29 -/* 8061E9DC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8061E9E0 7C 08 03 A6 */ mtlr r0 -/* 8061E9E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8061E9E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s deleted file mode 100644 index ab45e38caa..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8061E4F0: -/* 8061E4F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061E4F4 7C 08 02 A6 */ mflr r0 -/* 8061E4F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061E4FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061E500 7C 7F 1B 78 */ mr r31, r3 -/* 8061E504 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 8061E508 3C 80 80 62 */ lis r4, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E50C 38 84 EA 84 */ addi r4, r4, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E510 4B A0 EA F9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8061E514 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 8061E518 28 00 00 00 */ cmplwi r0, 0 -/* 8061E51C 41 82 00 0C */ beq lbl_8061E528 -/* 8061E520 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 8061E524 4B 9F 2D ED */ bl stopZelAnime__16mDoExt_McaMorfSOFv -lbl_8061E528: -/* 8061E528 38 60 00 01 */ li r3, 1 -/* 8061E52C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061E530 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061E534 7C 08 03 A6 */ mtlr r0 -/* 8061E538 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061E53C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s deleted file mode 100644 index 2068840466..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8061DDB0: -/* 8061DDB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061DDB4 7C 08 02 A6 */ mflr r0 -/* 8061DDB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061DDBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061DDC0 93 C1 00 08 */ stw r30, 8(r1) -/* 8061DDC4 7C 7E 1B 78 */ mr r30, r3 -/* 8061DDC8 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 8061DDCC 83 E3 00 04 */ lwz r31, 4(r3) -/* 8061DDD0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8061DDD4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8061DDD8 38 80 00 00 */ li r4, 0 -/* 8061DDDC 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8061DDE0 38 DE 01 0C */ addi r6, r30, 0x10c -/* 8061DDE4 4B B8 59 E1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8061DDE8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8061DDEC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8061DDF0 80 9F 00 04 */ lwz r4, 4(r31) -/* 8061DDF4 38 BE 01 0C */ addi r5, r30, 0x10c -/* 8061DDF8 4B B8 6F A9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8061DDFC 80 9F 00 04 */ lwz r4, 4(r31) -/* 8061DE00 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061DE04 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8061DE08 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061DE0C 4B 9E F8 CD */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8061DE10 80 9F 00 04 */ lwz r4, 4(r31) -/* 8061DE14 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061DE18 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8061DE1C 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061DE20 4B 9E F9 89 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 8061DE24 38 7E 05 B8 */ addi r3, r30, 0x5b8 -/* 8061DE28 38 80 00 00 */ li r4, 0 -/* 8061DE2C 4B 9F 09 95 */ bl entryDL__21mDoExt_invisibleModelFP4cXyz -/* 8061DE30 38 60 00 01 */ li r3, 1 -/* 8061DE34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061DE38 83 C1 00 08 */ lwz r30, 8(r1) -/* 8061DE3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061DE40 7C 08 03 A6 */ mtlr r0 -/* 8061DE44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061DE48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s deleted file mode 100644 index d4990bffbc..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8061E410: -/* 8061E410 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8061E414 7C 08 02 A6 */ mflr r0 -/* 8061E418 90 01 00 24 */ stw r0, 0x24(r1) -/* 8061E41C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8061E420 7C 7F 1B 78 */ mr r31, r3 -/* 8061E424 4B 9F 9E 85 */ bl cDmrNowMidnaTalk__Fv -/* 8061E428 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E42C 41 82 00 0C */ beq lbl_8061E438 -/* 8061E430 38 60 00 01 */ li r3, 1 -/* 8061E434 48 00 00 A0 */ b lbl_8061E4D4 -lbl_8061E438: -/* 8061E438 80 1F 05 C8 */ lwz r0, 0x5c8(r31) -/* 8061E43C 2C 00 00 00 */ cmpwi r0, 0 -/* 8061E440 40 82 00 24 */ bne lbl_8061E464 -/* 8061E444 80 1F 04 A4 */ lwz r0, 0x4a4(r31) -/* 8061E448 90 01 00 08 */ stw r0, 8(r1) -/* 8061E44C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 8061E450 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 8061E454 38 81 00 08 */ addi r4, r1, 8 -/* 8061E458 4B 9F B3 A1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8061E45C 3C 80 80 62 */ lis r4, boss@ha /* 0x8061EAE8@ha */ -/* 8061E460 90 64 EA E8 */ stw r3, boss@l(r4) /* 0x8061EAE8@l */ -lbl_8061E464: -/* 8061E464 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061E468 80 03 EA E8 */ lwz r0, boss@l(r3) /* 0x8061EAE8@l */ -/* 8061E46C 28 00 00 00 */ cmplwi r0, 0 -/* 8061E470 40 82 00 0C */ bne lbl_8061E47C -/* 8061E474 38 60 00 01 */ li r3, 1 -/* 8061E478 48 00 00 5C */ b lbl_8061E4D4 -lbl_8061E47C: -/* 8061E47C A8 7F 05 CC */ lha r3, 0x5cc(r31) -/* 8061E480 38 03 00 01 */ addi r0, r3, 1 -/* 8061E484 B0 1F 05 CC */ sth r0, 0x5cc(r31) -/* 8061E488 38 60 00 00 */ li r3, 0 -/* 8061E48C 38 00 00 04 */ li r0, 4 -/* 8061E490 7C 09 03 A6 */ mtctr r0 -lbl_8061E494: -/* 8061E494 38 A3 05 D2 */ addi r5, r3, 0x5d2 -/* 8061E498 7C 9F 2A AE */ lhax r4, r31, r5 -/* 8061E49C 2C 04 00 00 */ cmpwi r4, 0 -/* 8061E4A0 41 82 00 0C */ beq lbl_8061E4AC -/* 8061E4A4 38 04 FF FF */ addi r0, r4, -1 -/* 8061E4A8 7C 1F 2B 2E */ sthx r0, r31, r5 -lbl_8061E4AC: -/* 8061E4AC 38 63 00 02 */ addi r3, r3, 2 -/* 8061E4B0 42 00 FF E4 */ bdnz lbl_8061E494 -/* 8061E4B4 A8 7F 05 DA */ lha r3, 0x5da(r31) -/* 8061E4B8 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E4BC 41 82 00 0C */ beq lbl_8061E4C8 -/* 8061E4C0 38 03 FF FF */ addi r0, r3, -1 -/* 8061E4C4 B0 1F 05 DA */ sth r0, 0x5da(r31) -lbl_8061E4C8: -/* 8061E4C8 7F E3 FB 78 */ mr r3, r31 -/* 8061E4CC 4B FF FD 0D */ bl action__FP11b_oh2_class -/* 8061E4D0 38 60 00 01 */ li r3, 1 -lbl_8061E4D4: -/* 8061E4D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8061E4D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8061E4DC 7C 08 03 A6 */ mtlr r0 -/* 8061E4E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8061E4E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s deleted file mode 100644 index 1f83341231..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s +++ /dev/null @@ -1,223 +0,0 @@ -lbl_8061DE4C: -/* 8061DE4C 94 21 FF 30 */ stwu r1, -0xd0(r1) -/* 8061DE50 7C 08 02 A6 */ mflr r0 -/* 8061DE54 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 8061DE58 DB E1 00 C0 */ stfd f31, 0xc0(r1) -/* 8061DE5C F3 E1 00 C8 */ psq_st f31, 200(r1), 0, 0 /* qr0 */ -/* 8061DE60 DB C1 00 B0 */ stfd f30, 0xb0(r1) -/* 8061DE64 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, 0 /* qr0 */ -/* 8061DE68 DB A1 00 A0 */ stfd f29, 0xa0(r1) -/* 8061DE6C F3 A1 00 A8 */ psq_st f29, 168(r1), 0, 0 /* qr0 */ -/* 8061DE70 DB 81 00 90 */ stfd f28, 0x90(r1) -/* 8061DE74 F3 81 00 98 */ psq_st f28, 152(r1), 0, 0 /* qr0 */ -/* 8061DE78 DB 61 00 80 */ stfd f27, 0x80(r1) -/* 8061DE7C F3 61 00 88 */ psq_st f27, 136(r1), 0, 0 /* qr0 */ -/* 8061DE80 DB 41 00 70 */ stfd f26, 0x70(r1) -/* 8061DE84 F3 41 00 78 */ psq_st f26, 120(r1), 0, 0 /* qr0 */ -/* 8061DE88 DB 21 00 60 */ stfd f25, 0x60(r1) -/* 8061DE8C F3 21 00 68 */ psq_st f25, 104(r1), 0, 0 /* qr0 */ -/* 8061DE90 DB 01 00 50 */ stfd f24, 0x50(r1) -/* 8061DE94 F3 01 00 58 */ psq_st f24, 88(r1), 0, 0 /* qr0 */ -/* 8061DE98 39 61 00 50 */ addi r11, r1, 0x50 -/* 8061DE9C 4B D4 43 2D */ bl _savegpr_24 -/* 8061DEA0 7C 7C 1B 78 */ mr r28, r3 -/* 8061DEA4 3C 60 80 62 */ lis r3, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061DEA8 3B E3 EA 38 */ addi r31, r3, lit_3678@l /* 0x8061EA38@l */ -/* 8061DEAC C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 8061DEB0 D0 1C 06 60 */ stfs f0, 0x660(r28) -/* 8061DEB4 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 8061DEB8 D0 1C 06 64 */ stfs f0, 0x664(r28) -/* 8061DEBC C0 1C 04 D8 */ lfs f0, 0x4d8(r28) -/* 8061DEC0 D0 1C 06 68 */ stfs f0, 0x668(r28) -/* 8061DEC4 3B DC 06 6C */ addi r30, r28, 0x66c -/* 8061DEC8 3B BC 07 DA */ addi r29, r28, 0x7da -/* 8061DECC 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DED0 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DED4 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DED8 A8 9C 04 E6 */ lha r4, 0x4e6(r28) -/* 8061DEDC 4B 9E E5 01 */ bl mDoMtx_YrotS__FPA4_fs -/* 8061DEE0 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DEE4 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DEE8 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DEEC A8 9C 04 E4 */ lha r4, 0x4e4(r28) -/* 8061DEF0 4B 9E E4 AD */ bl mDoMtx_XrotM__FPA4_fs -/* 8061DEF4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8061DEF8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8061DEFC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8061DF00 A8 1C 05 D8 */ lha r0, 0x5d8(r28) -/* 8061DF04 2C 00 00 00 */ cmpwi r0, 0 -/* 8061DF08 41 82 00 10 */ beq lbl_8061DF18 -/* 8061DF0C C0 1F 00 08 */ lfs f0, 8(r31) -/* 8061DF10 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8061DF14 48 00 00 38 */ b lbl_8061DF4C -lbl_8061DF18: -/* 8061DF18 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061DF1C 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061DF20 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DF24 A8 03 47 52 */ lha r0, 0x4752(r3) -/* 8061DF28 2C 00 00 65 */ cmpwi r0, 0x65 -/* 8061DF2C 40 82 00 10 */ bne lbl_8061DF3C -/* 8061DF30 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8061DF34 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8061DF38 48 00 00 14 */ b lbl_8061DF4C -lbl_8061DF3C: -/* 8061DF3C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8061DF40 C0 03 5D 04 */ lfs f0, 0x5d04(r3) -/* 8061DF44 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8061DF48 D0 01 00 28 */ stfs f0, 0x28(r1) -lbl_8061DF4C: -/* 8061DF4C 38 61 00 20 */ addi r3, r1, 0x20 -/* 8061DF50 38 81 00 08 */ addi r4, r1, 8 -/* 8061DF54 4B C5 2F 99 */ bl MtxPosition__FP4cXyzP4cXyz -/* 8061DF58 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8061DF5C D0 21 00 20 */ stfs f1, 0x20(r1) -/* 8061DF60 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 8061DF64 C0 1C 05 E4 */ lfs f0, 0x5e4(r28) -/* 8061DF68 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8061DF6C C3 FF 00 00 */ lfs f31, 0(r31) -/* 8061DF70 FF C0 08 90 */ fmr f30, f1 -/* 8061DF74 C3 BF 00 14 */ lfs f29, 0x14(r31) -/* 8061DF78 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061DF7C 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061DF80 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DF84 C0 03 05 2C */ lfs f0, 0x52c(r3) -/* 8061DF88 FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 8061DF8C 40 80 00 14 */ bge lbl_8061DFA0 -/* 8061DF90 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 8061DF94 C0 03 47 A0 */ lfs f0, 0x47a0(r3) -/* 8061DF98 EF A1 00 2A */ fadds f29, f1, f0 -/* 8061DF9C C3 DF 00 18 */ lfs f30, 0x18(r31) -lbl_8061DFA0: -/* 8061DFA0 3B 40 00 01 */ li r26, 1 -/* 8061DFA4 C3 7F 00 1C */ lfs f27, 0x1c(r31) -/* 8061DFA8 C3 9F 00 04 */ lfs f28, 4(r31) -/* 8061DFAC 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DFB0 3B 63 07 68 */ addi r27, r3, calc_mtx@l /* 0x80450768@l */ -lbl_8061DFB4: -/* 8061DFB4 C0 3E 00 00 */ lfs f1, 0(r30) -/* 8061DFB8 C0 1E FF F4 */ lfs f0, -0xc(r30) -/* 8061DFBC EC 21 00 28 */ fsubs f1, f1, f0 -/* 8061DFC0 C0 01 00 08 */ lfs f0, 8(r1) -/* 8061DFC4 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8061DFC8 EF 41 00 2A */ fadds f26, f1, f0 -/* 8061DFCC C0 3E 00 04 */ lfs f1, 4(r30) -/* 8061DFD0 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8061DFD4 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8061DFD8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061DFDC EC 3E 00 2A */ fadds f1, f30, f0 -/* 8061DFE0 FC 01 E8 40 */ fcmpo cr0, f1, f29 -/* 8061DFE4 40 80 00 08 */ bge lbl_8061DFEC -/* 8061DFE8 FC 20 E8 90 */ fmr f1, f29 -lbl_8061DFEC: -/* 8061DFEC C0 1E FF F8 */ lfs f0, -8(r30) -/* 8061DFF0 EF 21 00 28 */ fsubs f25, f1, f0 -/* 8061DFF4 C0 3E 00 08 */ lfs f1, 8(r30) -/* 8061DFF8 C0 1E FF FC */ lfs f0, -4(r30) -/* 8061DFFC EC 21 00 28 */ fsubs f1, f1, f0 -/* 8061E000 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8061E004 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8061E008 EF 01 00 2A */ fadds f24, f1, f0 -/* 8061E00C EF FF 06 F2 */ fmuls f31, f31, f27 -/* 8061E010 FC 20 D0 90 */ fmr f1, f26 -/* 8061E014 FC 40 C0 90 */ fmr f2, f24 -/* 8061E018 4B C4 96 5D */ bl cM_atan2s__Fff -/* 8061E01C 7C 78 07 34 */ extsh r24, r3 -/* 8061E020 EC 3A 06 B2 */ fmuls f1, f26, f26 -/* 8061E024 EC 18 06 32 */ fmuls f0, f24, f24 -/* 8061E028 EC 41 00 2A */ fadds f2, f1, f0 -/* 8061E02C FC 02 E0 40 */ fcmpo cr0, f2, f28 -/* 8061E030 40 81 00 0C */ ble lbl_8061E03C -/* 8061E034 FC 00 10 34 */ frsqrte f0, f2 -/* 8061E038 EC 40 00 B2 */ fmuls f2, f0, f2 -lbl_8061E03C: -/* 8061E03C FC 20 C8 90 */ fmr f1, f25 -/* 8061E040 4B C4 96 35 */ bl cM_atan2s__Fff -/* 8061E044 7C 03 00 D0 */ neg r0, r3 -/* 8061E048 7C 19 07 34 */ extsh r25, r0 -/* 8061E04C 80 7B 00 00 */ lwz r3, 0(r27) -/* 8061E050 7F 04 C3 78 */ mr r4, r24 -/* 8061E054 4B 9E E3 89 */ bl mDoMtx_YrotS__FPA4_fs -/* 8061E058 80 7B 00 00 */ lwz r3, 0(r27) -/* 8061E05C 7F 24 CB 78 */ mr r4, r25 -/* 8061E060 4B 9E E3 3D */ bl mDoMtx_XrotM__FPA4_fs -/* 8061E064 38 61 00 20 */ addi r3, r1, 0x20 -/* 8061E068 38 81 00 14 */ addi r4, r1, 0x14 -/* 8061E06C 4B C5 2E 81 */ bl MtxPosition__FP4cXyzP4cXyz -/* 8061E070 C0 3E FF F4 */ lfs f1, -0xc(r30) -/* 8061E074 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8061E078 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061E07C D0 1E 00 00 */ stfs f0, 0(r30) -/* 8061E080 C0 3E FF F8 */ lfs f1, -8(r30) -/* 8061E084 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 8061E088 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061E08C D0 1E 00 04 */ stfs f0, 4(r30) -/* 8061E090 C0 3E FF FC */ lfs f1, -4(r30) -/* 8061E094 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 8061E098 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061E09C D0 1E 00 08 */ stfs f0, 8(r30) -/* 8061E0A0 B3 3D FF FA */ sth r25, -6(r29) -/* 8061E0A4 B3 1D FF FC */ sth r24, -4(r29) -/* 8061E0A8 3B 5A 00 01 */ addi r26, r26, 1 -/* 8061E0AC 2C 1A 00 1F */ cmpwi r26, 0x1f -/* 8061E0B0 3B DE 00 0C */ addi r30, r30, 0xc -/* 8061E0B4 3B BD 00 06 */ addi r29, r29, 6 -/* 8061E0B8 41 80 FE FC */ blt lbl_8061DFB4 -/* 8061E0BC C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 8061E0C0 D0 1C 05 E0 */ stfs f0, 0x5e0(r28) -/* 8061E0C4 A8 7C 05 DC */ lha r3, 0x5dc(r28) -/* 8061E0C8 38 03 07 D0 */ addi r0, r3, 0x7d0 -/* 8061E0CC B0 1C 05 DC */ sth r0, 0x5dc(r28) -/* 8061E0D0 38 C0 00 00 */ li r6, 0 -/* 8061E0D4 38 60 00 00 */ li r3, 0 -/* 8061E0D8 3C 80 80 62 */ lis r4, boss@ha /* 0x8061EAE8@ha */ -/* 8061E0DC 38 A4 EA E8 */ addi r5, r4, boss@l /* 0x8061EAE8@l */ -/* 8061E0E0 C0 5F 00 00 */ lfs f2, 0(r31) -/* 8061E0E4 38 00 00 1E */ li r0, 0x1e -/* 8061E0E8 7C 09 03 A6 */ mtctr r0 -lbl_8061E0EC: -/* 8061E0EC 80 85 00 00 */ lwz r4, 0(r5) -/* 8061E0F0 C0 04 05 2C */ lfs f0, 0x52c(r4) -/* 8061E0F4 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 8061E0F8 40 81 00 38 */ ble lbl_8061E130 -/* 8061E0FC A8 1C 05 DC */ lha r0, 0x5dc(r28) -/* 8061E100 7C 00 32 14 */ add r0, r0, r6 -/* 8061E104 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8061E108 3C 80 80 44 */ lis r4, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8061E10C 38 84 9A 20 */ addi r4, r4, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8061E110 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8061E114 C0 7C 05 E0 */ lfs f3, 0x5e0(r28) -/* 8061E118 EC 22 18 2A */ fadds f1, f2, f3 -/* 8061E11C EC 03 00 32 */ fmuls f0, f3, f0 -/* 8061E120 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061E124 38 03 05 E8 */ addi r0, r3, 0x5e8 -/* 8061E128 7C 1C 05 2E */ stfsx f0, r28, r0 -/* 8061E12C 48 00 00 0C */ b lbl_8061E138 -lbl_8061E130: -/* 8061E130 38 03 05 E8 */ addi r0, r3, 0x5e8 -/* 8061E134 7C 5C 05 2E */ stfsx f2, r28, r0 -lbl_8061E138: -/* 8061E138 38 63 00 04 */ addi r3, r3, 4 -/* 8061E13C 38 C6 D8 F0 */ addi r6, r6, -10000 -/* 8061E140 42 00 FF AC */ bdnz lbl_8061E0EC -/* 8061E144 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 /* qr0 */ -/* 8061E148 CB E1 00 C0 */ lfd f31, 0xc0(r1) -/* 8061E14C E3 C1 00 B8 */ psq_l f30, 184(r1), 0, 0 /* qr0 */ -/* 8061E150 CB C1 00 B0 */ lfd f30, 0xb0(r1) -/* 8061E154 E3 A1 00 A8 */ psq_l f29, 168(r1), 0, 0 /* qr0 */ -/* 8061E158 CB A1 00 A0 */ lfd f29, 0xa0(r1) -/* 8061E15C E3 81 00 98 */ psq_l f28, 152(r1), 0, 0 /* qr0 */ -/* 8061E160 CB 81 00 90 */ lfd f28, 0x90(r1) -/* 8061E164 E3 61 00 88 */ psq_l f27, 136(r1), 0, 0 /* qr0 */ -/* 8061E168 CB 61 00 80 */ lfd f27, 0x80(r1) -/* 8061E16C E3 41 00 78 */ psq_l f26, 120(r1), 0, 0 /* qr0 */ -/* 8061E170 CB 41 00 70 */ lfd f26, 0x70(r1) -/* 8061E174 E3 21 00 68 */ psq_l f25, 104(r1), 0, 0 /* qr0 */ -/* 8061E178 CB 21 00 60 */ lfd f25, 0x60(r1) -/* 8061E17C E3 01 00 58 */ psq_l f24, 88(r1), 0, 0 /* qr0 */ -/* 8061E180 CB 01 00 50 */ lfd f24, 0x50(r1) -/* 8061E184 39 61 00 50 */ addi r11, r1, 0x50 -/* 8061E188 4B D4 40 8D */ bl _restgpr_24 -/* 8061E18C 80 01 00 D4 */ lwz r0, 0xd4(r1) -/* 8061E190 7C 08 03 A6 */ mtlr r0 -/* 8061E194 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8061E198 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s deleted file mode 100644 index 8193816ddf..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_8061DCB8: -/* 8061DCB8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8061DCBC 7C 08 02 A6 */ mflr r0 -/* 8061DCC0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8061DCC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8061DCC8 4B D4 45 11 */ bl _savegpr_28 -/* 8061DCCC 2C 04 00 00 */ cmpwi r4, 0 -/* 8061DCD0 40 82 00 C4 */ bne lbl_8061DD94 -/* 8061DCD4 A3 E3 00 14 */ lhz r31, 0x14(r3) -/* 8061DCD8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8061DCDC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8061DCE0 83 C3 00 38 */ lwz r30, 0x38(r3) -/* 8061DCE4 83 9E 00 14 */ lwz r28, 0x14(r30) -/* 8061DCE8 28 1C 00 00 */ cmplwi r28, 0 -/* 8061DCEC 41 82 00 A8 */ beq lbl_8061DD94 -/* 8061DCF0 1C 1F 00 0C */ mulli r0, r31, 0xc -/* 8061DCF4 7C 7C 02 14 */ add r3, r28, r0 -/* 8061DCF8 C0 23 06 60 */ lfs f1, 0x660(r3) -/* 8061DCFC C0 43 06 64 */ lfs f2, 0x664(r3) -/* 8061DD00 C0 63 06 68 */ lfs f3, 0x668(r3) -/* 8061DD04 38 60 00 00 */ li r3, 0 -/* 8061DD08 4B C5 31 55 */ bl MtxTrans__FfffUc -/* 8061DD0C 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DD10 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DD14 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DD18 1F BF 00 06 */ mulli r29, r31, 6 -/* 8061DD1C 7C 9C EA 14 */ add r4, r28, r29 -/* 8061DD20 A8 84 07 D6 */ lha r4, 0x7d6(r4) -/* 8061DD24 4B 9E E7 11 */ bl mDoMtx_YrotM__FPA4_fs -/* 8061DD28 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DD2C 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DD30 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DD34 7C 9C EA 14 */ add r4, r28, r29 -/* 8061DD38 A8 84 07 D4 */ lha r4, 0x7d4(r4) -/* 8061DD3C 4B 9E E6 61 */ bl mDoMtx_XrotM__FPA4_fs -/* 8061DD40 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DD44 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DD48 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DD4C 38 80 C0 00 */ li r4, -16384 -/* 8061DD50 4B 9E E6 E5 */ bl mDoMtx_YrotM__FPA4_fs -/* 8061DD54 57 E0 10 3A */ slwi r0, r31, 2 -/* 8061DD58 7C 7C 02 14 */ add r3, r28, r0 -/* 8061DD5C C0 43 05 E8 */ lfs f2, 0x5e8(r3) -/* 8061DD60 3C 60 80 62 */ lis r3, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061DD64 C0 23 EA 38 */ lfs f1, lit_3678@l(r3) /* 0x8061EA38@l */ -/* 8061DD68 FC 60 10 90 */ fmr f3, f2 -/* 8061DD6C 38 60 00 01 */ li r3, 1 -/* 8061DD70 4B C5 31 35 */ bl MtxScale__FfffUc -/* 8061DD74 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DD78 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DD7C 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DD80 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 8061DD84 80 84 00 0C */ lwz r4, 0xc(r4) -/* 8061DD88 1C 1F 00 30 */ mulli r0, r31, 0x30 -/* 8061DD8C 7C 84 02 14 */ add r4, r4, r0 -/* 8061DD90 4B D2 87 21 */ bl PSMTXCopy -lbl_8061DD94: -/* 8061DD94 38 60 00 01 */ li r3, 1 -/* 8061DD98 39 61 00 20 */ addi r11, r1, 0x20 -/* 8061DD9C 4B D4 44 89 */ bl _restgpr_28 -/* 8061DDA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8061DDA4 7C 08 03 A6 */ mtlr r0 -/* 8061DDA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8061DDAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index a9c44b7c12..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,198 +0,0 @@ -lbl_8061E540: -/* 8061E540 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8061E544 7C 08 02 A6 */ mflr r0 -/* 8061E548 90 01 00 34 */ stw r0, 0x34(r1) -/* 8061E54C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8061E550 4B D4 3C 89 */ bl _savegpr_28 -/* 8061E554 7C 7E 1B 78 */ mr r30, r3 -/* 8061E558 3C 60 80 62 */ lis r3, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061E55C 3B E3 EA 38 */ addi r31, r3, lit_3678@l /* 0x8061EA38@l */ -/* 8061E560 38 60 00 58 */ li r3, 0x58 -/* 8061E564 4B CB 06 E9 */ bl __nw__FUl -/* 8061E568 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8061E56C 41 82 00 70 */ beq lbl_8061E5DC -/* 8061E570 3C 60 80 62 */ lis r3, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E574 38 63 EA 84 */ addi r3, r3, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E578 38 80 00 29 */ li r4, 0x29 -/* 8061E57C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8061E580 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8061E584 3C A5 00 02 */ addis r5, r5, 2 -/* 8061E588 38 C0 00 80 */ li r6, 0x80 -/* 8061E58C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8061E590 4B A1 DD 5D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8061E594 7C 64 1B 78 */ mr r4, r3 -/* 8061E598 38 1E 08 98 */ addi r0, r30, 0x898 -/* 8061E59C 90 01 00 08 */ stw r0, 8(r1) -/* 8061E5A0 38 00 00 00 */ li r0, 0 -/* 8061E5A4 90 01 00 0C */ stw r0, 0xc(r1) -/* 8061E5A8 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000284@ha */ -/* 8061E5AC 38 03 02 84 */ addi r0, r3, 0x0284 /* 0x11000284@l */ -/* 8061E5B0 90 01 00 10 */ stw r0, 0x10(r1) -/* 8061E5B4 7F A3 EB 78 */ mr r3, r29 -/* 8061E5B8 38 A0 00 00 */ li r5, 0 -/* 8061E5BC 38 C0 00 00 */ li r6, 0 -/* 8061E5C0 38 E0 00 00 */ li r7, 0 -/* 8061E5C4 39 00 00 02 */ li r8, 2 -/* 8061E5C8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8061E5CC 39 20 00 00 */ li r9, 0 -/* 8061E5D0 39 40 FF FF */ li r10, -1 -/* 8061E5D4 4B 9F 21 FD */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl -/* 8061E5D8 7C 7D 1B 78 */ mr r29, r3 -lbl_8061E5DC: -/* 8061E5DC 93 BE 05 B4 */ stw r29, 0x5b4(r30) -/* 8061E5E0 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E5E4 28 03 00 00 */ cmplwi r3, 0 -/* 8061E5E8 41 82 00 10 */ beq lbl_8061E5F8 -/* 8061E5EC 80 83 00 04 */ lwz r4, 4(r3) -/* 8061E5F0 28 04 00 00 */ cmplwi r4, 0 -/* 8061E5F4 40 82 00 0C */ bne lbl_8061E600 -lbl_8061E5F8: -/* 8061E5F8 38 60 00 00 */ li r3, 0 -/* 8061E5FC 48 00 02 0C */ b lbl_8061E808 -lbl_8061E600: -/* 8061E600 38 7E 05 B8 */ addi r3, r30, 0x5b8 -/* 8061E604 38 A0 00 01 */ li r5, 1 -/* 8061E608 4B 9E FF 35 */ bl create__21mDoExt_invisibleModelFP8J3DModelUc -/* 8061E60C 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E610 40 82 00 0C */ bne lbl_8061E61C -/* 8061E614 38 60 00 00 */ li r3, 0 -/* 8061E618 48 00 01 F0 */ b lbl_8061E808 -lbl_8061E61C: -/* 8061E61C 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E620 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E624 93 C3 00 14 */ stw r30, 0x14(r3) -/* 8061E628 38 C0 00 00 */ li r6, 0 -/* 8061E62C 3C 60 80 62 */ lis r3, nodeCallBack__FP8J3DJointi@ha /* 0x8061DCB8@ha */ -/* 8061E630 38 83 DC B8 */ addi r4, r3, nodeCallBack__FP8J3DJointi@l /* 0x8061DCB8@l */ -/* 8061E634 48 00 00 1C */ b lbl_8061E650 -lbl_8061E638: -/* 8061E638 80 65 00 04 */ lwz r3, 4(r5) -/* 8061E63C 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8061E640 54 C0 13 BA */ rlwinm r0, r6, 2, 0xe, 0x1d -/* 8061E644 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8061E648 90 83 00 04 */ stw r4, 4(r3) -/* 8061E64C 38 C6 00 01 */ addi r6, r6, 1 -lbl_8061E650: -/* 8061E650 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E654 80 A3 00 04 */ lwz r5, 4(r3) -/* 8061E658 80 65 00 04 */ lwz r3, 4(r5) -/* 8061E65C A0 63 00 2C */ lhz r3, 0x2c(r3) -/* 8061E660 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 8061E664 7C 00 18 40 */ cmplw r0, r3 -/* 8061E668 41 80 FF D0 */ blt lbl_8061E638 -/* 8061E66C 38 60 00 18 */ li r3, 0x18 -/* 8061E670 4B CB 05 DD */ bl __nw__FUl -/* 8061E674 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8061E678 41 82 00 20 */ beq lbl_8061E698 -/* 8061E67C 3C 80 80 62 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8061EADC@ha */ -/* 8061E680 38 04 EA DC */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8061EADC@l */ -/* 8061E684 90 1D 00 00 */ stw r0, 0(r29) -/* 8061E688 38 80 00 00 */ li r4, 0 -/* 8061E68C 4B D0 9D 71 */ bl init__12J3DFrameCtrlFs -/* 8061E690 38 00 00 00 */ li r0, 0 -/* 8061E694 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_8061E698: -/* 8061E698 93 BE 05 C0 */ stw r29, 0x5c0(r30) -/* 8061E69C 80 1E 05 C0 */ lwz r0, 0x5c0(r30) -/* 8061E6A0 28 00 00 00 */ cmplwi r0, 0 -/* 8061E6A4 40 82 00 0C */ bne lbl_8061E6B0 -/* 8061E6A8 38 60 00 00 */ li r3, 0 -/* 8061E6AC 48 00 01 5C */ b lbl_8061E808 -lbl_8061E6B0: -/* 8061E6B0 3C 60 80 62 */ lis r3, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E6B4 38 63 EA 84 */ addi r3, r3, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E6B8 38 80 00 36 */ li r4, 0x36 -/* 8061E6BC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8061E6C0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8061E6C4 3F 85 00 02 */ addis r28, r5, 2 -/* 8061E6C8 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 8061E6CC 7F 85 E3 78 */ mr r5, r28 -/* 8061E6D0 38 C0 00 80 */ li r6, 0x80 -/* 8061E6D4 4B A1 DC 19 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8061E6D8 7C 65 1B 78 */ mr r5, r3 -/* 8061E6DC 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E6E0 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E6E4 80 83 00 04 */ lwz r4, 4(r3) -/* 8061E6E8 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E6EC 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061E6F0 38 C0 00 01 */ li r6, 1 -/* 8061E6F4 38 E0 00 02 */ li r7, 2 -/* 8061E6F8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8061E6FC 39 00 00 00 */ li r8, 0 -/* 8061E700 39 20 FF FF */ li r9, -1 -/* 8061E704 4B 9E EF 39 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 8061E708 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E70C 40 82 00 0C */ bne lbl_8061E718 -/* 8061E710 38 60 00 00 */ li r3, 0 -/* 8061E714 48 00 00 F4 */ b lbl_8061E808 -lbl_8061E718: -/* 8061E718 C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 8061E71C 4B C4 92 39 */ bl cM_rndF__Ff -/* 8061E720 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E724 D0 23 00 10 */ stfs f1, 0x10(r3) -/* 8061E728 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 8061E72C 4B C4 92 61 */ bl cM_rndFX__Ff -/* 8061E730 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8061E734 EC 00 08 2A */ fadds f0, f0, f1 -/* 8061E738 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E73C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8061E740 38 60 00 18 */ li r3, 0x18 -/* 8061E744 4B CB 05 09 */ bl __nw__FUl -/* 8061E748 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8061E74C 41 82 00 20 */ beq lbl_8061E76C -/* 8061E750 3C 80 80 62 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8061EADC@ha */ -/* 8061E754 38 04 EA DC */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8061EADC@l */ -/* 8061E758 90 1D 00 00 */ stw r0, 0(r29) -/* 8061E75C 38 80 00 00 */ li r4, 0 -/* 8061E760 4B D0 9C 9D */ bl init__12J3DFrameCtrlFs -/* 8061E764 38 00 00 00 */ li r0, 0 -/* 8061E768 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_8061E76C: -/* 8061E76C 93 BE 05 C4 */ stw r29, 0x5c4(r30) -/* 8061E770 80 1E 05 C4 */ lwz r0, 0x5c4(r30) -/* 8061E774 28 00 00 00 */ cmplwi r0, 0 -/* 8061E778 40 82 00 0C */ bne lbl_8061E784 -/* 8061E77C 38 60 00 00 */ li r3, 0 -/* 8061E780 48 00 00 88 */ b lbl_8061E808 -lbl_8061E784: -/* 8061E784 3C 60 80 62 */ lis r3, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E788 38 63 EA 84 */ addi r3, r3, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E78C 38 80 00 2F */ li r4, 0x2f -/* 8061E790 7F 85 E3 78 */ mr r5, r28 -/* 8061E794 38 C0 00 80 */ li r6, 0x80 -/* 8061E798 4B A1 DB 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8061E79C 7C 65 1B 78 */ mr r5, r3 -/* 8061E7A0 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E7A4 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E7A8 80 83 00 04 */ lwz r4, 4(r3) -/* 8061E7AC 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E7B0 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061E7B4 38 C0 00 01 */ li r6, 1 -/* 8061E7B8 38 E0 00 02 */ li r7, 2 -/* 8061E7BC C0 3F 00 00 */ lfs f1, 0(r31) -/* 8061E7C0 39 00 00 00 */ li r8, 0 -/* 8061E7C4 39 20 FF FF */ li r9, -1 -/* 8061E7C8 4B 9E EF 45 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 8061E7CC 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E7D0 40 82 00 0C */ bne lbl_8061E7DC -/* 8061E7D4 38 60 00 00 */ li r3, 0 -/* 8061E7D8 48 00 00 30 */ b lbl_8061E808 -lbl_8061E7DC: -/* 8061E7DC C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 8061E7E0 4B C4 91 75 */ bl cM_rndF__Ff -/* 8061E7E4 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E7E8 D0 23 00 10 */ stfs f1, 0x10(r3) -/* 8061E7EC C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 8061E7F0 4B C4 91 9D */ bl cM_rndFX__Ff -/* 8061E7F4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8061E7F8 EC 00 08 2A */ fadds f0, f0, f1 -/* 8061E7FC 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E800 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8061E804 38 60 00 01 */ li r3, 1 -lbl_8061E808: -/* 8061E808 39 61 00 30 */ addi r11, r1, 0x30 -/* 8061E80C 4B D4 3A 19 */ bl _restgpr_28 -/* 8061E810 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8061E814 7C 08 03 A6 */ mtlr r0 -/* 8061E818 38 21 00 30 */ addi r1, r1, 0x30 -/* 8061E81C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/uki_catch__FP13dmg_rod_class.s b/asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/uki_catch__FP13dmg_rod_class.s index 3f3ef17280..aa5528f62a 100644 --- a/asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/uki_catch__FP13dmg_rod_class.s +++ b/asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/uki_catch__FP13dmg_rod_class.s @@ -253,8 +253,8 @@ lbl_804B4530: /* 804B4548 88 1F 0C 3D */ lbz r0, 0xc3d(r31) /* 804B454C 28 00 00 01 */ cmplwi r0, 1 /* 804B4550 40 82 00 6C */ bne lbl_804B45BC -/* 804B4554 3C 60 80 45 */ lis r3, struct_80450C9C+0x2@ha /* 0x80450C9E@ha */ -/* 804B4558 88 03 0C 9E */ lbz r0, struct_80450C9C+0x2@l(r3) /* 0x80450C9E@l */ +/* 804B4554 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x2@ha /* 0x80450C9E@ha */ +/* 804B4558 88 03 0C 9E */ lbz r0, cDmr_SkipInfo+0x2@l(r3) /* 0x80450C9E@l */ /* 804B455C 28 00 00 00 */ cmplwi r0, 0 /* 804B4560 41 82 00 20 */ beq lbl_804B4580 /* 804B4564 38 7C 14 74 */ addi r3, r28, 0x1474 @@ -272,8 +272,8 @@ lbl_804B4580: /* 804B4590 38 E0 00 00 */ li r7, 0 /* 804B4594 4B D9 59 FD */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 804B4598 38 00 00 01 */ li r0, 1 -/* 804B459C 3C 60 80 45 */ lis r3, struct_80450C9C+0x2@ha /* 0x80450C9E@ha */ -/* 804B45A0 98 03 0C 9E */ stb r0, struct_80450C9C+0x2@l(r3) /* 0x80450C9E@l */ +/* 804B459C 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x2@ha /* 0x80450C9E@ha */ +/* 804B45A0 98 03 0C 9E */ stb r0, cDmr_SkipInfo+0x2@l(r3) /* 0x80450C9E@l */ lbl_804B45A4: /* 804B45A4 80 7D 00 40 */ lwz r3, 0x40(r29) /* 804B45A8 28 03 00 00 */ cmplwi r3, 0 diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s deleted file mode 100644 index 420f07183a..0000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80485D78: -/* 80485D78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485D7C 7C 08 02 A6 */ mflr r0 -/* 80485D80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485D84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80485D88 7C 7F 1B 78 */ mr r31, r3 -/* 80485D8C 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80485D90 3C 80 80 48 */ lis r4, l_specName@ha /* 0x80485F00@ha */ -/* 80485D94 38 84 5F 00 */ addi r4, r4, l_specName@l /* 0x80485F00@l */ -/* 80485D98 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80485D9C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80485DA0 3C A5 00 02 */ addis r5, r5, 2 -/* 80485DA4 38 C0 00 80 */ li r6, 0x80 -/* 80485DA8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80485DAC 4B BB 65 D1 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80485DB0 A0 03 00 00 */ lhz r0, 0(r3) -/* 80485DB4 54 00 08 3C */ slwi r0, r0, 1 -/* 80485DB8 3C 60 80 48 */ lis r3, l_bg_profName@ha /* 0x80485F10@ha */ -/* 80485DBC 38 63 5F 10 */ addi r3, r3, l_bg_profName@l /* 0x80485F10@l */ -/* 80485DC0 7C 63 02 AE */ lhax r3, r3, r0 -/* 80485DC4 80 9F 00 B0 */ lwz r4, 0xb0(r31) -/* 80485DC8 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80485DCC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80485DD0 7C 06 07 74 */ extsb r6, r0 -/* 80485DD4 38 FF 04 DC */ addi r7, r31, 0x4dc -/* 80485DD8 39 1F 04 EC */ addi r8, r31, 0x4ec -/* 80485DDC 39 20 FF FF */ li r9, -1 -/* 80485DE0 4B B9 3F B9 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc -/* 80485DE4 38 60 00 01 */ li r3, 1 -/* 80485DE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80485DEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485DF0 7C 08 03 A6 */ mtlr r0 -/* 80485DF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485DF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s deleted file mode 100644 index 296b3714d9..0000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80485E88: -/* 80485E88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485E8C 7C 08 02 A6 */ mflr r0 -/* 80485E90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485E94 7C 64 1B 78 */ mr r4, r3 -/* 80485E98 38 64 05 68 */ addi r3, r4, 0x568 -/* 80485E9C 38 84 05 70 */ addi r4, r4, 0x570 -/* 80485EA0 4B BA 71 69 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80485EA4 38 60 00 01 */ li r3, 1 -/* 80485EA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485EAC 7C 08 03 A6 */ mtlr r0 -/* 80485EB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485EB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s deleted file mode 100644 index 02c002daad..0000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80485DFC: -/* 80485DFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485E00 7C 08 02 A6 */ mflr r0 -/* 80485E04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485E08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80485E0C 7C 7F 1B 78 */ mr r31, r3 -/* 80485E10 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80485E14 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80485E18 40 82 00 1C */ bne lbl_80485E34 -/* 80485E1C 28 1F 00 00 */ cmplwi r31, 0 -/* 80485E20 41 82 00 08 */ beq lbl_80485E28 -/* 80485E24 4B B9 2D 41 */ bl __ct__10fopAc_ac_cFv -lbl_80485E28: -/* 80485E28 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80485E2C 60 00 00 08 */ ori r0, r0, 8 -/* 80485E30 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80485E34: -/* 80485E34 7F E3 FB 78 */ mr r3, r31 -/* 80485E38 4B BA BA 39 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 80485E3C 7C 65 1B 78 */ mr r5, r3 -/* 80485E40 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80485E44 3C 80 80 48 */ lis r4, d_a_set_bgobj__stringBase0@ha /* 0x80485F0C@ha */ -/* 80485E48 38 84 5F 0C */ addi r4, r4, d_a_set_bgobj__stringBase0@l /* 0x80485F0C@l */ -/* 80485E4C 4C C6 31 82 */ crclr 6 -/* 80485E50 4B EE 06 8D */ bl sprintf -/* 80485E54 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80485E58 38 9F 05 70 */ addi r4, r31, 0x570 -/* 80485E5C 4B BA 70 61 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80485E60 2C 03 00 04 */ cmpwi r3, 4 -/* 80485E64 40 82 00 10 */ bne lbl_80485E74 -/* 80485E68 7F E3 FB 78 */ mr r3, r31 -/* 80485E6C 4B FF FF 0D */ bl CreateInit__12daSetBgObj_cFv -/* 80485E70 38 60 00 05 */ li r3, 5 -lbl_80485E74: -/* 80485E74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80485E78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485E7C 7C 08 03 A6 */ mtlr r0 -/* 80485E80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485E84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s deleted file mode 100644 index cb1ffef212..0000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80485ED8: -/* 80485ED8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485EDC 7C 08 02 A6 */ mflr r0 -/* 80485EE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485EE4 4B FF FF 19 */ bl create__12daSetBgObj_cFv -/* 80485EE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485EEC 7C 08 03 A6 */ mtlr r0 -/* 80485EF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485EF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s deleted file mode 100644 index 24c75c2f33..0000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80485EB8: -/* 80485EB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485EBC 7C 08 02 A6 */ mflr r0 -/* 80485EC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485EC4 4B FF FF C5 */ bl Delete__12daSetBgObj_cFv -/* 80485EC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485ECC 7C 08 03 A6 */ mtlr r0 -/* 80485ED0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485ED4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/daNpc_Henna_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/daNpc_Henna_Create__FP10fopAc_ac_c.s index 41145f2526..5a35b39990 100644 --- a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/daNpc_Henna_Create__FP10fopAc_ac_c.s +++ b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/daNpc_Henna_Create__FP10fopAc_ac_c.s @@ -105,8 +105,8 @@ lbl_80549800: /* 805498B0 88 1E 04 E3 */ lbz r0, 0x4e3(r30) /* 805498B4 98 1E 04 CF */ stb r0, 0x4cf(r30) /* 805498B8 3B 40 60 00 */ li r26, 0x6000 -/* 805498BC 3C 60 80 45 */ lis r3, struct_80450C9C+0x0@ha /* 0x80450C9C@ha */ -/* 805498C0 88 03 0C 9C */ lbz r0, struct_80450C9C+0x0@l(r3) /* 0x80450C9C@l */ +/* 805498BC 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x0@ha /* 0x80450C9C@ha */ +/* 805498C0 88 03 0C 9C */ lbz r0, cDmr_SkipInfo+0x0@l(r3) /* 0x80450C9C@l */ /* 805498C4 28 00 00 00 */ cmplwi r0, 0 /* 805498C8 41 82 00 24 */ beq lbl_805498EC /* 805498CC 7F C3 F3 78 */ mr r3, r30 @@ -431,8 +431,8 @@ lbl_80549D8C: /* 80549D94 88 9C 12 FE */ lbz r4, 0x12fe(r28) /* 80549D98 28 04 00 04 */ cmplwi r4, 4 /* 80549D9C 41 82 00 20 */ beq lbl_80549DBC -/* 80549DA0 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80549DA4 8C 03 0C 9F */ lbzu r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80549DA0 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80549DA4 8C 03 0C 9F */ lbzu r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ /* 80549DA8 28 00 00 06 */ cmplwi r0, 6 /* 80549DAC 40 82 00 10 */ bne lbl_80549DBC /* 80549DB0 38 00 00 00 */ li r0, 0 @@ -441,19 +441,19 @@ lbl_80549D8C: lbl_80549DBC: /* 80549DBC 28 04 00 04 */ cmplwi r4, 4 /* 80549DC0 40 82 00 28 */ bne lbl_80549DE8 -/* 80549DC4 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80549DC8 88 03 0C 9F */ lbz r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80549DC4 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80549DC8 88 03 0C 9F */ lbz r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ /* 80549DCC 28 00 00 02 */ cmplwi r0, 2 /* 80549DD0 41 82 00 0C */ beq lbl_80549DDC /* 80549DD4 28 00 00 03 */ cmplwi r0, 3 /* 80549DD8 40 82 00 10 */ bne lbl_80549DE8 lbl_80549DDC: /* 80549DDC 38 00 00 00 */ li r0, 0 -/* 80549DE0 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80549DE4 98 03 0C 9F */ stb r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80549DE0 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80549DE4 98 03 0C 9F */ stb r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ lbl_80549DE8: -/* 80549DE8 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80549DEC 88 03 0C 9F */ lbz r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80549DE8 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80549DEC 88 03 0C 9F */ lbz r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ /* 80549DF0 98 1C 12 CC */ stb r0, 0x12cc(r28) /* 80549DF4 38 00 00 01 */ li r0, 1 /* 80549DF8 98 1F 02 81 */ stb r0, 0x281(r31) diff --git a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/demo_camera_shop__FP15npc_henna_class.s b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/demo_camera_shop__FP15npc_henna_class.s index 1a95d3155a..476a53bff1 100644 --- a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/demo_camera_shop__FP15npc_henna_class.s +++ b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/demo_camera_shop__FP15npc_henna_class.s @@ -653,8 +653,8 @@ lbl_80545F64: /* 80545FC0 38 E0 FF FF */ li r7, -1 /* 80545FC4 4B AE 11 AD */ bl dStage_changeScene__FifUlScsi /* 80545FC8 38 00 00 01 */ li r0, 1 -/* 80545FCC 3C 60 80 45 */ lis r3, struct_80450C9C+0x0@ha /* 0x80450C9C@ha */ -/* 80545FD0 98 03 0C 9C */ stb r0, struct_80450C9C+0x0@l(r3) /* 0x80450C9C@l */ +/* 80545FCC 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x0@ha /* 0x80450C9C@ha */ +/* 80545FD0 98 03 0C 9C */ stb r0, cDmr_SkipInfo+0x0@l(r3) /* 0x80450C9C@l */ /* 80545FD4 38 00 00 00 */ li r0, 0 /* 80545FD8 3C 60 80 45 */ lis r3, struct_80450C98+0x2@ha /* 0x80450C9A@ha */ /* 80545FDC 98 03 0C 9A */ stb r0, struct_80450C98+0x2@l(r3) /* 0x80450C9A@l */ @@ -1377,8 +1377,8 @@ lbl_80546A34: /* 80546A40 38 C0 00 00 */ li r6, 0 /* 80546A44 38 E0 00 00 */ li r7, 0 /* 80546A48 4B D0 35 49 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80546A4C 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80546A50 8C 03 0C 9D */ lbzu r0, struct_80450C9C+0x1@l(r3) /* 0x80450C9D@l */ +/* 80546A4C 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80546A50 8C 03 0C 9D */ lbzu r0, cDmr_SkipInfo+0x1@l(r3) /* 0x80450C9D@l */ /* 80546A54 60 00 00 80 */ ori r0, r0, 0x80 /* 80546A58 98 03 00 00 */ stb r0, 0(r3) /* 80546A5C 48 00 02 6C */ b lbl_80546CC8 diff --git a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/env_control__FP15npc_henna_class.s b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/env_control__FP15npc_henna_class.s index c09b253530..91753ce5a1 100644 --- a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/env_control__FP15npc_henna_class.s +++ b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/env_control__FP15npc_henna_class.s @@ -103,8 +103,8 @@ lbl_805487F0: /* 80548800 4B D1 F1 55 */ bl cM_rndF__Ff /* 80548804 FC 01 F8 40 */ fcmpo cr0, f1, f31 /* 80548808 40 80 00 90 */ bge lbl_80548898 -/* 8054880C 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80548810 38 63 0C 9F */ addi r3, r3, struct_80450C9C+0x3@l /* 0x80450C9F@l */ +/* 8054880C 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80548810 38 63 0C 9F */ addi r3, r3, cDmr_SkipInfo+0x3@l /* 0x80450C9F@l */ /* 80548814 88 63 00 00 */ lbz r3, 0(r3) /* 80548818 28 03 00 00 */ cmplwi r3, 0 /* 8054881C 40 82 00 10 */ bne lbl_8054882C @@ -142,8 +142,8 @@ lbl_80548884: /* 80548888 98 1F 12 CC */ stb r0, 0x12cc(r31) lbl_8054888C: /* 8054888C 88 1F 12 CC */ lbz r0, 0x12cc(r31) -/* 80548890 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80548894 98 03 0C 9F */ stb r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80548890 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80548894 98 03 0C 9F */ stb r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ lbl_80548898: /* 80548898 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ /* 8054889C CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/henna_shop__FP15npc_henna_class.s b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/henna_shop__FP15npc_henna_class.s index 4fbca3e723..ef9c548dfc 100644 --- a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/henna_shop__FP15npc_henna_class.s +++ b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/henna_shop__FP15npc_henna_class.s @@ -271,8 +271,8 @@ lbl_80543D04: /* 80543D34 4B AF 0C 89 */ bl isEventBit__11dSv_event_cCFUs /* 80543D38 2C 03 00 00 */ cmpwi r3, 0 /* 80543D3C 41 82 00 14 */ beq lbl_80543D50 -/* 80543D40 3C 60 80 45 */ lis r3, struct_80450C9C+0x0@ha /* 0x80450C9C@ha */ -/* 80543D44 88 03 0C 9C */ lbz r0, struct_80450C9C+0x0@l(r3) /* 0x80450C9C@l */ +/* 80543D40 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x0@ha /* 0x80450C9C@ha */ +/* 80543D44 88 03 0C 9C */ lbz r0, cDmr_SkipInfo+0x0@l(r3) /* 0x80450C9C@l */ /* 80543D48 28 00 00 00 */ cmplwi r0, 0 /* 80543D4C 41 82 00 6C */ beq lbl_80543DB8 lbl_80543D50: @@ -286,8 +286,8 @@ lbl_80543D50: /* 80543D6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ /* 80543D70 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80543D74 4B AF E6 F5 */ bl reset__14dEvt_control_cFv -/* 80543D78 3C 60 80 45 */ lis r3, struct_80450C9C+0x0@ha /* 0x80450C9C@ha */ -/* 80543D7C 8C 03 0C 9C */ lbzu r0, struct_80450C9C+0x0@l(r3) /* 0x80450C9C@l */ +/* 80543D78 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x0@ha /* 0x80450C9C@ha */ +/* 80543D7C 8C 03 0C 9C */ lbzu r0, cDmr_SkipInfo+0x0@l(r3) /* 0x80450C9C@l */ /* 80543D80 28 00 00 00 */ cmplwi r0, 0 /* 80543D84 41 82 00 18 */ beq lbl_80543D9C /* 80543D88 38 00 00 00 */ li r0, 0 diff --git a/asm/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko/daNpc_Inko_Execute__FP14npc_inko_class.s b/asm/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko/daNpc_Inko_Execute__FP14npc_inko_class.s index 3a4ea10122..a43d9f5376 100644 --- a/asm/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko/daNpc_Inko_Execute__FP14npc_inko_class.s +++ b/asm/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko/daNpc_Inko_Execute__FP14npc_inko_class.s @@ -943,8 +943,8 @@ lbl_80A0DA5C: /* 80A0DA9C 41 82 00 1C */ beq lbl_80A0DAB8 /* 80A0DAA0 38 00 00 28 */ li r0, 0x28 /* 80A0DAA4 98 03 07 B5 */ stb r0, 0x7b5(r3) -/* 80A0DAA8 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80A0DAAC 8C 03 0C 9D */ lbzu r0, struct_80450C9C+0x1@l(r3) /* 0x80450C9D@l */ +/* 80A0DAA8 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80A0DAAC 8C 03 0C 9D */ lbzu r0, cDmr_SkipInfo+0x1@l(r3) /* 0x80450C9D@l */ /* 80A0DAB0 60 00 00 40 */ ori r0, r0, 0x40 /* 80A0DAB4 98 03 00 00 */ stb r0, 0(r3) lbl_80A0DAB8: @@ -996,8 +996,8 @@ lbl_80A0DB00: /* 80A0DB64 98 03 07 BA */ stb r0, 0x7ba(r3) /* 80A0DB68 48 00 00 3C */ b lbl_80A0DBA4 lbl_80A0DB6C: -/* 80A0DB6C 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80A0DB70 88 03 0C 9D */ lbz r0, struct_80450C9C+0x1@l(r3) /* 0x80450C9D@l */ +/* 80A0DB6C 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80A0DB70 88 03 0C 9D */ lbz r0, cDmr_SkipInfo+0x1@l(r3) /* 0x80450C9D@l */ /* 80A0DB74 54 03 07 BE */ clrlwi r3, r0, 0x1e /* 80A0DB78 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 80A0DB7C 41 82 00 18 */ beq lbl_80A0DB94 @@ -1020,8 +1020,8 @@ lbl_80A0DBA4: /* 80A0DBB8 4B 83 C3 D9 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 80A0DBBC 38 00 00 01 */ li r0, 1 /* 80A0DBC0 98 1D 05 F4 */ stb r0, 0x5f4(r29) -/* 80A0DBC4 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80A0DBC8 38 83 0C 9D */ addi r4, r3, struct_80450C9C+0x1@l /* 0x80450C9D@l */ +/* 80A0DBC4 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80A0DBC8 38 83 0C 9D */ addi r4, r3, cDmr_SkipInfo+0x1@l /* 0x80450C9D@l */ /* 80A0DBCC 88 64 00 00 */ lbz r3, 0(r4) /* 80A0DBD0 38 03 00 01 */ addi r0, r3, 1 /* 80A0DBD4 98 04 00 00 */ stb r0, 0(r4) @@ -1036,8 +1036,8 @@ lbl_80A0DBE4: /* 80A0DBF4 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) /* 80A0DBF8 C0 18 04 D8 */ lfs f0, 0x4d8(r24) /* 80A0DBFC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80A0DC00 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80A0DC04 88 03 0C 9D */ lbz r0, struct_80450C9C+0x1@l(r3) /* 0x80450C9D@l */ +/* 80A0DC00 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80A0DC04 88 03 0C 9D */ lbz r0, cDmr_SkipInfo+0x1@l(r3) /* 0x80450C9D@l */ /* 80A0DC08 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 80A0DC0C 41 82 00 60 */ beq lbl_80A0DC6C /* 80A0DC10 A8 1D 05 A2 */ lha r0, 0x5a2(r29) diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s deleted file mode 100644 index 58b5ef965d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80D3452C: -/* 80D3452C 3C 80 80 D3 */ lis r4, __vt__16daObj_Web0_HIO_c@ha /* 0x80D3527C@ha */ -/* 80D34530 38 04 52 7C */ addi r0, r4, __vt__16daObj_Web0_HIO_c@l /* 0x80D3527C@l */ -/* 80D34534 90 03 00 00 */ stw r0, 0(r3) -/* 80D34538 38 00 FF FF */ li r0, -1 -/* 80D3453C 98 03 00 04 */ stb r0, 4(r3) -/* 80D34540 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index cf54007e2c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D34D44: -/* 80D34D44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D34D48 7C 08 02 A6 */ mflr r0 -/* 80D34D4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D34D50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D34D54 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D34D58 41 82 00 1C */ beq lbl_80D34D74 -/* 80D34D5C 3C A0 80 D3 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80D35270@ha */ -/* 80D34D60 38 05 52 70 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80D35270@l */ -/* 80D34D64 90 1F 00 00 */ stw r0, 0(r31) -/* 80D34D68 7C 80 07 35 */ extsh. r0, r4 -/* 80D34D6C 40 81 00 08 */ ble lbl_80D34D74 -/* 80D34D70 4B 59 9F CD */ bl __dl__FPv -lbl_80D34D74: -/* 80D34D74 7F E3 FB 78 */ mr r3, r31 -/* 80D34D78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D34D7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D34D80 7C 08 03 A6 */ mtlr r0 -/* 80D34D84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D34D88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s deleted file mode 100644 index 68ab5226e1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D350E4: -/* 80D350E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D350E8 7C 08 02 A6 */ mflr r0 -/* 80D350EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D350F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D350F4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D350F8 41 82 00 1C */ beq lbl_80D35114 -/* 80D350FC 3C A0 80 D3 */ lis r5, __vt__16daObj_Web0_HIO_c@ha /* 0x80D3527C@ha */ -/* 80D35100 38 05 52 7C */ addi r0, r5, __vt__16daObj_Web0_HIO_c@l /* 0x80D3527C@l */ -/* 80D35104 90 1F 00 00 */ stw r0, 0(r31) -/* 80D35108 7C 80 07 35 */ extsh. r0, r4 -/* 80D3510C 40 81 00 08 */ ble lbl_80D35114 -/* 80D35110 4B 59 9C 2D */ bl __dl__FPv -lbl_80D35114: -/* 80D35114 7F E3 FB 78 */ mr r3, r31 -/* 80D35118 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D3511C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35120 7C 08 03 A6 */ mtlr r0 -/* 80D35124 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35128 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s deleted file mode 100644 index 0cbf350309..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D3509C: -/* 80D3509C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D350A0 7C 08 02 A6 */ mflr r0 -/* 80D350A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D350A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D350AC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D350B0 41 82 00 1C */ beq lbl_80D350CC -/* 80D350B4 3C A0 80 D3 */ lis r5, __vt__8cM3dGAab@ha /* 0x80D35264@ha */ -/* 80D350B8 38 05 52 64 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80D35264@l */ -/* 80D350BC 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80D350C0 7C 80 07 35 */ extsh. r0, r4 -/* 80D350C4 40 81 00 08 */ ble lbl_80D350CC -/* 80D350C8 4B 59 9C 75 */ bl __dl__FPv -lbl_80D350CC: -/* 80D350CC 7F E3 FB 78 */ mr r3, r31 -/* 80D350D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D350D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D350D8 7C 08 03 A6 */ mtlr r0 -/* 80D350DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D350E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s deleted file mode 100644 index 4db51a42f5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D35054: -/* 80D35054 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35058 7C 08 02 A6 */ mflr r0 -/* 80D3505C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35060 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35064 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D35068 41 82 00 1C */ beq lbl_80D35084 -/* 80D3506C 3C A0 80 D3 */ lis r5, __vt__8cM3dGSph@ha /* 0x80D35258@ha */ -/* 80D35070 38 05 52 58 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80D35258@l */ -/* 80D35074 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80D35078 7C 80 07 35 */ extsh. r0, r4 -/* 80D3507C 40 81 00 08 */ ble lbl_80D35084 -/* 80D35080 4B 59 9C BD */ bl __dl__FPv -lbl_80D35084: -/* 80D35084 7F E3 FB 78 */ mr r3, r31 -/* 80D35088 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D3508C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35090 7C 08 03 A6 */ mtlr r0 -/* 80D35094 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35098 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s deleted file mode 100644 index bf746eae2e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D3512C: -/* 80D3512C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35130 7C 08 02 A6 */ mflr r0 -/* 80D35134 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35138 3C 60 80 D3 */ lis r3, l_HIO@ha /* 0x80D352A0@ha */ -/* 80D3513C 38 63 52 A0 */ addi r3, r3, l_HIO@l /* 0x80D352A0@l */ -/* 80D35140 4B FF F3 ED */ bl __ct__16daObj_Web0_HIO_cFv -/* 80D35144 3C 80 80 D3 */ lis r4, __dt__16daObj_Web0_HIO_cFv@ha /* 0x80D350E4@ha */ -/* 80D35148 38 84 50 E4 */ addi r4, r4, __dt__16daObj_Web0_HIO_cFv@l /* 0x80D350E4@l */ -/* 80D3514C 3C A0 80 D3 */ lis r5, lit_3643@ha /* 0x80D35294@ha */ -/* 80D35150 38 A5 52 94 */ addi r5, r5, lit_3643@l /* 0x80D35294@l */ -/* 80D35154 4B FF F3 65 */ bl __register_global_object -/* 80D35158 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3515C 7C 08 03 A6 */ mtlr r0 -/* 80D35160 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35164 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s deleted file mode 100644 index bf1c63d473..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,189 +0,0 @@ -lbl_80D34D8C: -/* 80D34D8C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D34D90 7C 08 02 A6 */ mflr r0 -/* 80D34D94 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D34D98 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D34D9C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80D34DA0 7C 7F 1B 78 */ mr r31, r3 -/* 80D34DA4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D34DA8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D34DAC 40 82 00 A8 */ bne lbl_80D34E54 -/* 80D34DB0 7F E0 FB 79 */ or. r0, r31, r31 -/* 80D34DB4 41 82 00 94 */ beq lbl_80D34E48 -/* 80D34DB8 7C 1E 03 78 */ mr r30, r0 -/* 80D34DBC 4B 2E 3D A9 */ bl __ct__10fopAc_ac_cFv -/* 80D34DC0 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80D34DC4 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80D34DC8 90 1E 05 DC */ stw r0, 0x5dc(r30) -/* 80D34DCC 38 7E 05 E0 */ addi r3, r30, 0x5e0 -/* 80D34DD0 4B 34 E9 91 */ bl __ct__10dCcD_GSttsFv -/* 80D34DD4 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80D34DD8 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80D34DDC 90 7E 05 DC */ stw r3, 0x5dc(r30) -/* 80D34DE0 38 03 00 20 */ addi r0, r3, 0x20 -/* 80D34DE4 90 1E 05 E0 */ stw r0, 0x5e0(r30) -/* 80D34DE8 3B DE 06 00 */ addi r30, r30, 0x600 -/* 80D34DEC 7F C3 F3 78 */ mr r3, r30 -/* 80D34DF0 4B 34 EC 39 */ bl __ct__12dCcD_GObjInfFv -/* 80D34DF4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80D34DF8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80D34DFC 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80D34E00 3C 60 80 D3 */ lis r3, __vt__8cM3dGAab@ha /* 0x80D35264@ha */ -/* 80D34E04 38 03 52 64 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80D35264@l */ -/* 80D34E08 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 80D34E0C 3C 60 80 D3 */ lis r3, __vt__8cM3dGSph@ha /* 0x80D35258@ha */ -/* 80D34E10 38 03 52 58 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80D35258@l */ -/* 80D34E14 90 1E 01 34 */ stw r0, 0x134(r30) -/* 80D34E18 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80D34E1C 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80D34E20 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80D34E24 38 03 00 58 */ addi r0, r3, 0x58 -/* 80D34E28 90 1E 01 34 */ stw r0, 0x134(r30) -/* 80D34E2C 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80D34E30 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80D34E34 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80D34E38 38 03 00 2C */ addi r0, r3, 0x2c -/* 80D34E3C 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80D34E40 38 03 00 84 */ addi r0, r3, 0x84 -/* 80D34E44 90 1E 01 34 */ stw r0, 0x134(r30) -lbl_80D34E48: -/* 80D34E48 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D34E4C 60 00 00 08 */ ori r0, r0, 8 -/* 80D34E50 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D34E54: -/* 80D34E54 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80D34E58 3C 80 80 D3 */ lis r4, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34E5C 38 84 51 BC */ addi r4, r4, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34E60 4B 2F 80 5D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D34E64 7C 7E 1B 78 */ mr r30, r3 -/* 80D34E68 2C 1E 00 04 */ cmpwi r30, 4 -/* 80D34E6C 40 82 01 CC */ bne lbl_80D35038 -/* 80D34E70 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D34E74 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80D34E78 2C 04 00 FF */ cmpwi r4, 0xff -/* 80D34E7C 41 82 00 28 */ beq lbl_80D34EA4 -/* 80D34E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D34E84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D34E88 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D34E8C 7C 05 07 74 */ extsb r5, r0 -/* 80D34E90 4B 30 04 D1 */ bl isSwitch__10dSv_info_cCFii -/* 80D34E94 2C 03 00 00 */ cmpwi r3, 0 -/* 80D34E98 41 82 00 0C */ beq lbl_80D34EA4 -/* 80D34E9C 38 60 00 05 */ li r3, 5 -/* 80D34EA0 48 00 01 9C */ b lbl_80D3503C -lbl_80D34EA4: -/* 80D34EA4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D34EA8 98 1F 05 70 */ stb r0, 0x570(r31) -/* 80D34EAC 88 1F 05 70 */ lbz r0, 0x570(r31) -/* 80D34EB0 28 00 00 FF */ cmplwi r0, 0xff -/* 80D34EB4 40 82 00 0C */ bne lbl_80D34EC0 -/* 80D34EB8 38 00 00 00 */ li r0, 0 -/* 80D34EBC 98 1F 05 70 */ stb r0, 0x570(r31) -lbl_80D34EC0: -/* 80D34EC0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D34EC4 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80D34EC8 98 1F 05 71 */ stb r0, 0x571(r31) -/* 80D34ECC 7F E3 FB 78 */ mr r3, r31 -/* 80D34ED0 3C 80 80 D3 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80D34B94@ha */ -/* 80D34ED4 38 84 4B 94 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80D34B94@l */ -/* 80D34ED8 38 A0 0A 20 */ li r5, 0xa20 -/* 80D34EDC 4B 2E 55 D5 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D34EE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D34EE4 40 82 00 0C */ bne lbl_80D34EF0 -/* 80D34EE8 38 60 00 05 */ li r3, 5 -/* 80D34EEC 48 00 01 50 */ b lbl_80D3503C -lbl_80D34EF0: -/* 80D34EF0 80 9F 05 C0 */ lwz r4, 0x5c0(r31) -/* 80D34EF4 28 04 00 00 */ cmplwi r4, 0 -/* 80D34EF8 41 82 00 28 */ beq lbl_80D34F20 -/* 80D34EFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D34F00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D34F04 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D34F08 7F E5 FB 78 */ mr r5, r31 -/* 80D34F0C 4B 33 FA FD */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80D34F10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D34F14 41 82 00 0C */ beq lbl_80D34F20 -/* 80D34F18 38 60 00 05 */ li r3, 5 -/* 80D34F1C 48 00 01 20 */ b lbl_80D3503C -lbl_80D34F20: -/* 80D34F20 3C 60 80 D3 */ lis r3, data_80D35290@ha /* 0x80D35290@ha */ -/* 80D34F24 8C 03 52 90 */ lbzu r0, data_80D35290@l(r3) /* 0x80D35290@l */ -/* 80D34F28 28 00 00 00 */ cmplwi r0, 0 -/* 80D34F2C 40 82 00 20 */ bne lbl_80D34F4C -/* 80D34F30 38 00 00 01 */ li r0, 1 -/* 80D34F34 98 1F 07 39 */ stb r0, 0x739(r31) -/* 80D34F38 98 03 00 00 */ stb r0, 0(r3) -/* 80D34F3C 38 00 FF FF */ li r0, -1 -/* 80D34F40 3C 60 80 D3 */ lis r3, l_HIO@ha /* 0x80D352A0@ha */ -/* 80D34F44 38 63 52 A0 */ addi r3, r3, l_HIO@l /* 0x80D352A0@l */ -/* 80D34F48 98 03 00 04 */ stb r0, 4(r3) -lbl_80D34F4C: -/* 80D34F4C 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D34F50 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D34F54 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80D34F58 7F E3 FB 78 */ mr r3, r31 -/* 80D34F5C 3C 80 80 D3 */ lis r4, lit_4014@ha /* 0x80D351A8@ha */ -/* 80D34F60 C0 24 51 A8 */ lfs f1, lit_4014@l(r4) /* 0x80D351A8@l */ -/* 80D34F64 FC 40 08 90 */ fmr f2, f1 -/* 80D34F68 FC 60 08 90 */ fmr f3, f1 -/* 80D34F6C 4B 2E 55 BD */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80D34F70 7F E3 FB 78 */ mr r3, r31 -/* 80D34F74 3C 80 80 D3 */ lis r4, lit_4015@ha /* 0x80D351AC@ha */ -/* 80D34F78 C0 24 51 AC */ lfs f1, lit_4015@l(r4) /* 0x80D351AC@l */ -/* 80D34F7C FC 40 08 90 */ fmr f2, f1 -/* 80D34F80 FC 60 08 90 */ fmr f3, f1 -/* 80D34F84 4B 2E 55 B5 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80D34F88 38 00 00 1E */ li r0, 0x1e -/* 80D34F8C B0 1F 05 62 */ sth r0, 0x562(r31) -/* 80D34F90 B0 1F 05 60 */ sth r0, 0x560(r31) -/* 80D34F94 38 7F 05 C4 */ addi r3, r31, 0x5c4 -/* 80D34F98 38 80 00 FA */ li r4, 0xfa -/* 80D34F9C 38 A0 00 00 */ li r5, 0 -/* 80D34FA0 7F E6 FB 78 */ mr r6, r31 -/* 80D34FA4 4B 34 E8 BD */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80D34FA8 38 7F 06 00 */ addi r3, r31, 0x600 -/* 80D34FAC 3C 80 80 D3 */ lis r4, cc_sph_src@ha /* 0x80D351C8@ha */ -/* 80D34FB0 38 84 51 C8 */ addi r4, r4, cc_sph_src@l /* 0x80D351C8@l */ -/* 80D34FB4 4B 34 FA 81 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80D34FB8 38 1F 05 C4 */ addi r0, r31, 0x5c4 -/* 80D34FBC 90 1F 06 44 */ stw r0, 0x644(r31) -/* 80D34FC0 80 1F 06 9C */ lwz r0, 0x69c(r31) -/* 80D34FC4 60 00 00 04 */ ori r0, r0, 4 -/* 80D34FC8 90 1F 06 9C */ stw r0, 0x69c(r31) -/* 80D34FCC 88 1F 05 71 */ lbz r0, 0x571(r31) -/* 80D34FD0 28 00 00 FF */ cmplwi r0, 0xff -/* 80D34FD4 41 82 00 44 */ beq lbl_80D35018 -/* 80D34FD8 28 00 00 00 */ cmplwi r0, 0 -/* 80D34FDC 41 82 00 3C */ beq lbl_80D35018 -/* 80D34FE0 3C 60 80 D3 */ lis r3, lit_4017@ha /* 0x80D351B4@ha */ -/* 80D34FE4 C8 23 51 B4 */ lfd f1, lit_4017@l(r3) /* 0x80D351B4@l */ -/* 80D34FE8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D34FEC 3C 60 43 30 */ lis r3, 0x4330 -/* 80D34FF0 90 61 00 08 */ stw r3, 8(r1) -/* 80D34FF4 C8 01 00 08 */ lfd f0, 8(r1) -/* 80D34FF8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80D34FFC D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 80D35000 88 1F 05 71 */ lbz r0, 0x571(r31) -/* 80D35004 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35008 90 61 00 10 */ stw r3, 0x10(r1) -/* 80D3500C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80D35010 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80D35014 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -lbl_80D35018: -/* 80D35018 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80D3501C D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 80D35020 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80D35024 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80D35028 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80D3502C D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 80D35030 7F E3 FB 78 */ mr r3, r31 -/* 80D35034 4B FF F7 61 */ bl daObj_Web0_Execute__FP14obj_web0_class -lbl_80D35038: -/* 80D35038 7F C3 F3 78 */ mr r3, r30 -lbl_80D3503C: -/* 80D3503C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D35040 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80D35044 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D35048 7C 08 03 A6 */ mtlr r0 -/* 80D3504C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D35050 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s deleted file mode 100644 index 573f302947..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80D34B2C: -/* 80D34B2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D34B30 7C 08 02 A6 */ mflr r0 -/* 80D34B34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D34B38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D34B3C 7C 7F 1B 78 */ mr r31, r3 -/* 80D34B40 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80D34B44 3C 80 80 D3 */ lis r4, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34B48 38 84 51 BC */ addi r4, r4, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34B4C 4B 2F 84 BD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D34B50 88 1F 07 39 */ lbz r0, 0x739(r31) -/* 80D34B54 28 00 00 00 */ cmplwi r0, 0 -/* 80D34B58 41 82 00 10 */ beq lbl_80D34B68 -/* 80D34B5C 38 00 00 00 */ li r0, 0 -/* 80D34B60 3C 60 80 D3 */ lis r3, data_80D35290@ha /* 0x80D35290@ha */ -/* 80D34B64 98 03 52 90 */ stb r0, data_80D35290@l(r3) /* 0x80D35290@l */ -lbl_80D34B68: -/* 80D34B68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D34B6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D34B70 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D34B74 80 9F 05 C0 */ lwz r4, 0x5c0(r31) -/* 80D34B78 4B 33 F6 D9 */ bl Release__4cBgSFP9dBgW_Base -/* 80D34B7C 38 60 00 01 */ li r3, 1 -/* 80D34B80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D34B84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D34B88 7C 08 03 A6 */ mtlr r0 -/* 80D34B8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D34B90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s deleted file mode 100644 index be75744a07..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80D34544: -/* 80D34544 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D34548 7C 08 02 A6 */ mflr r0 -/* 80D3454C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D34550 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D34554 7C 7F 1B 78 */ mr r31, r3 -/* 80D34558 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D3455C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D34560 38 80 00 10 */ li r4, 0x10 -/* 80D34564 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80D34568 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80D3456C 4B 46 F2 59 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D34570 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D34574 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D34578 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80D3457C 80 84 00 04 */ lwz r4, 4(r4) -/* 80D34580 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80D34584 4B 47 08 1D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D34588 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D3458C 80 83 00 04 */ lwz r4, 4(r3) -/* 80D34590 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80D34594 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80D34598 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D3459C 4B 2D 92 0D */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80D345A0 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D345A4 4B 2D 97 21 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D345A8 38 60 00 01 */ li r3, 1 -/* 80D345AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D345B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D345B4 7C 08 03 A6 */ mtlr r0 -/* 80D345B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D345BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index f520582784..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,117 +0,0 @@ -lbl_80D34B94: -/* 80D34B94 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D34B98 7C 08 02 A6 */ mflr r0 -/* 80D34B9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D34BA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D34BA4 4B 62 D6 39 */ bl _savegpr_29 -/* 80D34BA8 7C 7E 1B 78 */ mr r30, r3 -/* 80D34BAC 3C 60 80 D3 */ lis r3, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34BB0 38 63 51 BC */ addi r3, r3, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34BB4 38 80 00 05 */ li r4, 5 -/* 80D34BB8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D34BBC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D34BC0 3F E5 00 02 */ addis r31, r5, 2 -/* 80D34BC4 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80D34BC8 7F E5 FB 78 */ mr r5, r31 -/* 80D34BCC 38 C0 00 80 */ li r6, 0x80 -/* 80D34BD0 4B 30 77 1D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D34BD4 3C 80 00 08 */ lis r4, 8 -/* 80D34BD8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D34BDC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D34BE0 4B 2E 00 75 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D34BE4 90 7E 05 74 */ stw r3, 0x574(r30) -/* 80D34BE8 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 80D34BEC 28 00 00 00 */ cmplwi r0, 0 -/* 80D34BF0 40 82 00 0C */ bne lbl_80D34BFC -/* 80D34BF4 38 60 00 00 */ li r3, 0 -/* 80D34BF8 48 00 01 34 */ b lbl_80D34D2C -lbl_80D34BFC: -/* 80D34BFC 38 60 00 18 */ li r3, 0x18 -/* 80D34C00 4B 59 A0 4D */ bl __nw__FUl -/* 80D34C04 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80D34C08 41 82 00 20 */ beq lbl_80D34C28 -/* 80D34C0C 3C 80 80 D3 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80D35270@ha */ -/* 80D34C10 38 04 52 70 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80D35270@l */ -/* 80D34C14 90 1D 00 00 */ stw r0, 0(r29) -/* 80D34C18 38 80 00 00 */ li r4, 0 -/* 80D34C1C 4B 5F 37 E1 */ bl init__12J3DFrameCtrlFs -/* 80D34C20 38 00 00 00 */ li r0, 0 -/* 80D34C24 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80D34C28: -/* 80D34C28 93 BE 05 78 */ stw r29, 0x578(r30) -/* 80D34C2C 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 80D34C30 28 00 00 00 */ cmplwi r0, 0 -/* 80D34C34 40 82 00 0C */ bne lbl_80D34C40 -/* 80D34C38 38 60 00 00 */ li r3, 0 -/* 80D34C3C 48 00 00 F0 */ b lbl_80D34D2C -lbl_80D34C40: -/* 80D34C40 3C 60 80 D3 */ lis r3, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34C44 38 63 51 BC */ addi r3, r3, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34C48 38 80 00 08 */ li r4, 8 -/* 80D34C4C 7F E5 FB 78 */ mr r5, r31 -/* 80D34C50 38 C0 00 80 */ li r6, 0x80 -/* 80D34C54 4B 30 76 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D34C58 7C 65 1B 78 */ mr r5, r3 -/* 80D34C5C 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80D34C60 80 83 00 04 */ lwz r4, 4(r3) -/* 80D34C64 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D34C68 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D34C6C 38 C0 00 01 */ li r6, 1 -/* 80D34C70 38 E0 00 00 */ li r7, 0 -/* 80D34C74 3D 00 80 D3 */ lis r8, lit_3724@ha /* 0x80D3517C@ha */ -/* 80D34C78 C0 28 51 7C */ lfs f1, lit_3724@l(r8) /* 0x80D3517C@l */ -/* 80D34C7C 39 00 00 00 */ li r8, 0 -/* 80D34C80 39 20 FF FF */ li r9, -1 -/* 80D34C84 4B 2D 8A 89 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80D34C88 2C 03 00 00 */ cmpwi r3, 0 -/* 80D34C8C 40 82 00 0C */ bne lbl_80D34C98 -/* 80D34C90 38 60 00 00 */ li r3, 0 -/* 80D34C94 48 00 00 98 */ b lbl_80D34D2C -lbl_80D34C98: -/* 80D34C98 3C 60 80 D3 */ lis r3, lit_3917@ha /* 0x80D351A4@ha */ -/* 80D34C9C C0 03 51 A4 */ lfs f0, lit_3917@l(r3) /* 0x80D351A4@l */ -/* 80D34CA0 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D34CA4 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80D34CA8 38 60 00 C0 */ li r3, 0xc0 -/* 80D34CAC 4B 59 9F A1 */ bl __nw__FUl -/* 80D34CB0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80D34CB4 41 82 00 0C */ beq lbl_80D34CC0 -/* 80D34CB8 4B 34 6C B9 */ bl __ct__4dBgWFv -/* 80D34CBC 7C 60 1B 78 */ mr r0, r3 -lbl_80D34CC0: -/* 80D34CC0 90 1E 05 C0 */ stw r0, 0x5c0(r30) -/* 80D34CC4 80 1E 05 C0 */ lwz r0, 0x5c0(r30) -/* 80D34CC8 28 00 00 00 */ cmplwi r0, 0 -/* 80D34CCC 40 82 00 0C */ bne lbl_80D34CD8 -/* 80D34CD0 38 60 00 00 */ li r3, 0 -/* 80D34CD4 48 00 00 58 */ b lbl_80D34D2C -lbl_80D34CD8: -/* 80D34CD8 3C 60 80 D3 */ lis r3, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34CDC 38 63 51 BC */ addi r3, r3, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34CE0 38 80 00 0B */ li r4, 0xb -/* 80D34CE4 7F E5 FB 78 */ mr r5, r31 -/* 80D34CE8 38 C0 00 80 */ li r6, 0x80 -/* 80D34CEC 4B 30 76 01 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D34CF0 7C 64 1B 78 */ mr r4, r3 -/* 80D34CF4 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 80D34CF8 38 A0 00 01 */ li r5, 1 -/* 80D34CFC 38 DE 05 90 */ addi r6, r30, 0x590 -/* 80D34D00 4B 34 52 39 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80D34D04 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80D34D08 28 00 00 01 */ cmplwi r0, 1 -/* 80D34D0C 40 82 00 0C */ bne lbl_80D34D18 -/* 80D34D10 38 60 00 00 */ li r3, 0 -/* 80D34D14 48 00 00 18 */ b lbl_80D34D2C -lbl_80D34D18: -/* 80D34D18 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075A24@ha */ -/* 80D34D1C 38 03 5A 24 */ addi r0, r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075A24@l */ -/* 80D34D20 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 80D34D24 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80D34D28 38 60 00 01 */ li r3, 1 -lbl_80D34D2C: -/* 80D34D2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D34D30 4B 62 D4 F9 */ bl _restgpr_29 -/* 80D34D34 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D34D38 7C 08 03 A6 */ mtlr r0 -/* 80D34D3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D34D40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s deleted file mode 100644 index 82c2183aa8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80D353AC: -/* 80D353AC 3C 80 80 D3 */ lis r4, __vt__16daObj_Web1_HIO_c@ha /* 0x80D361E4@ha */ -/* 80D353B0 38 04 61 E4 */ addi r0, r4, __vt__16daObj_Web1_HIO_c@l /* 0x80D361E4@l */ -/* 80D353B4 90 03 00 00 */ stw r0, 0(r3) -/* 80D353B8 38 00 FF FF */ li r0, -1 -/* 80D353BC 98 03 00 04 */ stb r0, 4(r3) -/* 80D353C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 4ecc0d8629..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D35C9C: -/* 80D35C9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35CA0 7C 08 02 A6 */ mflr r0 -/* 80D35CA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35CA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35CAC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D35CB0 41 82 00 1C */ beq lbl_80D35CCC -/* 80D35CB4 3C A0 80 D3 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80D361D8@ha */ -/* 80D35CB8 38 05 61 D8 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80D361D8@l */ -/* 80D35CBC 90 1F 00 00 */ stw r0, 0(r31) -/* 80D35CC0 7C 80 07 35 */ extsh. r0, r4 -/* 80D35CC4 40 81 00 08 */ ble lbl_80D35CCC -/* 80D35CC8 4B 59 90 75 */ bl __dl__FPv -lbl_80D35CCC: -/* 80D35CCC 7F E3 FB 78 */ mr r3, r31 -/* 80D35CD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D35CD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35CD8 7C 08 03 A6 */ mtlr r0 -/* 80D35CDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35CE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s deleted file mode 100644 index 31ad5f064a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D36028: -/* 80D36028 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D3602C 7C 08 02 A6 */ mflr r0 -/* 80D36030 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D36034 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D36038 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D3603C 41 82 00 1C */ beq lbl_80D36058 -/* 80D36040 3C A0 80 D3 */ lis r5, __vt__16daObj_Web1_HIO_c@ha /* 0x80D361E4@ha */ -/* 80D36044 38 05 61 E4 */ addi r0, r5, __vt__16daObj_Web1_HIO_c@l /* 0x80D361E4@l */ -/* 80D36048 90 1F 00 00 */ stw r0, 0(r31) -/* 80D3604C 7C 80 07 35 */ extsh. r0, r4 -/* 80D36050 40 81 00 08 */ ble lbl_80D36058 -/* 80D36054 4B 59 8C E9 */ bl __dl__FPv -lbl_80D36058: -/* 80D36058 7F E3 FB 78 */ mr r3, r31 -/* 80D3605C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D36060 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D36064 7C 08 03 A6 */ mtlr r0 -/* 80D36068 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3606C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s deleted file mode 100644 index a0857e7e03..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D35FE0: -/* 80D35FE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35FE4 7C 08 02 A6 */ mflr r0 -/* 80D35FE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35FEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35FF0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D35FF4 41 82 00 1C */ beq lbl_80D36010 -/* 80D35FF8 3C A0 80 D3 */ lis r5, __vt__8cM3dGAab@ha /* 0x80D361CC@ha */ -/* 80D35FFC 38 05 61 CC */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80D361CC@l */ -/* 80D36000 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80D36004 7C 80 07 35 */ extsh. r0, r4 -/* 80D36008 40 81 00 08 */ ble lbl_80D36010 -/* 80D3600C 4B 59 8D 31 */ bl __dl__FPv -lbl_80D36010: -/* 80D36010 7F E3 FB 78 */ mr r3, r31 -/* 80D36014 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D36018 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3601C 7C 08 03 A6 */ mtlr r0 -/* 80D36020 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D36024 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s deleted file mode 100644 index b75148c9db..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D35F98: -/* 80D35F98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35F9C 7C 08 02 A6 */ mflr r0 -/* 80D35FA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35FA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35FA8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D35FAC 41 82 00 1C */ beq lbl_80D35FC8 -/* 80D35FB0 3C A0 80 D3 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80D361C0@ha */ -/* 80D35FB4 38 05 61 C0 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80D361C0@l */ -/* 80D35FB8 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80D35FBC 7C 80 07 35 */ extsh. r0, r4 -/* 80D35FC0 40 81 00 08 */ ble lbl_80D35FC8 -/* 80D35FC4 4B 59 8D 79 */ bl __dl__FPv -lbl_80D35FC8: -/* 80D35FC8 7F E3 FB 78 */ mr r3, r31 -/* 80D35FCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D35FD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35FD4 7C 08 03 A6 */ mtlr r0 -/* 80D35FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35FDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s deleted file mode 100644 index 2c58f808bd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D36070: -/* 80D36070 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D36074 7C 08 02 A6 */ mflr r0 -/* 80D36078 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3607C 3C 60 80 D3 */ lis r3, l_HIO@ha /* 0x80D36208@ha */ -/* 80D36080 38 63 62 08 */ addi r3, r3, l_HIO@l /* 0x80D36208@l */ -/* 80D36084 4B FF F3 29 */ bl __ct__16daObj_Web1_HIO_cFv -/* 80D36088 3C 80 80 D3 */ lis r4, __dt__16daObj_Web1_HIO_cFv@ha /* 0x80D36028@ha */ -/* 80D3608C 38 84 60 28 */ addi r4, r4, __dt__16daObj_Web1_HIO_cFv@l /* 0x80D36028@l */ -/* 80D36090 3C A0 80 D3 */ lis r5, lit_3643@ha /* 0x80D361FC@ha */ -/* 80D36094 38 A5 61 FC */ addi r5, r5, lit_3643@l /* 0x80D361FC@l */ -/* 80D36098 4B FF F2 A1 */ bl __register_global_object -/* 80D3609C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D360A0 7C 08 03 A6 */ mtlr r0 -/* 80D360A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D360A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s deleted file mode 100644 index 2636e59c84..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s +++ /dev/null @@ -1,172 +0,0 @@ -lbl_80D35508: -/* 80D35508 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D3550C 7C 08 02 A6 */ mflr r0 -/* 80D35510 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D35514 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D35518 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80D3551C 7C 7E 1B 78 */ mr r30, r3 -/* 80D35520 3C 60 80 D3 */ lis r3, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35524 3B E3 60 C0 */ addi r31, r3, lit_3703@l /* 0x80D360C0@l */ -/* 80D35528 A8 7E 05 A8 */ lha r3, 0x5a8(r30) -/* 80D3552C 7C 60 07 35 */ extsh. r0, r3 -/* 80D35530 41 82 00 74 */ beq lbl_80D355A4 -/* 80D35534 2C 03 00 3C */ cmpwi r3, 0x3c -/* 80D35538 41 82 00 14 */ beq lbl_80D3554C -/* 80D3553C 2C 03 00 28 */ cmpwi r3, 0x28 -/* 80D35540 41 82 00 0C */ beq lbl_80D3554C -/* 80D35544 2C 03 00 14 */ cmpwi r3, 0x14 -/* 80D35548 40 82 00 50 */ bne lbl_80D35598 -lbl_80D3554C: -/* 80D3554C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D35550 7C 03 07 74 */ extsb r3, r0 -/* 80D35554 4B 2F 7B 19 */ bl dComIfGp_getReverb__Fi -/* 80D35558 7C 67 1B 78 */ mr r7, r3 -/* 80D3555C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080114@ha */ -/* 80D35560 38 03 01 14 */ addi r0, r3, 0x0114 /* 0x00080114@l */ -/* 80D35564 90 01 00 08 */ stw r0, 8(r1) -/* 80D35568 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80D3556C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80D35570 80 63 00 00 */ lwz r3, 0(r3) -/* 80D35574 38 81 00 08 */ addi r4, r1, 8 -/* 80D35578 38 BE 05 38 */ addi r5, r30, 0x538 -/* 80D3557C 38 C0 00 00 */ li r6, 0 -/* 80D35580 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80D35584 FC 40 08 90 */ fmr f2, f1 -/* 80D35588 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 80D3558C FC 80 18 90 */ fmr f4, f3 -/* 80D35590 39 00 00 00 */ li r8, 0 -/* 80D35594 4B 57 63 F1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80D35598: -/* 80D35598 A8 7E 05 A8 */ lha r3, 0x5a8(r30) -/* 80D3559C 38 03 FF FF */ addi r0, r3, -1 -/* 80D355A0 B0 1E 05 A8 */ sth r0, 0x5a8(r30) -lbl_80D355A4: -/* 80D355A4 A8 1E 05 9E */ lha r0, 0x59e(r30) -/* 80D355A8 2C 00 00 01 */ cmpwi r0, 1 -/* 80D355AC 41 82 00 80 */ beq lbl_80D3562C -/* 80D355B0 40 80 00 10 */ bge lbl_80D355C0 -/* 80D355B4 2C 00 00 00 */ cmpwi r0, 0 -/* 80D355B8 40 80 00 14 */ bge lbl_80D355CC -/* 80D355BC 48 00 00 A4 */ b lbl_80D35660 -lbl_80D355C0: -/* 80D355C0 2C 00 00 0A */ cmpwi r0, 0xa -/* 80D355C4 41 82 00 94 */ beq lbl_80D35658 -/* 80D355C8 48 00 00 98 */ b lbl_80D35660 -lbl_80D355CC: -/* 80D355CC A8 1E 05 A6 */ lha r0, 0x5a6(r30) -/* 80D355D0 2C 00 00 00 */ cmpwi r0, 0 -/* 80D355D4 40 82 00 8C */ bne lbl_80D35660 -/* 80D355D8 38 7E 06 30 */ addi r3, r30, 0x630 -/* 80D355DC 4B 34 EE 85 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80D355E0 28 03 00 00 */ cmplwi r3, 0 -/* 80D355E4 41 82 00 7C */ beq lbl_80D35660 -/* 80D355E8 38 00 00 06 */ li r0, 6 -/* 80D355EC B0 1E 05 A6 */ sth r0, 0x5a6(r30) -/* 80D355F0 38 7E 06 30 */ addi r3, r30, 0x630 -/* 80D355F4 4B 34 EF 05 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80D355F8 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80D355FC 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80D35600 41 82 00 0C */ beq lbl_80D3560C -/* 80D35604 38 00 00 0A */ li r0, 0xa -/* 80D35608 B0 1E 05 9E */ sth r0, 0x59e(r30) -lbl_80D3560C: -/* 80D3560C 38 7E 06 30 */ addi r3, r30, 0x630 -/* 80D35610 4B 34 EF 39 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80D35614 88 03 00 75 */ lbz r0, 0x75(r3) -/* 80D35618 28 00 00 01 */ cmplwi r0, 1 -/* 80D3561C 40 82 00 44 */ bne lbl_80D35660 -/* 80D35620 38 00 00 0A */ li r0, 0xa -/* 80D35624 B0 1E 05 9E */ sth r0, 0x59e(r30) -/* 80D35628 48 00 00 38 */ b lbl_80D35660 -lbl_80D3562C: -/* 80D3562C A8 1E 05 A2 */ lha r0, 0x5a2(r30) -/* 80D35630 2C 00 00 00 */ cmpwi r0, 0 -/* 80D35634 40 82 00 2C */ bne lbl_80D35660 -/* 80D35638 38 7E 05 7C */ addi r3, r30, 0x57c -/* 80D3563C 3C 80 00 04 */ lis r4, 4 -/* 80D35640 38 A0 00 21 */ li r5, 0x21 -/* 80D35644 38 C0 00 00 */ li r6, 0 -/* 80D35648 4B 58 8E 5D */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -/* 80D3564C 7F C3 F3 78 */ mr r3, r30 -/* 80D35650 4B 2E 46 2D */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80D35654 48 00 00 0C */ b lbl_80D35660 -lbl_80D35658: -/* 80D35658 38 00 00 01 */ li r0, 1 -/* 80D3565C 98 1E 05 B4 */ stb r0, 0x5b4(r30) -lbl_80D35660: -/* 80D35660 A8 9E 05 A8 */ lha r4, 0x5a8(r30) -/* 80D35664 1C 04 0F 00 */ mulli r0, r4, 0xf00 -/* 80D35668 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80D3566C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80D35670 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80D35674 7C 83 04 2E */ lfsx f4, r3, r0 -/* 80D35678 C0 7E 05 B0 */ lfs f3, 0x5b0(r30) -/* 80D3567C C0 5F 00 10 */ lfs f2, 0x10(r31) -/* 80D35680 C8 3F 00 30 */ lfd f1, 0x30(r31) -/* 80D35684 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 80D35688 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3568C 3C 00 43 30 */ lis r0, 0x4330 -/* 80D35690 90 01 00 10 */ stw r0, 0x10(r1) -/* 80D35694 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80D35698 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80D3569C EC 00 01 32 */ fmuls f0, f0, f4 -/* 80D356A0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D356A4 EC 03 00 2A */ fadds f0, f3, f0 -/* 80D356A8 D0 1E 04 F0 */ stfs f0, 0x4f0(r30) -/* 80D356AC C0 3E 04 F0 */ lfs f1, 0x4f0(r30) -/* 80D356B0 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80D356B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D356B8 40 80 00 08 */ bge lbl_80D356C0 -/* 80D356BC D0 1E 04 F0 */ stfs f0, 0x4f0(r30) -lbl_80D356C0: -/* 80D356C0 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80D356C4 A8 7E 05 AA */ lha r3, 0x5aa(r30) -/* 80D356C8 7C 60 07 35 */ extsh. r0, r3 -/* 80D356CC 41 82 00 80 */ beq lbl_80D3574C -/* 80D356D0 2C 03 00 64 */ cmpwi r3, 0x64 -/* 80D356D4 40 81 00 20 */ ble lbl_80D356F4 -/* 80D356D8 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 80D356DC A8 7E 05 9E */ lha r3, 0x59e(r30) -/* 80D356E0 38 03 00 01 */ addi r0, r3, 1 -/* 80D356E4 B0 1E 05 9E */ sth r0, 0x59e(r30) -/* 80D356E8 38 00 00 00 */ li r0, 0 -/* 80D356EC B0 1E 05 A2 */ sth r0, 0x5a2(r30) -/* 80D356F0 48 00 00 28 */ b lbl_80D35718 -lbl_80D356F4: -/* 80D356F4 2C 03 00 50 */ cmpwi r3, 0x50 -/* 80D356F8 40 81 00 0C */ ble lbl_80D35704 -/* 80D356FC C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80D35700 48 00 00 18 */ b lbl_80D35718 -lbl_80D35704: -/* 80D35704 2C 03 00 04 */ cmpwi r3, 4 -/* 80D35708 41 80 00 0C */ blt lbl_80D35714 -/* 80D3570C C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80D35710 48 00 00 08 */ b lbl_80D35718 -lbl_80D35714: -/* 80D35714 C0 3F 00 08 */ lfs f1, 8(r31) -lbl_80D35718: -/* 80D35718 C0 5F 00 24 */ lfs f2, 0x24(r31) -/* 80D3571C C0 1E 05 AC */ lfs f0, 0x5ac(r30) -/* 80D35720 EC 42 00 32 */ fmuls f2, f2, f0 -/* 80D35724 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80D35728 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80D3572C 40 81 00 08 */ ble lbl_80D35734 -/* 80D35730 FC 40 00 90 */ fmr f2, f0 -lbl_80D35734: -/* 80D35734 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80D35738 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80D3573C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80D35740 A8 7E 05 AA */ lha r3, 0x5aa(r30) -/* 80D35744 38 03 FF FF */ addi r0, r3, -1 -/* 80D35748 B0 1E 05 AA */ sth r0, 0x5aa(r30) -lbl_80D3574C: -/* 80D3574C 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 80D35750 C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 80D35754 FC 60 10 90 */ fmr f3, f2 -/* 80D35758 4B 53 A2 E5 */ bl cLib_addCalc2__FPffff -/* 80D3575C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D35760 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80D35764 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D35768 7C 08 03 A6 */ mtlr r0 -/* 80D3576C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D35770 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s deleted file mode 100644 index abd6f7d7cd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,184 +0,0 @@ -lbl_80D35CE4: -/* 80D35CE4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D35CE8 7C 08 02 A6 */ mflr r0 -/* 80D35CEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D35CF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D35CF4 4B 62 C4 E9 */ bl _savegpr_29 -/* 80D35CF8 7C 7E 1B 78 */ mr r30, r3 -/* 80D35CFC 3C 80 80 D3 */ lis r4, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35D00 3B E4 60 C0 */ addi r31, r4, lit_3703@l /* 0x80D360C0@l */ -/* 80D35D04 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D35D08 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D35D0C 40 82 00 B0 */ bne lbl_80D35DBC -/* 80D35D10 7F C0 F3 79 */ or. r0, r30, r30 -/* 80D35D14 41 82 00 9C */ beq lbl_80D35DB0 -/* 80D35D18 7C 1D 03 78 */ mr r29, r0 -/* 80D35D1C 4B 2E 2E 49 */ bl __ct__10fopAc_ac_cFv -/* 80D35D20 38 7D 05 7C */ addi r3, r29, 0x57c -/* 80D35D24 4B 58 8B 21 */ bl __ct__16Z2SoundObjSimpleFv -/* 80D35D28 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80D35D2C 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80D35D30 90 1D 06 0C */ stw r0, 0x60c(r29) -/* 80D35D34 38 7D 06 10 */ addi r3, r29, 0x610 -/* 80D35D38 4B 34 DA 29 */ bl __ct__10dCcD_GSttsFv -/* 80D35D3C 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80D35D40 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80D35D44 90 7D 06 0C */ stw r3, 0x60c(r29) -/* 80D35D48 38 03 00 20 */ addi r0, r3, 0x20 -/* 80D35D4C 90 1D 06 10 */ stw r0, 0x610(r29) -/* 80D35D50 3B BD 06 30 */ addi r29, r29, 0x630 -/* 80D35D54 7F A3 EB 78 */ mr r3, r29 -/* 80D35D58 4B 34 DC D1 */ bl __ct__12dCcD_GObjInfFv -/* 80D35D5C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80D35D60 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80D35D64 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80D35D68 3C 60 80 D3 */ lis r3, __vt__8cM3dGAab@ha /* 0x80D361CC@ha */ -/* 80D35D6C 38 03 61 CC */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80D361CC@l */ -/* 80D35D70 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 80D35D74 3C 60 80 D3 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80D361C0@ha */ -/* 80D35D78 38 03 61 C0 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80D361C0@l */ -/* 80D35D7C 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80D35D80 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80D35D84 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80D35D88 90 7D 01 20 */ stw r3, 0x120(r29) -/* 80D35D8C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80D35D90 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80D35D94 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80D35D98 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80D35D9C 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80D35DA0 38 03 00 2C */ addi r0, r3, 0x2c -/* 80D35DA4 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80D35DA8 38 03 00 84 */ addi r0, r3, 0x84 -/* 80D35DAC 90 1D 01 38 */ stw r0, 0x138(r29) -lbl_80D35DB0: -/* 80D35DB0 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80D35DB4 60 00 00 08 */ ori r0, r0, 8 -/* 80D35DB8 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80D35DBC: -/* 80D35DBC 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80D35DC0 3C 80 80 D3 */ lis r4, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35DC4 38 84 61 20 */ addi r4, r4, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35DC8 4B 2F 70 F5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D35DCC 7C 7D 1B 78 */ mr r29, r3 -/* 80D35DD0 2C 1D 00 04 */ cmpwi r29, 4 -/* 80D35DD4 40 82 01 A8 */ bne lbl_80D35F7C -/* 80D35DD8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D35DDC 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80D35DE0 28 04 00 FF */ cmplwi r4, 0xff -/* 80D35DE4 41 82 00 28 */ beq lbl_80D35E0C -/* 80D35DE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35DEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35DF0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D35DF4 7C 05 07 74 */ extsb r5, r0 -/* 80D35DF8 4B 2F F5 69 */ bl isSwitch__10dSv_info_cCFii -/* 80D35DFC 2C 03 00 00 */ cmpwi r3, 0 -/* 80D35E00 41 82 00 0C */ beq lbl_80D35E0C -/* 80D35E04 38 60 00 05 */ li r3, 5 -/* 80D35E08 48 00 01 78 */ b lbl_80D35F80 -lbl_80D35E0C: -/* 80D35E0C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D35E10 98 1E 05 70 */ stb r0, 0x570(r30) -/* 80D35E14 88 1E 05 70 */ lbz r0, 0x570(r30) -/* 80D35E18 28 00 00 FF */ cmplwi r0, 0xff -/* 80D35E1C 40 82 00 0C */ bne lbl_80D35E28 -/* 80D35E20 38 00 00 00 */ li r0, 0 -/* 80D35E24 98 1E 05 70 */ stb r0, 0x570(r30) -lbl_80D35E28: -/* 80D35E28 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D35E2C 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80D35E30 98 1E 05 71 */ stb r0, 0x571(r30) -/* 80D35E34 7F C3 F3 78 */ mr r3, r30 -/* 80D35E38 3C 80 80 D3 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80D35AC0@ha */ -/* 80D35E3C 38 84 5A C0 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80D35AC0@l */ -/* 80D35E40 3C A0 00 05 */ lis r5, 0x0005 /* 0x0004B000@ha */ -/* 80D35E44 38 A5 B0 00 */ addi r5, r5, 0xB000 /* 0x0004B000@l */ -/* 80D35E48 4B 2E 46 69 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D35E4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D35E50 40 82 00 0C */ bne lbl_80D35E5C -/* 80D35E54 38 60 00 05 */ li r3, 5 -/* 80D35E58 48 00 01 28 */ b lbl_80D35F80 -lbl_80D35E5C: -/* 80D35E5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35E60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35E64 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D35E68 80 9E 05 F0 */ lwz r4, 0x5f0(r30) -/* 80D35E6C 7F C5 F3 78 */ mr r5, r30 -/* 80D35E70 4B 33 EB 99 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80D35E74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D35E78 41 82 00 0C */ beq lbl_80D35E84 -/* 80D35E7C 38 60 00 05 */ li r3, 5 -/* 80D35E80 48 00 01 00 */ b lbl_80D35F80 -lbl_80D35E84: -/* 80D35E84 3C 60 80 D3 */ lis r3, data_80D361F8@ha /* 0x80D361F8@ha */ -/* 80D35E88 8C 03 61 F8 */ lbzu r0, data_80D361F8@l(r3) /* 0x80D361F8@l */ -/* 80D35E8C 28 00 00 00 */ cmplwi r0, 0 -/* 80D35E90 40 82 00 20 */ bne lbl_80D35EB0 -/* 80D35E94 38 00 00 01 */ li r0, 1 -/* 80D35E98 98 1E 07 6C */ stb r0, 0x76c(r30) -/* 80D35E9C 98 03 00 00 */ stb r0, 0(r3) -/* 80D35EA0 38 00 FF FF */ li r0, -1 -/* 80D35EA4 3C 60 80 D3 */ lis r3, l_HIO@ha /* 0x80D36208@ha */ -/* 80D35EA8 38 63 62 08 */ addi r3, r3, l_HIO@l /* 0x80D36208@l */ -/* 80D35EAC 98 03 00 04 */ stb r0, 4(r3) -lbl_80D35EB0: -/* 80D35EB0 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80D35EB4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D35EB8 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80D35EBC 7F C3 F3 78 */ mr r3, r30 -/* 80D35EC0 C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 80D35EC4 FC 40 08 90 */ fmr f2, f1 -/* 80D35EC8 FC 60 08 90 */ fmr f3, f1 -/* 80D35ECC 4B 2E 46 5D */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80D35ED0 7F C3 F3 78 */ mr r3, r30 -/* 80D35ED4 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80D35ED8 FC 40 08 90 */ fmr f2, f1 -/* 80D35EDC FC 60 08 90 */ fmr f3, f1 -/* 80D35EE0 4B 2E 46 59 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80D35EE4 88 1E 05 71 */ lbz r0, 0x571(r30) -/* 80D35EE8 28 00 00 FF */ cmplwi r0, 0xff -/* 80D35EEC 41 82 00 28 */ beq lbl_80D35F14 -/* 80D35EF0 28 00 00 00 */ cmplwi r0, 0 -/* 80D35EF4 41 82 00 20 */ beq lbl_80D35F14 -/* 80D35EF8 C8 3F 00 58 */ lfd f1, 0x58(r31) -/* 80D35EFC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D35F00 3C 00 43 30 */ lis r0, 0x4330 -/* 80D35F04 90 01 00 08 */ stw r0, 8(r1) -/* 80D35F08 C8 01 00 08 */ lfd f0, 8(r1) -/* 80D35F0C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80D35F10 D0 1E 04 EC */ stfs f0, 0x4ec(r30) -lbl_80D35F14: -/* 80D35F14 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80D35F18 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80D35F1C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80D35F20 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80D35F24 38 7E 05 F4 */ addi r3, r30, 0x5f4 -/* 80D35F28 38 80 00 FF */ li r4, 0xff -/* 80D35F2C 38 A0 00 00 */ li r5, 0 -/* 80D35F30 7F C6 F3 78 */ mr r6, r30 -/* 80D35F34 4B 34 D9 2D */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80D35F38 38 7E 06 30 */ addi r3, r30, 0x630 -/* 80D35F3C 3C 80 80 D3 */ lis r4, cc_cyl_src@ha /* 0x80D3612C@ha */ -/* 80D35F40 38 84 61 2C */ addi r4, r4, cc_cyl_src@l /* 0x80D3612C@l */ -/* 80D35F44 4B 34 E9 71 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80D35F48 38 1E 05 F4 */ addi r0, r30, 0x5f4 -/* 80D35F4C 90 1E 06 74 */ stw r0, 0x674(r30) -/* 80D35F50 80 1E 06 CC */ lwz r0, 0x6cc(r30) -/* 80D35F54 60 00 00 04 */ ori r0, r0, 4 -/* 80D35F58 90 1E 06 CC */ stw r0, 0x6cc(r30) -/* 80D35F5C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80D35F60 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80D35F64 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80D35F68 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80D35F6C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80D35F70 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80D35F74 7F C3 F3 78 */ mr r3, r30 -/* 80D35F78 4B FF F7 FD */ bl daObj_Web1_Execute__FP14obj_web1_class -lbl_80D35F7C: -/* 80D35F7C 7F A3 EB 78 */ mr r3, r29 -lbl_80D35F80: -/* 80D35F80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D35F84 4B 62 C2 A5 */ bl _restgpr_29 -/* 80D35F88 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D35F8C 7C 08 03 A6 */ mtlr r0 -/* 80D35F90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D35F94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s deleted file mode 100644 index 17b1f71653..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80D35A44: -/* 80D35A44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35A48 7C 08 02 A6 */ mflr r0 -/* 80D35A4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35A50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35A54 7C 7F 1B 78 */ mr r31, r3 -/* 80D35A58 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80D35A5C 3C 80 80 D3 */ lis r4, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35A60 38 84 61 20 */ addi r4, r4, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35A64 4B 2F 75 A5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D35A68 88 1F 07 6C */ lbz r0, 0x76c(r31) -/* 80D35A6C 28 00 00 00 */ cmplwi r0, 0 -/* 80D35A70 41 82 00 10 */ beq lbl_80D35A80 -/* 80D35A74 38 00 00 00 */ li r0, 0 -/* 80D35A78 3C 60 80 D3 */ lis r3, data_80D361F8@ha /* 0x80D361F8@ha */ -/* 80D35A7C 98 03 61 F8 */ stb r0, data_80D361F8@l(r3) /* 0x80D361F8@l */ -lbl_80D35A80: -/* 80D35A80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35A84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35A88 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D35A8C 80 9F 05 F0 */ lwz r4, 0x5f0(r31) -/* 80D35A90 4B 33 E7 C1 */ bl Release__4cBgSFP9dBgW_Base -/* 80D35A94 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 80D35A98 28 00 00 00 */ cmplwi r0, 0 -/* 80D35A9C 41 82 00 0C */ beq lbl_80D35AA8 -/* 80D35AA0 38 7F 05 7C */ addi r3, r31, 0x57c -/* 80D35AA4 4B 58 85 55 */ bl deleteObject__14Z2SoundObjBaseFv -lbl_80D35AA8: -/* 80D35AA8 38 60 00 01 */ li r3, 1 -/* 80D35AAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D35AB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35AB4 7C 08 03 A6 */ mtlr r0 -/* 80D35AB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35ABC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s deleted file mode 100644 index 83ef2e5939..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80D353C4: -/* 80D353C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D353C8 7C 08 02 A6 */ mflr r0 -/* 80D353CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D353D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D353D4 7C 7F 1B 78 */ mr r31, r3 -/* 80D353D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D353DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D353E0 38 80 00 10 */ li r4, 0x10 -/* 80D353E4 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80D353E8 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80D353EC 4B 46 E3 D9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D353F0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D353F4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D353F8 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80D353FC 80 84 00 04 */ lwz r4, 4(r4) -/* 80D35400 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80D35404 4B 46 F9 9D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D35408 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D3540C 80 83 00 04 */ lwz r4, 4(r3) -/* 80D35410 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80D35414 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80D35418 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D3541C 4B 2D 83 8D */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80D35420 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D35424 4B 2D 88 A1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D35428 38 60 00 01 */ li r3, 1 -/* 80D3542C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D35430 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35434 7C 08 03 A6 */ mtlr r0 -/* 80D35438 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3543C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s deleted file mode 100644 index 686f931d1c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s +++ /dev/null @@ -1,186 +0,0 @@ -lbl_80D35774: -/* 80D35774 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80D35778 7C 08 02 A6 */ mflr r0 -/* 80D3577C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80D35780 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80D35784 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80D35788 7C 7E 1B 78 */ mr r30, r3 -/* 80D3578C 3C 60 80 D3 */ lis r3, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35790 3B E3 60 C0 */ addi r31, r3, lit_3703@l /* 0x80D360C0@l */ -/* 80D35794 A8 7E 05 9C */ lha r3, 0x59c(r30) -/* 80D35798 38 03 00 01 */ addi r0, r3, 1 -/* 80D3579C B0 1E 05 9C */ sth r0, 0x59c(r30) -/* 80D357A0 38 60 00 00 */ li r3, 0 -/* 80D357A4 38 00 00 02 */ li r0, 2 -/* 80D357A8 7C 09 03 A6 */ mtctr r0 -lbl_80D357AC: -/* 80D357AC 38 A3 05 A2 */ addi r5, r3, 0x5a2 -/* 80D357B0 7C 9E 2A AE */ lhax r4, r30, r5 -/* 80D357B4 2C 04 00 00 */ cmpwi r4, 0 -/* 80D357B8 41 82 00 0C */ beq lbl_80D357C4 -/* 80D357BC 38 04 FF FF */ addi r0, r4, -1 -/* 80D357C0 7C 1E 2B 2E */ sthx r0, r30, r5 -lbl_80D357C4: -/* 80D357C4 38 63 00 02 */ addi r3, r3, 2 -/* 80D357C8 42 00 FF E4 */ bdnz lbl_80D357AC -/* 80D357CC A8 7E 05 A6 */ lha r3, 0x5a6(r30) -/* 80D357D0 2C 03 00 00 */ cmpwi r3, 0 -/* 80D357D4 41 82 00 0C */ beq lbl_80D357E0 -/* 80D357D8 38 03 FF FF */ addi r0, r3, -1 -/* 80D357DC B0 1E 05 A6 */ sth r0, 0x5a6(r30) -lbl_80D357E0: -/* 80D357E0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D357E4 7C 03 07 74 */ extsb r3, r0 -/* 80D357E8 4B 2F 78 85 */ bl dComIfGp_getReverb__Fi -/* 80D357EC 7C 65 1B 78 */ mr r5, r3 -/* 80D357F0 38 7E 05 7C */ addi r3, r30, 0x57c -/* 80D357F4 38 80 00 00 */ li r4, 0 -/* 80D357F8 81 9E 05 8C */ lwz r12, 0x58c(r30) -/* 80D357FC 81 8C 00 08 */ lwz r12, 8(r12) -/* 80D35800 7D 89 03 A6 */ mtctr r12 -/* 80D35804 4E 80 04 21 */ bctrl -/* 80D35808 88 7E 05 B4 */ lbz r3, 0x5b4(r30) -/* 80D3580C 7C 60 07 75 */ extsb. r0, r3 -/* 80D35810 41 82 01 08 */ beq lbl_80D35918 -/* 80D35814 7C 60 07 74 */ extsb r0, r3 -/* 80D35818 2C 00 00 01 */ cmpwi r0, 1 -/* 80D3581C 40 82 00 70 */ bne lbl_80D3588C -/* 80D35820 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80D35824 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D35828 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80D3582C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80D35830 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35834 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35838 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80D3583C 38 80 00 00 */ li r4, 0 -/* 80D35840 90 81 00 08 */ stw r4, 8(r1) -/* 80D35844 38 00 FF FF */ li r0, -1 -/* 80D35848 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D3584C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80D35850 90 81 00 14 */ stw r4, 0x14(r1) -/* 80D35854 90 81 00 18 */ stw r4, 0x18(r1) -/* 80D35858 38 80 00 00 */ li r4, 0 -/* 80D3585C 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000840E@ha */ -/* 80D35860 38 A5 84 0E */ addi r5, r5, 0x840E /* 0x0000840E@l */ -/* 80D35864 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80D35868 38 E0 00 00 */ li r7, 0 -/* 80D3586C 39 1E 04 E4 */ addi r8, r30, 0x4e4 -/* 80D35870 39 21 00 24 */ addi r9, r1, 0x24 -/* 80D35874 39 40 00 FF */ li r10, 0xff -/* 80D35878 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80D3587C 4B 31 72 15 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80D35880 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80D35884 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D35888 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_80D3588C: -/* 80D3588C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D35890 7C 03 07 74 */ extsb r3, r0 -/* 80D35894 4B 2F 77 D9 */ bl dComIfGp_getReverb__Fi -/* 80D35898 7C 67 1B 78 */ mr r7, r3 -/* 80D3589C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080112@ha */ -/* 80D358A0 38 03 01 12 */ addi r0, r3, 0x0112 /* 0x00080112@l */ -/* 80D358A4 90 01 00 20 */ stw r0, 0x20(r1) -/* 80D358A8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80D358AC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80D358B0 80 63 00 00 */ lwz r3, 0(r3) -/* 80D358B4 38 81 00 20 */ addi r4, r1, 0x20 -/* 80D358B8 38 BE 05 38 */ addi r5, r30, 0x538 -/* 80D358BC 38 C0 00 00 */ li r6, 0 -/* 80D358C0 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80D358C4 FC 40 08 90 */ fmr f2, f1 -/* 80D358C8 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 80D358CC FC 80 18 90 */ fmr f4, f3 -/* 80D358D0 39 00 00 00 */ li r8, 0 -/* 80D358D4 4B 57 6C 39 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80D358D8 88 1E 05 B4 */ lbz r0, 0x5b4(r30) -/* 80D358DC 2C 00 00 23 */ cmpwi r0, 0x23 -/* 80D358E0 40 82 00 28 */ bne lbl_80D35908 -/* 80D358E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D358E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D358EC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D358F0 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80D358F4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D358F8 7C 05 07 74 */ extsb r5, r0 -/* 80D358FC 4B 2F F9 05 */ bl onSwitch__10dSv_info_cFii -/* 80D35900 7F C3 F3 78 */ mr r3, r30 -/* 80D35904 4B 2E 43 79 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_80D35908: -/* 80D35908 88 7E 05 B4 */ lbz r3, 0x5b4(r30) -/* 80D3590C 38 03 00 01 */ addi r0, r3, 1 -/* 80D35910 98 1E 05 B4 */ stb r0, 0x5b4(r30) -/* 80D35914 48 00 00 0C */ b lbl_80D35920 -lbl_80D35918: -/* 80D35918 7F C3 F3 78 */ mr r3, r30 -/* 80D3591C 4B FF FB ED */ bl action__FP14obj_web1_class -lbl_80D35920: -/* 80D35920 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D35924 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D35928 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80D3592C C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80D35930 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80D35934 4B 61 0F B5 */ bl PSMTXTrans -/* 80D35938 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3593C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D35940 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80D35944 4B 2D 6A F1 */ bl mDoMtx_YrotM__FPA4_fs -/* 80D35948 C0 3E 04 EC */ lfs f1, 0x4ec(r30) -/* 80D3594C C0 5F 00 38 */ lfs f2, 0x38(r31) -/* 80D35950 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80D35954 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80D35958 EC 42 00 2A */ fadds f2, f2, f0 -/* 80D3595C FC 60 08 90 */ fmr f3, f1 -/* 80D35960 4B 2D 74 D9 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80D35964 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D35968 4B 2D 7A C1 */ bl play__14mDoExt_baseAnmFv -/* 80D3596C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D35970 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D35974 80 9E 05 74 */ lwz r4, 0x574(r30) -/* 80D35978 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D3597C 4B 61 0B 35 */ bl PSMTXCopy -/* 80D35980 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D35984 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D35988 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80D3598C C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80D35990 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80D35994 4B 61 0F 55 */ bl PSMTXTrans -/* 80D35998 C0 5E 04 EC */ lfs f2, 0x4ec(r30) -/* 80D3599C C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80D359A0 EC 20 00 B2 */ fmuls f1, f0, f2 -/* 80D359A4 FC 60 08 90 */ fmr f3, f1 -/* 80D359A8 4B 2D 74 91 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80D359AC C0 3F 00 00 */ lfs f1, 0(r31) -/* 80D359B0 C0 9F 00 40 */ lfs f4, 0x40(r31) -/* 80D359B4 C0 7F 00 44 */ lfs f3, 0x44(r31) -/* 80D359B8 C0 5E 04 EC */ lfs f2, 0x4ec(r30) -/* 80D359BC C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80D359C0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D359C4 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80D359C8 EC 44 00 2A */ fadds f2, f4, f0 -/* 80D359CC FC 60 08 90 */ fmr f3, f1 -/* 80D359D0 4B 2D 73 CD */ bl transM__14mDoMtx_stack_cFfff -/* 80D359D4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D359D8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D359DC 38 9E 05 C0 */ addi r4, r30, 0x5c0 -/* 80D359E0 4B 61 0A D1 */ bl PSMTXCopy -/* 80D359E4 80 7E 05 F0 */ lwz r3, 0x5f0(r30) -/* 80D359E8 4B 34 5F D9 */ bl Move__4dBgWFv -/* 80D359EC 38 7E 07 54 */ addi r3, r30, 0x754 -/* 80D359F0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80D359F4 4B 53 97 E9 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80D359F8 38 7E 07 54 */ addi r3, r30, 0x754 -/* 80D359FC C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 80D35A00 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80D35A04 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80D35A08 4B 53 97 F9 */ bl SetR__8cM3dGCylFf -/* 80D35A0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35A10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35A14 38 63 23 3C */ addi r3, r3, 0x233c -/* 80D35A18 38 9E 06 30 */ addi r4, r30, 0x630 -/* 80D35A1C 4B 52 F1 8D */ bl Set__4cCcSFP8cCcD_Obj -/* 80D35A20 38 60 00 01 */ li r3, 1 -/* 80D35A24 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80D35A28 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80D35A2C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80D35A30 7C 08 03 A6 */ mtlr r0 -/* 80D35A34 38 21 00 40 */ addi r1, r1, 0x40 -/* 80D35A38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 3117a93d25..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80D35440: -/* 80D35440 C0 25 04 D0 */ lfs f1, 0x4d0(r5) -/* 80D35444 C0 04 04 D0 */ lfs f0, 0x4d0(r4) -/* 80D35448 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80D3544C C0 25 04 D8 */ lfs f1, 0x4d8(r5) -/* 80D35450 C0 04 04 D8 */ lfs f0, 0x4d8(r4) -/* 80D35454 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80D35458 EC 22 00 B2 */ fmuls f1, f2, f2 -/* 80D3545C EC 00 00 32 */ fmuls f0, f0, f0 -/* 80D35460 EC 21 00 2A */ fadds f1, f1, f0 -/* 80D35464 3C 60 80 D3 */ lis r3, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35468 C0 03 60 C0 */ lfs f0, lit_3703@l(r3) /* 0x80D360C0@l */ -/* 80D3546C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D35470 40 81 00 0C */ ble lbl_80D3547C -/* 80D35474 FC 00 08 34 */ frsqrte f0, f1 -/* 80D35478 EC 20 00 72 */ fmuls f1, f0, f1 -lbl_80D3547C: -/* 80D3547C D0 24 05 AC */ stfs f1, 0x5ac(r4) -/* 80D35480 C0 24 05 AC */ lfs f1, 0x5ac(r4) -/* 80D35484 3C 60 80 D3 */ lis r3, lit_3704@ha /* 0x80D360C4@ha */ -/* 80D35488 C0 03 60 C4 */ lfs f0, lit_3704@l(r3) /* 0x80D360C4@l */ -/* 80D3548C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D35490 4C 80 00 20 */ bgelr -/* 80D35494 A8 05 00 08 */ lha r0, 8(r5) -/* 80D35498 2C 00 00 FD */ cmpwi r0, 0xfd -/* 80D3549C 41 82 00 08 */ beq lbl_80D354A4 -/* 80D354A0 40 82 00 48 */ bne lbl_80D354E8 -lbl_80D354A4: -/* 80D354A4 A8 04 05 AA */ lha r0, 0x5aa(r4) -/* 80D354A8 2C 00 00 00 */ cmpwi r0, 0 -/* 80D354AC 40 82 00 0C */ bne lbl_80D354B8 -/* 80D354B0 38 00 00 3C */ li r0, 0x3c -/* 80D354B4 B0 04 05 A8 */ sth r0, 0x5a8(r4) -lbl_80D354B8: -/* 80D354B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D354BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D354C0 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80D354C4 80 03 05 70 */ lwz r0, 0x570(r3) -/* 80D354C8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80D354CC 41 82 00 10 */ beq lbl_80D354DC -/* 80D354D0 38 00 00 78 */ li r0, 0x78 -/* 80D354D4 B0 04 05 AA */ sth r0, 0x5aa(r4) -/* 80D354D8 4E 80 00 20 */ blr -lbl_80D354DC: -/* 80D354DC 38 00 00 06 */ li r0, 6 -/* 80D354E0 B0 04 05 AA */ sth r0, 0x5aa(r4) -/* 80D354E4 4E 80 00 20 */ blr -lbl_80D354E8: -/* 80D354E8 2C 00 00 2E */ cmpwi r0, 0x2e -/* 80D354EC 40 82 00 10 */ bne lbl_80D354FC -/* 80D354F0 38 00 00 78 */ li r0, 0x78 -/* 80D354F4 B0 04 05 AA */ sth r0, 0x5aa(r4) -/* 80D354F8 4E 80 00 20 */ blr -lbl_80D354FC: -/* 80D354FC 38 00 00 03 */ li r0, 3 -/* 80D35500 B0 04 05 AA */ sth r0, 0x5aa(r4) -/* 80D35504 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 171c3bb040..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,128 +0,0 @@ -lbl_80D35AC0: -/* 80D35AC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D35AC4 7C 08 02 A6 */ mflr r0 -/* 80D35AC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D35ACC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D35AD0 4B 62 C7 0D */ bl _savegpr_29 -/* 80D35AD4 7C 7E 1B 78 */ mr r30, r3 -/* 80D35AD8 3C 60 80 D3 */ lis r3, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35ADC 38 63 61 20 */ addi r3, r3, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35AE0 38 80 00 05 */ li r4, 5 -/* 80D35AE4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35AE8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35AEC 3F E5 00 02 */ addis r31, r5, 2 -/* 80D35AF0 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80D35AF4 7F E5 FB 78 */ mr r5, r31 -/* 80D35AF8 38 C0 00 80 */ li r6, 0x80 -/* 80D35AFC 4B 30 67 F1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D35B00 3C 80 00 08 */ lis r4, 8 -/* 80D35B04 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D35B08 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D35B0C 4B 2D F1 49 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D35B10 90 7E 05 74 */ stw r3, 0x574(r30) -/* 80D35B14 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 80D35B18 28 00 00 00 */ cmplwi r0, 0 -/* 80D35B1C 40 82 00 0C */ bne lbl_80D35B28 -/* 80D35B20 38 60 00 00 */ li r3, 0 -/* 80D35B24 48 00 01 60 */ b lbl_80D35C84 -lbl_80D35B28: -/* 80D35B28 38 60 00 18 */ li r3, 0x18 -/* 80D35B2C 4B 59 91 21 */ bl __nw__FUl -/* 80D35B30 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80D35B34 41 82 00 20 */ beq lbl_80D35B54 -/* 80D35B38 3C 80 80 D3 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80D361D8@ha */ -/* 80D35B3C 38 04 61 D8 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80D361D8@l */ -/* 80D35B40 90 1D 00 00 */ stw r0, 0(r29) -/* 80D35B44 38 80 00 00 */ li r4, 0 -/* 80D35B48 4B 5F 28 B5 */ bl init__12J3DFrameCtrlFs -/* 80D35B4C 38 00 00 00 */ li r0, 0 -/* 80D35B50 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80D35B54: -/* 80D35B54 93 BE 05 78 */ stw r29, 0x578(r30) -/* 80D35B58 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 80D35B5C 28 00 00 00 */ cmplwi r0, 0 -/* 80D35B60 40 82 00 0C */ bne lbl_80D35B6C -/* 80D35B64 38 60 00 00 */ li r3, 0 -/* 80D35B68 48 00 01 1C */ b lbl_80D35C84 -lbl_80D35B6C: -/* 80D35B6C 3C 60 80 D3 */ lis r3, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35B70 38 63 61 20 */ addi r3, r3, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35B74 38 80 00 08 */ li r4, 8 -/* 80D35B78 7F E5 FB 78 */ mr r5, r31 -/* 80D35B7C 38 C0 00 80 */ li r6, 0x80 -/* 80D35B80 4B 30 67 6D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D35B84 7C 65 1B 78 */ mr r5, r3 -/* 80D35B88 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80D35B8C 80 83 00 04 */ lwz r4, 4(r3) -/* 80D35B90 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D35B94 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D35B98 38 C0 00 01 */ li r6, 1 -/* 80D35B9C 38 E0 00 00 */ li r7, 0 -/* 80D35BA0 3D 00 80 D3 */ lis r8, lit_3798@ha /* 0x80D360C8@ha */ -/* 80D35BA4 C0 28 60 C8 */ lfs f1, lit_3798@l(r8) /* 0x80D360C8@l */ -/* 80D35BA8 39 00 00 00 */ li r8, 0 -/* 80D35BAC 39 20 FF FF */ li r9, -1 -/* 80D35BB0 4B 2D 7B 5D */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80D35BB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80D35BB8 40 82 00 0C */ bne lbl_80D35BC4 -/* 80D35BBC 38 60 00 00 */ li r3, 0 -/* 80D35BC0 48 00 00 C4 */ b lbl_80D35C84 -lbl_80D35BC4: -/* 80D35BC4 3C 60 80 D3 */ lis r3, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35BC8 C0 03 60 C0 */ lfs f0, lit_3703@l(r3) /* 0x80D360C0@l */ -/* 80D35BCC 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D35BD0 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80D35BD4 38 60 00 C0 */ li r3, 0xc0 -/* 80D35BD8 4B 59 90 75 */ bl __nw__FUl -/* 80D35BDC 7C 60 1B 79 */ or. r0, r3, r3 -/* 80D35BE0 41 82 00 0C */ beq lbl_80D35BEC -/* 80D35BE4 4B 34 5D 8D */ bl __ct__4dBgWFv -/* 80D35BE8 7C 60 1B 78 */ mr r0, r3 -lbl_80D35BEC: -/* 80D35BEC 90 1E 05 F0 */ stw r0, 0x5f0(r30) -/* 80D35BF0 80 1E 05 F0 */ lwz r0, 0x5f0(r30) -/* 80D35BF4 28 00 00 00 */ cmplwi r0, 0 -/* 80D35BF8 40 82 00 0C */ bne lbl_80D35C04 -/* 80D35BFC 38 60 00 00 */ li r3, 0 -/* 80D35C00 48 00 00 84 */ b lbl_80D35C84 -lbl_80D35C04: -/* 80D35C04 3C 60 80 D3 */ lis r3, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35C08 38 63 61 20 */ addi r3, r3, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35C0C 38 80 00 0B */ li r4, 0xb -/* 80D35C10 7F E5 FB 78 */ mr r5, r31 -/* 80D35C14 38 C0 00 80 */ li r6, 0x80 -/* 80D35C18 4B 30 66 D5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D35C1C 7C 64 1B 78 */ mr r4, r3 -/* 80D35C20 80 7E 05 F0 */ lwz r3, 0x5f0(r30) -/* 80D35C24 38 A0 00 01 */ li r5, 1 -/* 80D35C28 38 DE 05 C0 */ addi r6, r30, 0x5c0 -/* 80D35C2C 4B 34 43 0D */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80D35C30 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80D35C34 28 00 00 01 */ cmplwi r0, 1 -/* 80D35C38 40 82 00 0C */ bne lbl_80D35C44 -/* 80D35C3C 38 60 00 00 */ li r3, 0 -/* 80D35C40 48 00 00 44 */ b lbl_80D35C84 -lbl_80D35C44: -/* 80D35C44 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075A24@ha */ -/* 80D35C48 38 03 5A 24 */ addi r0, r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075A24@l */ -/* 80D35C4C 80 7E 05 F0 */ lwz r3, 0x5f0(r30) -/* 80D35C50 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80D35C54 3C 60 80 D3 */ lis r3, ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@ha /* 0x80D35440@ha */ -/* 80D35C58 38 03 54 40 */ addi r0, r3, ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@l /* 0x80D35440@l */ -/* 80D35C5C 80 7E 05 F0 */ lwz r3, 0x5f0(r30) -/* 80D35C60 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 80D35C64 38 7E 05 7C */ addi r3, r30, 0x57c -/* 80D35C68 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80D35C6C 38 A0 00 01 */ li r5, 1 -/* 80D35C70 81 9E 05 8C */ lwz r12, 0x58c(r30) -/* 80D35C74 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80D35C78 7D 89 03 A6 */ mtctr r12 -/* 80D35C7C 4E 80 04 21 */ bctrl -/* 80D35C80 38 60 00 01 */ li r3, 1 -lbl_80D35C84: -/* 80D35C84 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D35C88 4B 62 C5 A1 */ bl _restgpr_29 -/* 80D35C8C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D35C90 7C 08 03 A6 */ mtlr r0 -/* 80D35C94 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D35C98 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h index a6537a1bf2..2211663f84 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModel.h +++ b/include/JSystem/J3DGraphAnimator/J3DModel.h @@ -80,6 +80,7 @@ public: void setUserArea(u32 area) { mUserArea = area; } u32 getUserArea() const { return mUserArea; } Vec* getBaseScale() { return &mBaseScale; } + void setAnmMtx(int i, Mtx m) { mMtxBuffer->setAnmMtx(i, m); } // is there a better way to handle inlines with same name as non-inlines? MtxP i_getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); } diff --git a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h index ee49731289..c709985d7c 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h +++ b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h @@ -25,6 +25,7 @@ public: /* 80326EF0 */ void calcBBoardMtx(); MtxP getAnmMtx(int idx) const { return mpAnmMtx[idx]; } + void setAnmMtx(int i, Mtx m) { PSMTXCopy(m, (MtxP)mpAnmMtx[i]); } void setScaleFlag(int idx, u8 flag) { mpScaleFlagArr[idx] = flag; } u32* getCurrentViewNoPtr() { return &mCurrentViewNo; } diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h index 4e755a9cee..54f9682c01 100644 --- a/include/SSystem/SComponent/c_bg_w.h +++ b/include/SSystem/SComponent/c_bg_w.h @@ -13,7 +13,7 @@ public: /* 802681D4 */ bool ChkUsed() const; /* 802681C0 */ void Regist(int); - /* 8007E5F8 */ virtual ~cBgW_BgId(); + /* 8007E5F8 */ virtual ~cBgW_BgId() {} cBgW_BgId() { Ct(); } void Ct() { m_id = 0x100; } diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 40c9f774a1..581025392e 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -30,7 +30,10 @@ enum cCcD_ObjAtType { /* 0x00000010 */ AT_TYPE_SHIELD_ATTACK = (1 << 4), /* 0x00000020 */ AT_TYPE_BOMB = (1 << 5), /* 0x00000080 */ AT_TYPE_SLINGSHOT = (1 << 7), + /* 0x00000200 */ AT_TYPE_LANTERN_SWING = (1 << 9), /* 0x00000400 */ AT_TYPE_CSTATUE_SWING = (1 << 10), + /* 0x00000800 */ AT_TYPE_800 = (1 << 11), + /* 0x00001000 */ AT_TYPE_1000 = (1 << 12), /* 0x00002000 */ AT_TYPE_ARROW = (1 << 13), /* 0x00004000 */ AT_TYPE_HOOKSHOT = (1 << 14), /* 0x00010000 */ AT_TYPE_BOOMERANG = (1 << 16), @@ -41,6 +44,7 @@ enum cCcD_ObjAtType { /* 0x00800000 */ AT_TYPE_COPY_ROD = (1 << 23), /* 0x04000000 */ AT_TYPE_MASTER_SWORD = (1 << 26), /* 0x08000000 */ AT_TYPE_MIDNA_LOCK = (1 << 27), + /* 0x10000000 */ AT_TYPE_10000000 = (1 << 28), /* 0x40000000 */ AT_TYPE_WOLF_CUT_TURN = (1 << 30), /* 0x80000000 */ AT_TYPE_WOLF_ATTACK = (1 << 31), }; @@ -53,7 +57,7 @@ public: struct Shape { /* 80167BBC */ ~Shape(); - /* 0x00 */ u32 _0; + /* 0x00 */ int _0; /* 0x04 */ f32 _4; /* 0x08 */ f32 _8; /* 0x0C */ f32 _C; @@ -146,9 +150,15 @@ public: STATIC_ASSERT(0x40 == sizeof(cCcD_CpsAttr)); +class cCcD_SrcSphAttr : public cM3dGSphS {}; + class cCcD_SphAttr : public cCcD_ShapeAttr, public cM3dGSph { public: cCcD_SphAttr() {} + void Set(const cCcD_SrcSphAttr& src) { + cM3dGSph::Set(src); + } + /* 8008721C */ virtual ~cCcD_SphAttr() {} /* 80084B44 */ virtual const cXyz& GetCoCP() const { return mCenter; } /* 80037A54 */ virtual cXyz& GetCoCP() { return mCenter; } @@ -248,26 +258,26 @@ public: STATIC_ASSERT(0x40 == sizeof(cCcD_DivideArea)); struct cCcD_SrcObjTg { - s32 mType; - s32 mSPrm; -}; + /* 0x0 */ s32 mType; + /* 0x4 */ s32 mSPrm; +}; // Size: 0x8 struct cCcD_SrcObjAt { - s32 mType; - u8 mAtp; - s32 mSPrm; -}; + /* 0x0 */ s32 mType; + /* 0x4 */ u8 mAtp; + /* 0x8 */ s32 mSPrm; +}; // Size: 0xC struct cCcD_SrcObjHitInf { - cCcD_SrcObjAt mObjAt; - cCcD_SrcObjTg mObjTg; - s32 mSPrm; -}; + /* 0x00 */ cCcD_SrcObjAt mObjAt; + /* 0x0C */ cCcD_SrcObjTg mObjTg; + /* 0x14 */ s32 mSPrm; +}; // Size: 0x18 struct cCcD_SrcObj { - int field_0x0; - cCcD_SrcObjHitInf mSrcObjHitInf; -}; + /* 0x0 */ int field_0x0; + /* 0x4 */ cCcD_SrcObjHitInf mSrcObjHitInf; +}; // Size: 0x1C class cCcD_GStts { public: @@ -299,11 +309,14 @@ public: /* 80263984 */ f32 GetWeightF() const; /* 802649E8 vt[7] */ virtual void ClrAt() {} /* 802649EC vt[8] */ virtual void ClrTg() { mTg = 0; } + u8 GetWeightUc() const { return mWeight; } void SetWeight(u8 weight) { mWeight = weight; } fopAc_ac_c* GetAc() { return mActor; } + fopAc_ac_c* GetActor() const { return mActor; } void SetActor(void* ac) { mActor = (fopAc_ac_c*)ac; } cXyz* GetCCMoveP() { return &mXyz; } + unsigned int GetApid() const { return mApid; } }; // Size = 0x1C STATIC_ASSERT(0x1C == sizeof(cCcD_Stts)); @@ -409,7 +422,7 @@ public: u32 GetAtGrp() const { return mObjAt.GetGrp(); } u32 GetCoGrp() const { return mObjCo.GetGrp(); } int GetTgType() const { return mObjTg.GetType(); } - int GetAtType() const { return mObjAt.GetType(); } + u32 GetAtType() const { return mObjAt.GetType(); } bool ChkTgSet() const { return mObjTg.ChkSet(); } bool ChkAtSet() const { return mObjAt.ChkSet(); } bool ChkCoSet() const { return mObjCo.ChkSet(); } @@ -463,6 +476,7 @@ public: cCcD_Stts* GetStts() { return mStts; } void SetStts(cCcD_Stts* stts) { mStts = stts; } cCcD_DivideInfo& GetDivideInfo() { return mDivideInfo; } + cCcD_DivideInfo* GetPDivideInfo() { return &mDivideInfo; } int ChkBsRevHit() const { return field_0x40 & 2; } private: diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index 7f65a3a121..32c0cc8fb6 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -11,7 +11,7 @@ enum WeightType { }; class cCcS { -private: +public: /* 0x0000 */ cCcD_Obj* mpObjAt[0x100]; /* 0x0400 */ cCcD_Obj* mpObjTg[0x300]; /* 0x1000 */ cCcD_Obj* mpObjCo[0x100]; @@ -23,7 +23,6 @@ private: /* 0x2808 */ cCcD_DivideArea mDivideArea; /* 0x2848 vtable */ -public: /* 80264A6C */ cCcS(); /* 80264A94 */ void Ct(); /* 80264B60 */ void Dt(); diff --git a/include/SSystem/SComponent/c_m3d_g_cps.h b/include/SSystem/SComponent/c_m3d_g_cps.h index 14315a9fc3..20104043da 100644 --- a/include/SSystem/SComponent/c_m3d_g_cps.h +++ b/include/SSystem/SComponent/c_m3d_g_cps.h @@ -7,10 +7,10 @@ #include "dolphin/types.h" struct cM3dGCpsS { - Vec mStart; - Vec mEnd; - f32 mRadius; -}; + /* 0x00 */ Vec mStart; + /* 0x0C */ Vec mEnd; + /* 0x18 */ f32 mRadius; +}; // Size: 0x1C class cM3dGCps : public cM3dGLin { public: diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h index de48572064..cc00a53c8b 100644 --- a/include/SSystem/SComponent/c_m3d_g_sph.h +++ b/include/SSystem/SComponent/c_m3d_g_sph.h @@ -7,9 +7,9 @@ #include "dolphin/types.h" struct cM3dGSphS { - Vec mCenter; - f32 mRadius; -}; + /* 0x0 */ Vec mCenter; + /* 0xC */ f32 mRadius; +}; // Size: 0x10 class cM3dGSph { private: diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index b875f06b23..ada8df1193 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -136,6 +136,7 @@ struct cXyz : Vec { f32 getMagXZ() const { return cXyz(this->x, 0, this->z).getSquareMag(); } f32 getDotProduct(const Vec& other) const { return PSVECDotProduct(this, &other); } + f32 inprod(const Vec& other) const { return getDotProduct(other); } }; #endif /* C_XYZ_H */ diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 64e2a8e7f9..39bde53427 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -143,6 +143,13 @@ public: /* 802C1A14 */ virtual void startCollisionSE(u32, u32); /* 802C1B7C */ void setLinkSearch(bool); /* 802C1B90 */ void setEnemyName(char const*); -}; + +private: + /* 0x90 */ JSULink mLink; + /* 0xA0 */ u8 mEnemyID; + /* 0xA1 */ u8 field_0xa1; + /* 0xA2 */ bool mLinkSearch; + /* 0xA3 */ u8 field_0xa3; +}; // Size: 0xA4 #endif /* Z2CREATURE_H */ diff --git a/include/c/c_damagereaction.h b/include/c/c_damagereaction.h index 0f417fa274..57f932fd25 100644 --- a/include/c/c_damagereaction.h +++ b/include/c/c_damagereaction.h @@ -3,4 +3,8 @@ #include "dolphin/types.h" +BOOL cDmrNowMidnaTalk(); + +extern u8 cDmr_SkipInfo; + #endif /* C_C_DAMAGEREACTION_H */ diff --git a/include/d/a/d_a_item_static.h b/include/d/a/d_a_item_static.h index 51296740f8..16b521d874 100644 --- a/include/d/a/d_a_item_static.h +++ b/include/d/a/d_a_item_static.h @@ -112,13 +112,13 @@ public: static u8 mFuncPtr[120]; //static procFunc mFuncPtr[9]; - static u8 m_cyl_src[68]; + static dCcD_SrcCyl m_cyl_src; static s32 m_timer_max; /* 0x92C */ s16 field_0x92c; /* 0x92E */ u16 field_0x92e; /* 0x930 */ cXyz field_0x930; - /* 0x93C */ u32 field_0x93c; + /* 0x93C */ int field_0x93c; /* 0x940 */ u16 field_0x940; /* 0x942 */ s16 field_0x942; /* 0x944 */ s16 field_0x944; diff --git a/include/d/a/d_a_obj_item.h b/include/d/a/d_a_obj_item.h index 77e766fe3c..26c732b92e 100644 --- a/include/d/a/d_a_obj_item.h +++ b/include/d/a/d_a_obj_item.h @@ -20,6 +20,14 @@ namespace daItem_prm { static inline u8 checkInWater(daItem_c* item) { return fopAcM_GetParamBit(item, 0x1C, 4); } + + static inline u8 getType(daItem_c* item) { + return (fopAcM_GetParam(item) >> 0x18) & 0xF; + } + + static inline u8 getSwitchNo(daItem_c* item) { + return (fopAcM_GetParam(item) >> 0x10) & 0xFF; + } }; #endif /* A_OBJ_D_A_OBJ_ITEM_H */ diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index dabaf3030e..f48e1abd10 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -63,9 +63,9 @@ public: HEAP_TYPE_5, }; - /* 80140DCC */ void __defctor(); // supposed to be the ctor? + /* 80140DCC */ void __defctor(); // compiler generated due to ctor with default param - daPy_anmHeap_c(u32); + daPy_anmHeap_c(u32 param_0 = 0); ~daPy_anmHeap_c(); void initData(); void* mallocBuffer(); @@ -350,6 +350,7 @@ public: RFLG0_UNK_8000000 = 0x8000000, RFLG0_UNK_4000000 = 0x4000000, RFLG0_UNK_4000 = 0x4000, + RFLG0_FRONT_ROLL_CRASH = 0x2000, RFLG0_ENEMY_ATTN_LOCK = 0x1000, RFLG0_UNK_400 = 0x400, RFLG0_UNK_80 = 0x80, @@ -692,6 +693,7 @@ public: u16 getSwordAtUpTime() const { return mSwordUpTimer; } bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); } bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); } + bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); } void offGoronSideMove() { if (i_checkGoronSideMove()) { diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index 7c53bf3373..93680c27b9 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -109,5 +109,7 @@ public: bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const&); bool dBgS_CheckBWallPoly(cBgS_PolyInfo const&); +void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, + bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6); #endif /* D_BG_D_BG_S_H */ diff --git a/include/d/bg/d_bg_w.h b/include/d/bg/d_bg_w.h index a2eb1be880..e1b161626c 100644 --- a/include/d/bg/d_bg_w.h +++ b/include/d/bg/d_bg_w.h @@ -312,6 +312,7 @@ public: /* 8007E3D8 */ virtual bool ChkGrpThrough(int, cBgS_GrpPassChk*, int); void SetCrrFunc(dBgW_CrrFunc func) { m_crr_func = func; } + void SetRideCallback(dBgW_RideCallback func) { m_ride_callback = func; } void OnMoveFlag() { m_flags |= 1; } private: diff --git a/include/d/cc/d_cc_d.h b/include/d/cc/d_cc_d.h index 53f5cad807..1105b7c0e8 100644 --- a/include/d/cc/d_cc_d.h +++ b/include/d/cc/d_cc_d.h @@ -4,51 +4,88 @@ #include "SSystem/SComponent/c_cc_d.h" #include "dolphin/types.h" -struct dCcD_SrcGAtTgCoCommonBase { - /* 0x00 */ u32 mGFlag; +enum dCcD_hitSe { + /* 0 */ dCcD_SE_NONE, + /* 1 */ dCcD_SE_SWORD, + /* 2 */ dCcD_SE_SHIELD_ATTACK, + /* 3 */ dCcD_SE_WOLF_KICK, + /* 4 */ dCcD_SE_WOLF_BITE, + /* 5 */ dCcD_SE_WOOD, + /* 6 */ dCcD_SE_HAMMER, + /* 7 */ dCcD_SE_ARROW_STICK, + /* 8 */ dCcD_SE_HOOKSHOT_STICK, + /* 9 */ dCcD_SE_METAL, + /* 10 */ dCcD_SE_STONE, + /* 11 */ dCcD_SE_HARD_BODY, + /* 12 */ dCcD_SE_SOFT_BODY, + /* 13 */ dCcD_SE_13, + /* 14 */ dCcD_SE_SWORD_STAB, + /* 15 */ dCcD_SE_15, + /* 16 */ dCcD_SE_SWORD_RUN, + /* 17 */ dCcD_SE_17, + /* 18 */ dCcD_SE_THROW_OBJ, + /* 19 */ dCcD_SE_SPINNER, + /* 20 */ dCcD_SE_COPYROD, + /* 21 */ dCcD_SE_STATUE_HAMMER, + /* 22 */ dCcD_SE_PACHINKO, + /* 23 */ dCcD_SE_23, }; +enum dCcG_At_Spl { + /* 0x0 */ dCcG_At_Spl_UNK_0, + /* 0x1 */ dCcG_At_Spl_UNK_1, +}; + +enum dCcG_Tg_Spl { + /* 0x0 */ dCcG_Tg_Spl_UNK_0, + /* 0x1 */ dCcG_Tg_Spl_UNK_1, +}; + +struct dCcD_SrcGAtTgCoCommonBase { + /* 0x0 */ u32 mGFlag; +}; // Size: 0x4 + struct dCcD_SrcGObjAt { - u8 mSe; - u8 mHitMark; - u8 mSpl; - u8 mMtrl; - dCcD_SrcGAtTgCoCommonBase mBase; -}; + /* 0x0 */ u8 mSe; // Sound Effect ID + /* 0x1 */ u8 mHitMark; // Hit Mark particle ID + /* 0x2 */ u8 mSpl; + /* 0x3 */ u8 mMtrl; + /* 0x4 */ dCcD_SrcGAtTgCoCommonBase mBase; +}; // Size: 0x8 struct dCcD_SrcGObjTg { - u8 mSe; - u8 mHitMark; - u8 mSpl; - u8 mMtrl; - dCcD_SrcGAtTgCoCommonBase mBase; -}; + /* 0x0 */ u8 mSe; // Sound Effect ID + /* 0x1 */ u8 mHitMark; // Hit Mark particle ID + /* 0x2 */ u8 mSpl; + /* 0x3 */ u8 mMtrl; + /* 0x4 */ dCcD_SrcGAtTgCoCommonBase mBase; +}; // Size: 0x8 struct dCcD_SrcGObjInf { - cCcD_SrcObj mObj; - dCcD_SrcGObjAt mGObjAt; - dCcD_SrcGObjTg mGObjTg; - dCcD_SrcGAtTgCoCommonBase mGObjCo; -}; + /* 0x00 */ cCcD_SrcObj mObj; + /* 0x1C */ dCcD_SrcGObjAt mGObjAt; + /* 0x24 */ dCcD_SrcGObjTg mGObjTg; + /* 0x2C */ dCcD_SrcGAtTgCoCommonBase mGObjCo; +}; // Size: 0x30 struct dCcD_SrcSph { - dCcD_SrcGObjInf mObjInf; - cM3dGSphS mSph; -}; + /* 0x00 */ dCcD_SrcGObjInf mObjInf; + /* 0x30 */ cM3dGSphS mSph; +}; // Size: 0x40 struct dCcD_SrcTri { - dCcD_SrcGObjInf mObjInf; -}; + /* 0x00 */ dCcD_SrcGObjInf mObjInf; +}; // Size: 0x30 struct dCcD_SrcCyl { - dCcD_SrcGObjInf mObjInf; - cM3dGCylS mCyl; -}; + /* 0x00 */ dCcD_SrcGObjInf mObjInf; + /* 0x30 */ cM3dGCylS mCyl; +}; // Size: 0x44 struct dCcD_SrcCps { - dCcD_SrcGObjInf mObjInf; - cM3dGCpsS mCps; -}; + /* 0x00 */ dCcD_SrcGObjInf mObjInf; + /* 0x30 */ cM3dGCpsS mCps; +}; // Size: 0x4C class dCcD_GStts : public cCcD_GStts { public: @@ -58,8 +95,17 @@ public: /* 8008523C */ virtual ~dCcD_GStts() {} void ClrTg() { mTg = 0; } void SetAtApid(unsigned int id) { mAtApid = id; } + void SetTgApid(unsigned int id) { mTgApid = id; } u8 GetRoomId() { return mRoomId; } void SetRoomId(int id) { mRoomId = id; } + unsigned int GetAtOldApid() { return mAtOldApid; } + unsigned int GetTgOldApid() { return mTgOldApid; } + bool ChkNoActor() { return field_0x1C & 1;} + bool ChkNoneActorPerfTblId() { return field_0x08 == 0xFFFF; } + dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mAt; } + void SetAtSpl(dCcG_At_Spl spl) { mAt = spl; } + dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mTg; } + void SetTgSpl(dCcG_Tg_Spl spl) { mTg = spl; } // private: /* 0x04 */ u8 mAt; @@ -85,11 +131,6 @@ public: }; // Size = 0x3C -enum dCcG_At_Spl { - /* 0x0 */ dCcG_At_Spl_UNK_0, - /* 0x1 */ dCcG_At_Spl_UNK_1, -}; - class dCcD_GObjInf; typedef void (*dCcD_HitCallback)(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -115,6 +156,7 @@ public: /* 80083724 */ void SubtractEffCounter(); /* 80083748 */ bool ChkEffCounter(); /* 80083CA0 */ virtual ~dCcD_GAtTgCoCommonBase() {} + void ResetEffCounter() { mEffCounter = 0; } u32 GetGFlag() const { return mGFlag; } u32 GetRPrm() const { return mRPrm; } @@ -122,9 +164,11 @@ public: u32 MskRPrm(u32 mask) const { return mRPrm & mask; } bool ChkSPrm(u32 mask) const { return MskSPrm(mask); } void OnSPrm(u32 flag) { mGFlag |= flag; } + void OnRPrm(u32 flag) { mRPrm |= flag; } void OffSPrm(u32 flag) { mGFlag &= ~flag; } bool ChkRPrm(u32 flag) const { return MskRPrm(flag); } void SetHitCallback(dCcD_HitCallback callback) { mHitCallback = callback; } + dCcD_HitCallback GetHitCallback() { return mHitCallback; } }; // Size = 0x1C class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase { @@ -141,6 +185,9 @@ public: u8 GetSe() { return mSe; } u8 GetSpl() { return mSpl; } u8 GetMtrl() { return mMtrl; } + u8 GetHitMark() { return mHitMark; } + void SetRVec(cXyz& vec) { mRVec = vec; } + void SetHitPos(cXyz& pos) { mHitPos = pos; } // private: /* 0x1C */ u8 mSe; @@ -160,7 +207,15 @@ public: cXyz& GetVec() { return mVec; } void SetShieldFrontRangeYAngle(s16* angle) { mShieldFrontRangeYAngle = angle; } void SetMtrl(u8 mtrl) { mMtrl = mtrl; } + u8 GetMtrl() { return mMtrl; } void SetHitMark(CcG_Tg_HitMark mark) { mHitMark = mark; } + s16* GetShieldFrontRangeYAngle() { return mShieldFrontRangeYAngle; } + s16 GetShieldRange() { return mShieldRange; } + u8 GetSpl() { return mSpl; } + u8 GetHitMark() { return mHitMark; } + void SetRVec(cXyz& vec) { mRVec = vec; } + cXyz* GetVecP() { return &mVec; } + void SetHitPos(cXyz& pos) { mHitPos = pos; } private: /* 0x1C */ u8 mSe; @@ -220,13 +275,15 @@ public: fopAc_ac_c* GetAtHitAc() { return mGObjAt.GetAc(); } bool ChkAtShieldHit() { return mGObjAt.ChkRPrm(1); } cXyz* GetAtVecP() { return mGObjAt.GetVecP(); } + cXyz* GetTgVecP() { return mGObjTg.GetVecP(); } void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetAtSpl(spl); } void SetAtHitCallback(dCcD_HitCallback callback) { mGObjAt.SetHitCallback(callback); } void SetTgHitCallback(dCcD_HitCallback callback) { mGObjTg.SetHitCallback(callback); } void SetCoHitCallback(dCcD_HitCallback callback) { mGObjCo.SetHitCallback(callback); } u8 GetAtSe() { return mGObjAt.GetSe(); } - s32 GetAtSpl() { return mGObjAt.GetSpl(); } + dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mGObjAt.GetSpl(); } u8 GetAtMtrl() { return mGObjAt.GetMtrl(); } + u8 GetTgMtrl() { return mGObjTg.GetMtrl(); } fopAc_ac_c* GetTgHitAc() { return mGObjTg.GetAc(); } void SetTgShieldFrontRangeYAngle(s16* angle) { mGObjTg.SetShieldFrontRangeYAngle(angle); } void OffTgWolfSpNoDamage() { mGObjTg.OffSPrm(0x800); } @@ -239,6 +296,44 @@ public: void OnTgShieldFrontRange() { mGObjTg.OnSPrm(0x8); } void OffTgShieldFrontRange() { mGObjTg.OffSPrm(0x8); } bool ChkTgIronBallRebound() { return mGObjTg.ChkSPrm(0x100); } + s16* GetTgShieldFrontRangeYAngle() { return mGObjTg.GetShieldFrontRangeYAngle(); } + s16 GetTgShieldRange() { return mGObjTg.GetShieldRange(); } + bool ChkTgShield() { return mGObjTg.ChkSPrm(1); } + bool ChkTgSpShield() { return mGObjTg.ChkSPrm(0x40); } + bool ChkTgSmallShield() { return mGObjTg.ChkSPrm(0x10); } + bool ChkTgShieldFrontRange() { return mGObjTg.ChkSPrm(8); } + bool ChkAtNoConHit() { return mGObjAt.ChkSPrm(1); } + bool ChkAtStopNoConHit() { return mGObjAt.ChkSPrm(0x4); } + bool ChkTgNoConHit() { return mGObjTg.ChkSPrm(2); } + bool ChkTgStopNoConHit() { return mGObjTg.ChkSPrm(0x2000); } + bool ChkCoNoCamHit() { return mGObjCo.ChkSPrm(2); } + dCcD_HitCallback GetCoHitCallback() { return mGObjCo.GetHitCallback(); } + dCcD_HitCallback GetAtHitCallback() { return mGObjAt.GetHitCallback(); } + dCcD_HitCallback GetTgHitCallback() { return mGObjTg.GetHitCallback(); } + void SetCoHitApid(unsigned int apid) { mGObjCo.SetHitApid(apid); } + void SetAtHitApid(unsigned int apid) { mGObjAt.SetHitApid(apid); } + void SetTgHitApid(unsigned int apid) { mGObjTg.SetHitApid(apid); } + void OnCoHitNoActor() { mGObjCo.OnRPrm(1); } + void OnAtHitNoActor() { mGObjAt.OnRPrm(2); } + void OnTgHitNoActor() { mGObjTg.OnRPrm(1); } + bool ChkTgWolfSpNoDamage() { return mGObjTg.ChkSPrm(0x800); } + bool ChkAtNoHitMark() { return mGObjAt.ChkSPrm(2); } + bool ChkTgNoHitMark() { return mGObjTg.ChkSPrm(4); } + bool ChkTgHookShotNoHitMark() { return mGObjTg.ChkSPrm(0x400); } + bool ChkTgArrowNoHitMark() { return mGObjTg.ChkSPrm(0x1000); } + dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mGObjTg.GetSpl(); } + int GetTgHitMark() { return mGObjTg.GetHitMark(); } + int GetAtHitMark() { return mGObjAt.GetHitMark(); } + bool ChkAtEffCounter() { return mGObjAt.ChkEffCounter(); } + bool ChkTgEffCounter() { return mGObjTg.ChkEffCounter(); } + void SetAtEffCounterTimer() { mGObjAt.SetEffCounterTimer(); } + void SetTgEffCounterTimer() { mGObjTg.SetEffCounterTimer(); } + void OnTgShieldHit() { mGObjTg.OnRPrm(2); } + void OnAtShieldHit() { mGObjAt.OnRPrm(1); } + void SetTgRVec(cXyz& vec) { mGObjTg.SetRVec(vec); } + void SetAtRVec(cXyz& vec) { mGObjAt.SetRVec(vec); } + void SetTgHitPos(cXyz& pos) { mGObjTg.SetHitPos(pos); } + void SetAtHitPos(cXyz& pos) { mGObjAt.SetHitPos(pos); } static u32 const m_hitSeID[24]; diff --git a/include/d/cc/d_cc_s.h b/include/d/cc/d_cc_s.h index 55874fcae1..7ad3000abe 100644 --- a/include/d/cc/d_cc_s.h +++ b/include/d/cc/d_cc_s.h @@ -11,21 +11,21 @@ public: dCcS() {} /* 80085ED4 */ void Ct(); /* 80085F08 */ void Dt(); - /* 80085F28 */ void ChkShieldFrontRange(cCcD_Obj*, cCcD_Obj*, int, cXyz const*); - /* 800860F8 */ void ChkShield(cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cXyz const*); + /* 80085F28 */ bool ChkShieldFrontRange(cCcD_Obj*, cCcD_Obj*, int, cXyz const*); + /* 800860F8 */ bool ChkShield(cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cXyz const*); /* 800861B0 */ void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*); - /* 80086360 */ void GetRank(u8); + /* 80086360 */ int GetRank(u8); /* 8008685C */ void ProcAtTgHitmark(bool, bool, cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, dCcD_GStts*, dCcD_GStts*, cXyz*, bool); - /* 80086D8C */ void ChkCamera(cXyz&, cXyz&, f32, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*); - /* 80086FBC */ void chkCameraPoint(cXyz const&, cCcD_ShapeAttr::Shape*, fopAc_ac_c*, + /* 80086D8C */ bool ChkCamera(cXyz&, cXyz&, f32, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*); + /* 80086FBC */ bool chkCameraPoint(cXyz const&, cCcD_ShapeAttr::Shape*, fopAc_ac_c*, fopAc_ac_c*); /* 800872AC */ void DrawAfter(); /* 800872B0 */ void Move(); /* 800872D0 */ void Draw(); /* 8008730C */ void MassClear(); - /* 80087330 */ void ChkAtTgMtrlHit(u8, u8); + /* 80087330 */ int ChkAtTgMtrlHit(u8, u8); /* 8008640C */ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); /* 80086240 */ virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*, diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index b6187c81c0..7b23faf7e8 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -388,7 +388,9 @@ public: } void setCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus = flag; } void onCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus |= flag; } - void offCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus &= ~flag; } + void offCameraAttentionStatus(int i, u32 flag) { + mCameraInfo[i].mCameraAttentionStatus &= ~flag; + } void setCameraInfo(int camIdx, camera_class* p_cam, int param_2, int param_3, int param_4) { mCameraInfo[camIdx].mCamera = p_cam; mCameraInfo[camIdx].field_0x4 = param_2; @@ -932,7 +934,8 @@ inline void dComIfGs_setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) { } inline void dComIfGs_setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(i_newBomb, i_bombNum, i_setNum); + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(i_newBomb, i_bombNum, + i_setNum); } inline void dComIfGs_setEmptyBottle() { @@ -1374,10 +1377,10 @@ inline bool dComIfGs_isPlayerFieldLastStayFieldDataExistFlag() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().isFieldDataExistFlag(); } -inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos, s16 i_angle, s8 i_point, - u8 i_region) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(i_stage, i_pos, i_angle, i_point, - i_region); +inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos, s16 i_angle, + s8 i_point, u8 i_region) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(i_stage, i_pos, i_angle, + i_point, i_region); } inline void dComIfGs_setStartPoint(s16 i_point) { @@ -1528,7 +1531,6 @@ inline int dComIfGs_createZone(int roomNo) { return g_dComIfG_gameInfo.info.createZone(roomNo); } - void dComIfGp_setSelectItem(int index); s32 dComIfGp_offHeapLockFlag(int flag); void dComIfGp_createSubExpHeap2D(); @@ -2350,6 +2352,12 @@ inline void dComIfGp_createSimpleModel() { g_dComIfG_gameInfo.play.createSimpleModel(); } +inline void i_dComIfGp_setHitMark(u16 i_hitmark, fopAc_ac_c* param_1, const cXyz* param_2, + const csXyz* param_3, const cXyz* param_4, u32 i_atType) { + g_dComIfG_gameInfo.play.getParticle()->setHitMark(i_hitmark, param_1, param_2, param_3, param_4, + i_atType); +} + inline s32 dComIfGp_roomControl_getStayNo() { return dStage_roomControl_c::getStayNo(); } @@ -2626,36 +2634,42 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, param_9, param_10, 1.0f); } -inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3) { - return dComIfGp_particle_set(param_0,param_1,param_2,param_3,0,0,0xFF,0,0xFFFFFFFF,0,0,0); +inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, + const dKy_tevstr_c* param_3) { + return dComIfGp_particle_set(param_0, param_1, param_2, param_3, 0, 0, 0xFF, 0, 0xFFFFFFFF, 0, + 0, 0); } -inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, - const csXyz* param_4, const cXyz* param_5, u8 param_6, - dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9, - const GXColor* param_10, const cXyz* param_11) { +inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, + const dKy_tevstr_c* param_3, const csXyz* param_4, + const cXyz* param_5, u8 param_6, + dPa_levelEcallBack* param_7, s8 param_8, + const GXColor* param_9, const GXColor* param_10, + const cXyz* param_11) { return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10, param_11, 1.0f); } inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const csXyz* param_3, - const cXyz* param_4, u8 param_5, dPa_levelEcallBack* param_6, - s8 param_7, const GXColor* param_8, const GXColor* param_9, - const cXyz* param_10) { + const cXyz* param_4, u8 param_5, + dPa_levelEcallBack* param_6, s8 param_7, + const GXColor* param_8, const GXColor* param_9, + const cXyz* param_10) { return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, NULL, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10, 1.0f); } inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, - const cXyz* param_3) { + const cXyz* param_3) { return dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL, NULL, NULL); } -inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, - const csXyz* param_3, const cXyz* param_4) { +inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, + const dKy_tevstr_c* param_2, const csXyz* param_3, + const cXyz* param_4) { return dComIfGp_particle_set(param_0, param_1, param_2, param_3, param_4, 0xFF, NULL, -1, NULL, NULL, NULL); } @@ -2666,28 +2680,34 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, NULL, NULL); } -inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, - const GXColor* param_4, const GXColor* param_5, f32 param_6, u8 param_7, - const csXyz* param_8, const cXyz* param_9, dPa_levelEcallBack* param_10, - s8 param_11, const cXyz* param_12) { - return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_3, - param_8, param_9, param_7, param_10, - param_11, param_4, param_5, param_12, - param_6); +inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* param_2, + const dKy_tevstr_c* param_3, const GXColor* param_4, + const GXColor* param_5, f32 param_6, u8 param_7, + const csXyz* param_8, const cXyz* param_9, + dPa_levelEcallBack* param_10, s8 param_11, + const cXyz* param_12) { + return g_dComIfG_gameInfo.play.getParticle()->setNormal( + param_0, param_1, param_2, param_3, param_8, param_9, param_7, param_10, param_11, param_4, + param_5, param_12, param_6); } -inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, - const GXColor* param_3, const GXColor* param_4, f32 param_5, u8 param_6, - const csXyz* param_7, const cXyz* param_8, dPa_levelEcallBack* param_9, +inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, + const dKy_tevstr_c* param_2, + const GXColor* param_3, const GXColor* param_4, + f32 param_5, u8 param_6, const csXyz* param_7, + const cXyz* param_8, dPa_levelEcallBack* param_9, s8 param_10, const cXyz* param_11) { return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_7, param_8, param_6, param_9, param_10, param_3, param_4, param_11, param_5); } -inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, - const GXColor* param_3, const GXColor* param_4, f32 param_5, u8 param_6) { - return dComIfGp_particle_setColor(param_0, param_1, param_2, param_3, param_4, param_5, param_6, NULL, NULL, NULL, -1, NULL); +inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, + const dKy_tevstr_c* param_2, + const GXColor* param_3, const GXColor* param_4, + f32 param_5, u8 param_6) { + return dComIfGp_particle_setColor(param_0, param_1, param_2, param_3, param_4, param_5, param_6, + NULL, NULL, NULL, -1, NULL); } inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) { diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index 7ae58debf3..b7158748af 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -76,9 +76,9 @@ struct dItem_data { static u8 getShadowSize(u8 index) { return item_info[index].mShadowSize; } - static u8 getH(u8 index) { return item_info[index].mH; } + static const u8 getH(u8 index) { return item_info[index].mH; } - static u8 getR(u8 index) { return item_info[index].mR; } + static const u8 getR(u8 index) { return item_info[index].mR; } static u16 getFieldHeapSize(u8 index) { return field_item_res[index].mHeapSize; } diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h index 9d7dfc39c0..ff512aed58 100644 --- a/include/d/d_jnt_col.h +++ b/include/d/d_jnt_col.h @@ -6,7 +6,12 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" -class dJntColData_c {}; +class dJntColData_c { +public: + u8 field_0x0; + s8 mType; + u8 field_0x2[0xC - 0x2]; +}; class dJntCol_c { public: @@ -15,12 +20,15 @@ public: /* 80035CC8 */ void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*); /* 80035DC8 */ void searchNearPos(cM3dGLin const*, cXyz const*, cXyz*, int) const; /* 80036AEC */ void getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const; - /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; + /* 80036C44 */ int getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; /* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*); bool checkPassNum(int bit) { return field_0xc & (1 << bit); } void onPassNum(int num) { field_0xc |= (1 << num); } void offPassNum(int num) { field_0xc &= ~(1 << num); } + bool checkShieldType(int i) { return getType(i) == 3; } + + s8 getType(int i) { return mData[i].mType; } /* 0x00 */ dJntColData_c* mData; /* 0x04 */ J3DModel* mModel; diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 2224e4a00f..6a3846f1e8 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -67,6 +67,7 @@ public: /* 8004974C */ virtual void end(); void remove() { end(); } + JPABaseEmitter* getEmitter() { return mpEmitter; } /* 0x04 */ JPABaseEmitter* mpEmitter; /* 0x08 */ const cXyz* field_0x8; diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index eb8e47bafc..978639b8ad 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -73,6 +73,10 @@ inline void GXPosition1x16(u16 x) { GFX_FIFO(u16) = x; } +inline void GXPosition1x8(u8 x) { + GFX_FIFO(u8) = x; +} + inline void GXPosition3s8(s8 x, s8 y, s8 z) { GFX_FIFO(s8) = x; GFX_FIFO(s8) = y; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 78c3c07c2d..bfadd5f5a7 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -286,6 +286,10 @@ inline const cXyz& fopAcM_GetPosition_p(const fopAc_ac_c* p_actor) { return p_actor->current.pos; } +inline dJntCol_c* fopAcM_GetJntCol(fopAc_ac_c* i_actor) { + return i_actor->mJntCol; +} + inline void dComIfGs_onSwitch(int i_no, int i_roomNo); inline void dComIfGs_offSwitch(int i_no, int i_roomNo); inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo); @@ -544,6 +548,10 @@ inline f32 fopAcM_searchPlayerDistanceXZ2(const fopAc_ac_c* actor) { return fopAcM_searchActorDistanceXZ2(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0)); } +inline f32 fopAcM_searchPlayerDistanceXZ(const fopAc_ac_c* actor) { + return fopAcM_searchActorDistanceXZ(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0)); +} + inline f32 fopAcM_searchPlayerDistance(const fopAc_ac_c* actor) { return fopAcM_searchActorDistance(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0)); } @@ -555,6 +563,16 @@ inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_ mDoAud_seStart(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo)); } +inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { + s8 roomNo = fopAcM_GetRoomNo(actor); + mDoAud_seStart(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo)); +} + +inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { + s8 roomNo = fopAcM_GetRoomNo(actor); + i_mDoAud_seStartLevel(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo)); +} + extern "C" { void fopAcM_initManager__Fv(void); void fopAcM_CreateAppend__Fv(void); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 9d344948f8..642cf2fdbe 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -20,6 +20,7 @@ void mDoMtx_YrotM(Mtx, s16); void mDoMtx_MtxToRot(CMtxP, csXyz*); void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, s16 param_3); void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]); +void mDoMtx_ZrotM(Mtx mtx, s16 z); inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) { PSMTXMultVecSR(m, src, dst); @@ -37,6 +38,12 @@ inline void mDoMtx_trans(Mtx m, f32 x, f32 y, f32 z) { PSMTXTrans(m,x,y,z); } +inline void mDoMtx_multVecZero(MtxP param_0, Vec* param_1) { + param_1->x = param_0[0][3]; + param_1->y = param_0[1][3]; + param_1->z = param_0[2][3]; +} + class mDoMtx_stack_c { public: /* 8000CCC8 */ static bool push(); @@ -59,6 +66,7 @@ public: static void scaleS(f32 x, f32 y, f32 z) { PSMTXScale(now, x, y, z); } static void multVec(const Vec* a, Vec* b) { PSMTXMultVec(now, a, b); } static void multVecSR(const Vec* a, Vec* b) { PSMTXMultVecSR(now, a, b); } + static void multVecZero(Vec* v) { mDoMtx_multVecZero(now, v); } static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); } static void XYZrotM(s16 x, s16 y, s16 z) { mDoMtx_XYZrotM(now, x, y, z); } static void ZXYrotS(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotS(now, x, y, z); } @@ -66,8 +74,10 @@ public: static void YrotM(s16 y) { mDoMtx_YrotM(now, y); } static void YrotS(s16 y) { mDoMtx_YrotS(now, y); } static void XrotM(s16 x) { mDoMtx_XrotM(now, x); } + static void ZrotM(s16 z) { mDoMtx_ZrotM(now, z); } static void inverse() { PSMTXInverse(now, now); } static void concat(const Mtx m) { PSMTXConcat(now, m, now); } + static void revConcat(const Mtx m) { PSMTXConcat(m, now, now); } static void copy(const Mtx m) { PSMTXCopy(m, now); } static Mtx now; @@ -91,10 +101,4 @@ public: /* 0x118 */ mDoMtx_quatStack_c* field_0x118; }; // Size: 0x11C -inline void mDoMtx_multVecZero(MtxP param_0, Vec* param_1) { - param_1->x = param_0[0][3]; - param_1->y = param_0[1][3]; - param_1->z = param_0[2][3]; -} - #endif /* M_DO_M_DO_MTX_H */ diff --git a/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h b/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h index 97db1a0e0f..9dae6051e7 100644 --- a/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h +++ b/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h @@ -1,6 +1,43 @@ #ifndef D_A_B_OH2_H #define D_A_B_OH2_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +// fix/move to d_a_b_ob later +class b_ob_class : public fopEn_enemy_c { +public: + /* 0x05AC */ u8 field_0x5ac[0x5c0 - 0x5ac]; + /* 0x05C0 */ mDoExt_McaMorf* field_0x5c0; + /* 0x05C4 */ u8 field_0x5c4[0x4752 - 0x5c4]; + /* 0x4752 */ s16 field_0x4752; + /* 0x4754 */ u8 field_0x4754[0x47a0 - 0x4754]; + /* 0x47A0 */ f32 field_0x47a0; + /* 0x47A4 */ u8 field_0x47a4[0x5d04 - 0x47a4]; + /* 0x5D04 */ f32 field_0x5d04; +}; + +class b_oh2_class : public fopEn_enemy_c { +public: + /* 0x5AC */ request_of_phase_process_class mPhase; + /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf; + /* 0x5B8 */ mDoExt_invisibleModel mInvisModel; + /* 0x5C0 */ mDoExt_btkAnm* mpBtk; + /* 0x5C4 */ mDoExt_brkAnm* mpBrk; + /* 0x5C8 */ int field_0x5c8; + /* 0x5CC */ s16 field_0x5cc; + /* 0x5CE */ s16 field_0x5ce; + /* 0x5D0 */ u8 field_0x5d0; + /* 0x5D2 */ s16 field_0x5d2[4]; + /* 0x5DA */ s16 field_0x5da; + /* 0x5DC */ s16 field_0x5dc; + /* 0x5E0 */ f32 field_0x5e0; + /* 0x5E4 */ f32 field_0x5e4; + /* 0x5E8 */ f32 field_0x5e8[30]; + /* 0x660 */ cXyz field_0x660[31]; + /* 0x7D4 */ csXyz field_0x7d4[31]; + /* 0x88E */ u8 field_0x88e[0x898 - 0x88e]; + /* 0x898 */ Z2CreatureEnemy mZ2Enemy; + /* 0x93C */ u8 field_0x93c[0x948 - 0x93C]; +}; #endif /* D_A_B_OH2_H */ diff --git a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h index debd03f284..da1aa2f64e 100644 --- a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h +++ b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h @@ -1,6 +1,17 @@ #ifndef D_A_SET_BGOBJ_H #define D_A_SET_BGOBJ_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +class daSetBgObj_c : public fopAc_ac_c { +public: + /* 80031870 */ static const char* getArcName(fopAc_ac_c*); + /* 80485D78 */ int CreateInit(); + /* 80485DFC */ int create(); + /* 80485E88 */ int Delete(); + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ const char mArcName[16]; +}; #endif /* D_A_SET_BGOBJ_H */ diff --git a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h index 1c34e122af..0bebd778e9 100644 --- a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h +++ b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h @@ -1,6 +1,35 @@ #ifndef D_A_OBJ_WEB0_H #define D_A_OBJ_WEB0_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +class obj_web0_class : public fopAc_ac_c { +public: + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ u8 mPrm0; + /* 0x571 */ u8 mScaleXY; + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ mDoExt_brkAnm* mpBrk; + /* 0x57C */ s16 field_0x57c; + /* 0x57E */ u8 field_0x57e[0x582 - 0x57e]; + /* 0x582 */ s16 mReboundTimer; + /* 0x584 */ s16 field_0x584[2]; + /* 0x588 */ s16 mHitTimer; + /* 0x58A */ u8 field_0x58a[0x590 - 0x58a]; + /* 0x590 */ Mtx mMtx; + /* 0x5C0 */ dBgW* mpBgW; + /* 0x5C4 */ dCcD_Stts mStts; + /* 0x600 */ dCcD_Sph mSphCc; + /* 0x738 */ u8 mDeleteTimer; + /* 0x739 */ u8 field_0x739; +}; // Size: 0x73C + +class daObj_Web0_HIO_c { +public: + /* 80D3452C */ daObj_Web0_HIO_c(); + /* 80D350E4 */ virtual ~daObj_Web0_HIO_c() {} + + /* 0x4 */ s8 field_0x4; +}; #endif /* D_A_OBJ_WEB0_H */ diff --git a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h index f343cdd036..54f73702cc 100644 --- a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h +++ b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_WEB1_H #define D_A_OBJ_WEB1_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +class obj_web1_class : public fopAc_ac_c { +public: + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ u8 mPrm0; + /* 0x571 */ u8 mScaleX; + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ mDoExt_brkAnm* mpBrk; + /* 0x57C */ Z2SoundObjSimple mZ2SoundObj; + /* 0x59C */ s16 field_0x59c; + /* 0x59E */ s16 mActionMode; + /* 0x5A0 */ u8 field_0x5a0[2]; + /* 0x5A2 */ s16 field_0x5a2[2]; + /* 0x5A6 */ s16 mHitTimer; + /* 0x5A8 */ s16 mReboundTimer; + /* 0x5AA */ s16 field_0x5aa; + /* 0x5AC */ f32 mDistToActor; + /* 0x5B0 */ f32 field_0x5b0; + /* 0x5B4 */ s8 mDeleteTimer; + /* 0x5B5 */ u8 field_0x5b5[0x5C0 - 0x5B5]; + /* 0x5C0 */ Mtx mMtx; + /* 0x5F0 */ dBgW* mpBgW; + /* 0x5F4 */ dCcD_Stts mStts; + /* 0x630 */ dCcD_Cyl mCylCc; + /* 0x76C */ u8 field_0x76c; +}; // Size: 0x770 + +class daObj_Web1_HIO_c { +public: + /* 80D353AC */ daObj_Web1_HIO_c(); + /* 80D36028 */ virtual ~daObj_Web1_HIO_c() {} + + /* 0x4 */ s8 field_0x4; +}; #endif /* D_A_OBJ_WEB1_H */ diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp index 4d4c48ce26..7940f6ae33 100644 --- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp +++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp @@ -61,7 +61,6 @@ public: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf; /* 0x5B8 */ Z2CreatureEnemy mZ2Enemy; - /* 0x648 */ u8 field_0x648[0x14]; /* 0x65C */ int field_0x65c; /* 0x660 */ u8 field_0x660; /* 0x661 */ u8 field_0x661[0x668 - 0x661]; diff --git a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp index 187ea03052..1780ddaa75 100644 --- a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp +++ b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp @@ -1,496 +1,337 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_b_oh2 -// +/** + * d_a_b_oh2.cpp + * Morpheel Tentacle + */ #include "rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" +#include "c/c_damagereaction.h" +#include "d/d_procname.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DModel {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 8061E19C */ ~cXyz(); - /* 8061EA2C */ cXyz(); -}; - -struct mDoExt_invisibleModel { - /* 8000E53C */ void create(J3DModel*, u8); - /* 8000E7C0 */ void entryDL(cXyz*); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature {}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 800110B0 */ void play(u32, s8); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct csXyz { - /* 8061E9EC */ ~csXyz(); - /* 8061EA28 */ csXyz(); -}; - -struct b_oh2_class {}; - -struct Z2CreatureEnemy { - /* 802C0F64 */ Z2CreatureEnemy(); - /* 802C1094 */ void init(Vec*, Vec*, u8, u8); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8061E820 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" static void nodeCallBack__FP8J3DJointi(); -extern "C" static void daB_OH2_Draw__FP11b_oh2_class(); -extern "C" static void dmcalc__FP11b_oh2_class(); -extern "C" void __dt__4cXyzFv(); -extern "C" static void action__FP11b_oh2_class(); -extern "C" static void daB_OH2_Execute__FP11b_oh2_class(); -extern "C" static bool daB_OH2_IsDelete__FP11b_oh2_class(); -extern "C" static void daB_OH2_Delete__FP11b_oh2_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daB_OH2_Create__FP10fopAc_ac_c(); -extern "C" void __dt__5csXyzFv(); -extern "C" void __ct__5csXyzFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" extern char const* const d_a_b_oh2__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void create__21mDoExt_invisibleModelFP8J3DModelUc(); -extern "C" void entryDL__21mDoExt_invisibleModelFP4cXyz(); -extern "C" void -__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); -extern "C" void play__16mDoExt_McaMorfSOFUlSc(); -extern "C" void modelCalc__16mDoExt_McaMorfSOFv(); -extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv(); -extern "C" void cDmrNowMidnaTalk__Fv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void MtxTrans__FfffUc(); -extern "C" void MtxScale__FfffUc(); -extern "C" void MtxPosition__FP4cXyzP4cXyz(); -extern "C" void __ct__15Z2CreatureEnemyFv(); -extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void __construct_array(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8061EA38-8061EA3C 000000 0004+00 5/5 0/0 0/0 .rodata @3678 */ -SECTION_RODATA static f32 const lit_3678 = 1.0f; -COMPILER_STRIP_GATE(0x8061EA38, &lit_3678); +extern "C" extern leafdraw_method_class g_fopAc_Method; /* 8061DCB8-8061DDB0 000078 00F8+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void nodeCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s" +static int nodeCallBack(J3DJoint* i_joint, int param_1) { + if (param_1 == 0) { + int jntNo = i_joint->getJntNo(); + J3DModel* model = j3dSys.getModel(); + b_oh2_class* area = (b_oh2_class*)model->getUserArea(); + + if (area != NULL) { + MtxTrans(area->field_0x660[jntNo].x, area->field_0x660[jntNo].y, + area->field_0x660[jntNo].z, 0); + mDoMtx_YrotM((MtxP)calc_mtx, area->field_0x7d4[jntNo].y); + mDoMtx_XrotM((MtxP)calc_mtx, area->field_0x7d4[jntNo].x); + mDoMtx_YrotM((MtxP)calc_mtx, -0x4000); + + MtxScale(1.0f, area->field_0x5e8[jntNo], area->field_0x5e8[jntNo], 1); + model->setAnmMtx(jntNo, (MtxP)calc_mtx); + } + } + + return 1; } -#pragma pop /* 8061DDB0-8061DE4C 000170 009C+00 1/0 0/0 0/0 .text daB_OH2_Draw__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daB_OH2_Draw(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s" +static int daB_OH2_Draw(b_oh2_class* i_this) { + J3DModel* model = i_this->mpMorf->getModel(); + + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(model, &i_this->mTevStr); + + i_this->mpBtk->entry(model->getModelData()); + i_this->mpBrk->entry(model->getModelData()); + i_this->mInvisModel.entryDL(NULL); + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8061EA3C-8061EA40 000004 0004+00 0/2 0/0 0/0 .rodata @3792 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3792[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8061EA3C, &lit_3792); -#pragma pop - -/* 8061EA40-8061EA44 000008 0004+00 0/1 0/0 0/0 .rodata @3793 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3793 = 200.0f; -COMPILER_STRIP_GATE(0x8061EA40, &lit_3793); -#pragma pop - -/* 8061EA44-8061EA48 00000C 0004+00 0/1 0/0 0/0 .rodata @3794 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3794 = 100.0f; -COMPILER_STRIP_GATE(0x8061EA44, &lit_3794); -#pragma pop - -/* 8061EA48-8061EA4C 000010 0004+00 0/1 0/0 0/0 .rodata @3795 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3795 = 123.0f; -COMPILER_STRIP_GATE(0x8061EA48, &lit_3795); -#pragma pop - -/* 8061EA4C-8061EA50 000014 0004+00 0/2 0/0 0/0 .rodata @3796 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3796 = -50000.0f; -COMPILER_STRIP_GATE(0x8061EA4C, &lit_3796); -#pragma pop - -/* 8061EA50-8061EA54 000018 0004+00 0/1 0/0 0/0 .rodata @3797 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3797 = -20.0f; -COMPILER_STRIP_GATE(0x8061EA50, &lit_3797); -#pragma pop - -/* 8061EA54-8061EA58 00001C 0004+00 0/1 0/0 0/0 .rodata @3798 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3798 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(0x8061EA54, &lit_3798); -#pragma pop - -/* 8061EA58-8061EA5C 000020 0004+00 0/1 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3799 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x8061EA58, &lit_3799); -#pragma pop /* 8061EAE8-8061EAEC 000000 0004+00 3/3 0/0 0/0 .bss boss */ -static u8 boss[4]; +// pointer to main morpheel boss actor +static b_ob_class* boss; /* 8061DE4C-8061E19C 00020C 0350+00 1/1 0/0 0/0 .text dmcalc__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dmcalc(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s" +static void dmcalc(b_oh2_class* i_this) { + cXyz sp20; + cXyz sp14; + + i_this->field_0x660[0] = i_this->current.pos; + cXyz* var_r30 = &i_this->field_0x660[1]; + csXyz* var_r29 = &i_this->field_0x7d4[1]; + + cXyz sp8; + mDoMtx_YrotS((MtxP)calc_mtx, i_this->shape_angle.y); + mDoMtx_XrotM((MtxP)calc_mtx, i_this->shape_angle.x); + + sp20.x = 0.0f; + sp20.y = 0.0f; + if (i_this->field_0x5d2[3] != 0) { + sp20.z = 200.0f; + } else if (boss->field_0x4752 == 101) { + sp20.z = 100.0f; + } else { + sp20.z = boss->field_0x5d04 * 123.0f; + } + + MtxPosition(&sp20, &sp8); + sp20.x = 0.0f; + sp20.y = 0.0f; + sp20.z = i_this->field_0x5e4; + + f32 var_f31 = 1.0f; + f32 var_f30 = 0.0f; + f32 var_f29 = -50000.0f; + + if (boss->mSpeedF < var_f31) { + var_f29 = boss->field_0x47a0 + 100.0f; + var_f30 = -20.0f; + } + + for (int i = 1; i < 31; i++) { + f32 temp_f26 = (var_r30->x - var_r30[-1].x) + sp8.x * var_f31; + f32 var_f1 = var_f30 + (var_r30->y + (sp8.y * var_f31)); + if (var_f1 < var_f29) { + var_f1 = var_f29; + } + + f32 temp_f25 = var_f1 - var_r30[-1].y; + f32 temp_f24 = (var_r30->z - var_r30[-1].z) + sp8.z * var_f31; + var_f31 *= 0.85f; + + s16 temp_r25; + int temp_r24 = cM_atan2s(temp_f26, temp_f24); + temp_r25 = -cM_atan2s(temp_f25, JMAFastSqrt((temp_f26 * temp_f26) + (temp_f24 * temp_f24))); + + mDoMtx_YrotS((MtxP)calc_mtx, temp_r24); + mDoMtx_XrotM((MtxP)calc_mtx, temp_r25); + MtxPosition(&sp20, &sp14); + + var_r30->x = var_r30[-1].x + sp14.x; + var_r30->y = var_r30[-1].y + sp14.y; + var_r30->z = var_r30[-1].z + sp14.z; + var_r29[-1].x = temp_r25; + var_r29[-1].y = temp_r24; + + var_r30++; + var_r29++; + } + + i_this->field_0x5e0 = 0.2f; + i_this->field_0x5dc += 2000; + + int temp_r6 = 0; + for (int i = 0; i < 30; i++, temp_r6 += -10000) { + if (boss->mSpeedF > 1.0f) { + i_this->field_0x5e8[i] = i_this->field_0x5e0 + 1.0f + + (i_this->field_0x5e0 * cM_ssin(i_this->field_0x5dc + temp_r6)); + } else { + i_this->field_0x5e8[i] = 1.0f; + } + } } -#pragma pop - -/* 8061E19C-8061E1D8 00055C 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz::~cXyz() { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8061EA5C-8061EA60 000024 0004+00 0/1 0/0 0/0 .rodata @3875 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3875 = 650.0f; -COMPILER_STRIP_GATE(0x8061EA5C, &lit_3875); -#pragma pop - -/* 8061EA60-8061EA68 000028 0004+04 0/1 0/0 0/0 .rodata @3876 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3876[1 + 1 /* padding */] = { - 20.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x8061EA60, &lit_3876); -#pragma pop - -/* 8061EA68-8061EA70 000030 0008+00 0/1 0/0 0/0 .rodata @3878 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3878[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8061EA68, &lit_3878); -#pragma pop /* 8061E1D8-8061E410 000598 0238+00 1/1 0/0 0/0 .text action__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s" +static void action(b_oh2_class* i_this) { + cXyz local_20; + cXyz vstack_2C; + + switch (i_this->field_0x5ce) { + case 0: + break; + } + + PSMTXCopy(boss->field_0x5c0->getModel()->i_getAnmMtx(i_this->field_0x5c8 + 8), + mDoMtx_stack_c::get()); + mDoMtx_stack_c::multVecZero(&i_this->current.pos); + PSMTXCopy(boss->field_0x5c0->getModel()->i_getAnmMtx(0), mDoMtx_stack_c::get()); + + local_20.set(0.0f, 0.0f, i_this->field_0x5c8 * 20.0f + 650.0f); + mDoMtx_stack_c::multVec(&local_20, &vstack_2C); + local_20 = i_this->current.pos - vstack_2C; + + i_this->shape_angle.y = cM_atan2s(local_20.x, local_20.z); + i_this->shape_angle.x = + -cM_atan2s(local_20.y, JMAFastSqrt((local_20.x * local_20.x) + (local_20.z * local_20.z))); + + dmcalc(i_this); + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::XrotM(i_this->shape_angle.x); + i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + + int roomNo = fopAcM_GetRoomNo(i_this); + i_this->mpMorf->play(0, dComIfGp_getReverb(roomNo)); + + if (boss->mSpeedF <= 1.0f) { + i_this->mpBrk->setFrame(0.0f); + i_this->mpBtk->setFrame(0.0f); + } else { + i_this->mpBtk->play(); + i_this->mpBrk->play(); + } + + i_this->mpMorf->modelCalc(); } -#pragma pop /* 8061E410-8061E4E8 0007D0 00D8+00 2/1 0/0 0/0 .text daB_OH2_Execute__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daB_OH2_Execute(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s" +static int daB_OH2_Execute(b_oh2_class* i_this) { + if (cDmrNowMidnaTalk()) { + return 1; + } + + if (i_this->field_0x5c8 == 0) { + boss = (b_ob_class*)fopAcM_SearchByID(i_this->mParentPcId); + } + + if (boss == NULL) { + return 1; + } + + i_this->field_0x5cc++; + + for (int i = 0; i < 4; i++) { + if (i_this->field_0x5d2[i] != 0) { + i_this->field_0x5d2[i]--; + } + } + + if (i_this->field_0x5da != 0) { + i_this->field_0x5da--; + } + + action(i_this); + return 1; } -#pragma pop /* 8061E4E8-8061E4F0 0008A8 0008+00 1/0 0/0 0/0 .text daB_OH2_IsDelete__FP11b_oh2_class */ -static bool daB_OH2_IsDelete(b_oh2_class* param_0) { - return true; +static int daB_OH2_IsDelete(b_oh2_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 8061EA84-8061EA84 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8061EA84 = "B_oh"; -#pragma pop - /* 8061E4F0-8061E540 0008B0 0050+00 1/0 0/0 0/0 .text daB_OH2_Delete__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daB_OH2_Delete(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s" +static int daB_OH2_Delete(b_oh2_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "B_oh"); + if (i_this->mHeap != NULL) { + i_this->mpMorf->stopZelAnime(); + } + + return 1; } -#pragma pop -/* ############################################################################################## */ -/* 8061EA70-8061EA74 000038 0004+00 0/1 0/0 0/0 .rodata @4048 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4048 = 39.0f; -COMPILER_STRIP_GATE(0x8061EA70, &lit_4048); -#pragma pop +/* 8061E540-8061E820 000900 02E0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + b_oh2_class* _this = static_cast(i_this); -/* 8061EA74-8061EA78 00003C 0004+00 0/1 0/0 0/0 .rodata @4049 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4049 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x8061EA74, &lit_4049); -#pragma pop + _this->mpMorf = + new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", 0x29), NULL, NULL, NULL, 2, + 1.0f, 0, -1, &_this->mZ2Enemy, 0, 0x11000284); + + if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { + return 0; + } + + if (!_this->mInvisModel.create(_this->mpMorf->getModel(), 1)) { + return 0; + } + + _this->mpMorf->getModel()->setUserArea((u32)i_this); + + for (u16 i = 0; i < _this->mpMorf->getModel()->getModelData()->getJointNum(); i++) { + _this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack( + nodeCallBack); + } + + _this->mpBtk = new mDoExt_btkAnm(); + if (_this->mpBtk == NULL) { + return 0; + } + + J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_oh", 0x36); + if (!_this->mpBtk->init(_this->mpMorf->getModel()->getModelData(), btk, TRUE, 2, 1.0f, 0, -1)) { + return 0; + } + + _this->mpBtk->setFrame(cM_rndF(39.0f)); + _this->mpBtk->setPlaySpeed(cM_rndFX(0.1f) + 1.0f); + + _this->mpBrk = new mDoExt_brkAnm(); + if (_this->mpBrk == NULL) { + return 0; + } + + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_oh", 0x2F); + if (!_this->mpBrk->init(_this->mpMorf->getModel()->getModelData(), brk, TRUE, 2, 1.0f, 0, -1)) { + return 0; + } + + _this->mpBrk->setFrame(cM_rndF(39.0f)); + _this->mpBrk->setPlaySpeed(cM_rndFX(0.1f) + 1.0f); + + return 1; +} + +/* 8061E868-8061E9EC 000C28 0184+00 1/0 0/0 0/0 .text daB_OH2_Create__FP10fopAc_ac_c */ +static int daB_OH2_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) b_oh2_class(); + fopAcM_OnCondition(i_this, 8); + } + b_oh2_class* _this = static_cast(i_this); + + int phase = dComIfG_resLoad(&_this->mPhase, "B_oh"); + if (phase == cPhs_COMPLEATE_e) { + _this->field_0x5c8 = fopAcM_GetParam(_this) & 0xFF; + + if (!fopAcM_entrySolidHeap(_this, (heapCallbackFunc)useHeapInit, 0x23E0)) { + return cPhs_ERROR_e; + } + + _this->mZ2Enemy.init(&_this->current.pos, &_this->current.pos, 3, 1); + _this->field_0x5cc = cM_rndF(65536.0f); + _this->field_0x5dc = cM_rndF(65536.0f); + + for (int i = 0; i < 31; i++) { + _this->field_0x660[i].y = -50000.0f; + } + + _this->field_0x5d2[3] = 10; + _this->field_0x5e4 = cM_rndFX(5.0f) + 50.0f; + + daB_OH2_Execute(_this); + } + + return phase; +} /* 8061EA8C-8061EAAC -00001 0020+00 1/0 0/0 0/0 .data l_daB_OH2_Method */ -SECTION_DATA static void* l_daB_OH2_Method[8] = { - (void*)daB_OH2_Create__FP10fopAc_ac_c, - (void*)daB_OH2_Delete__FP11b_oh2_class, - (void*)daB_OH2_Execute__FP11b_oh2_class, - (void*)daB_OH2_IsDelete__FP11b_oh2_class, - (void*)daB_OH2_Draw__FP11b_oh2_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daB_OH2_Method = { + (process_method_func)daB_OH2_Create, (process_method_func)daB_OH2_Delete, + (process_method_func)daB_OH2_Execute, (process_method_func)daB_OH2_IsDelete, + (process_method_func)daB_OH2_Draw, }; /* 8061EAAC-8061EADC -00001 0030+00 0/0 0/0 1/0 .data g_profile_B_OH2 */ -SECTION_DATA extern void* g_profile_B_OH2[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02100000, (void*)&g_fpcLf_Method, - (void*)0x00000948, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00DB0000, (void*)&l_daB_OH2_Method, - (void*)0x00044000, (void*)0x020E0000, +extern actor_process_profile_definition g_profile_B_OH2 = { + -3, + 7, + 0xFFFD, + PROC_B_OH2, + 0, + &g_fpcLf_Method.mBase, + sizeof(b_oh2_class), + 0, + 0, + &g_fopAc_Method, + 0x00DB, + 0, + 0, + &l_daB_OH2_Method, + 0x00044000, + 2, + 14, + 0, + 0, }; - -/* 8061EADC-8061EAE8 000050 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 8061E540-8061E820 000900 02E0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 8061E820-8061E868 000BE0 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8061EA78-8061EA7C 000040 0004+00 0/1 0/0 0/0 .rodata @4105 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4105 = 65536.0f; -COMPILER_STRIP_GATE(0x8061EA78, &lit_4105); -#pragma pop - -/* 8061EA7C-8061EA80 000044 0004+00 0/1 0/0 0/0 .rodata @4106 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4106 = 50.0f; -COMPILER_STRIP_GATE(0x8061EA7C, &lit_4106); -#pragma pop - -/* 8061EA80-8061EA84 000048 0004+00 0/1 0/0 0/0 .rodata @4107 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4107 = 5.0f; -COMPILER_STRIP_GATE(0x8061EA80, &lit_4107); -#pragma pop - -/* 8061E868-8061E9EC 000C28 0184+00 1/0 0/0 0/0 .text daB_OH2_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daB_OH2_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 8061E9EC-8061EA28 000DAC 003C+00 1/1 0/0 0/0 .text __dt__5csXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm csXyz::~csXyz() { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s" -} -#pragma pop - -/* 8061EA28-8061EA2C 000DE8 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { - /* empty function */ -} - -/* 8061EA2C-8061EA30 000DEC 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { - /* empty function */ -} - -/* 8061EA84-8061EA84 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp index 2c72f1d305..78a756ff2d 100644 --- a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp +++ b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp @@ -653,7 +653,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80450C9C[4]; +extern "C" extern u8 cDmr_SkipInfo[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); extern "C" void actionInitWait2__11daObjLife_cFv(); diff --git a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp index c8bd8b7068..b012442ad1 100644 --- a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp +++ b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp @@ -1,186 +1,91 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_set_bgobj -// +/** + * d_a_set_bgobj.cpp + * + */ #include "rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "d/d_procname.h" -// -// Types: -// +extern "C" extern leafdraw_method_class g_fopAc_Method; -struct request_of_phase_process_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daSetBgObj_c { - /* 80031870 */ void getArcName(fopAc_ac_c*); - /* 80485D78 */ void CreateInit(); - /* 80485DFC */ void create(); - /* 80485E88 */ void Delete(); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct csXyz {}; - -struct cXyz {}; - -// -// Forward References: -// - -extern "C" void CreateInit__12daSetBgObj_cFv(); -extern "C" void create__12daSetBgObj_cFv(); -extern "C" void Delete__12daSetBgObj_cFv(); -extern "C" static void daSetBgObj_Delete__FP12daSetBgObj_c(); -extern "C" static void daSetBgObj_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_set_bgobj__stringBase0; -extern "C" extern void* g_profile_SET_BG_OBJ[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getArcName__12daSetBgObj_cFP10fopAc_ac_c(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void sprintf(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80485F00-80485F0C 000000 0009+03 1/1 0/0 0/0 .rodata l_specName */ -SECTION_RODATA static u8 const l_specName[9 + 3 /* padding */] = { - 0x73, - 0x70, - 0x65, - 0x63, - 0x2E, - 0x64, - 0x61, - 0x74, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80485F00, &l_specName); - -/* 80485F10-80485F1C 000000 000A+02 1/1 0/0 0/0 .data l_bg_profName$3618 */ -SECTION_DATA static u8 l_bg_profName[10 + 2 /* padding */] = { - 0x02, - 0xDE, - 0x02, - 0xDE, - 0x02, - 0xDE, - 0x01, - 0x3C, - 0x01, - 0x3D, - /* padding */ - 0x00, - 0x00, -}; +static const char l_specName[] = "spec.dat"; /* 80485D78-80485DFC 000078 0084+00 1/1 0/0 0/0 .text CreateInit__12daSetBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSetBgObj_c::CreateInit() { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s" -} -#pragma pop +int daSetBgObj_c::CreateInit() { + static s16 l_bg_profName[5] = { + PROC_BG_OBJ, PROC_BG_OBJ, PROC_BG_OBJ, PROC_Obj_Flag2, PROC_Obj_Flag3, + }; -/* ############################################################################################## */ -/* 80485F0C-80485F0C 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80485F0C = "%s"; -#pragma pop + u16* spec_data_p = (u16*)dComIfG_getObjectRes(mArcName, l_specName); + fopAcM_create(l_bg_profName[*spec_data_p], fopAcM_GetParam(this), ¤t.pos, + fopAcM_GetRoomNo(this), ¤t.angle, &mScale, -1); + + return 1; +} /* 80485DFC-80485E88 0000FC 008C+00 1/1 0/0 0/0 .text create__12daSetBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSetBgObj_c::create() { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s" +int daSetBgObj_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daSetBgObj_c(); + fopAcM_OnCondition(this, 8); + } + + sprintf(mArcName, "%s", getArcName(this)); + + int phase = dComIfG_resLoad(&mPhase, mArcName); + if (phase == cPhs_COMPLEATE_e) { + CreateInit(); + phase = cPhs_ERROR_e; + } + + return phase; } -#pragma pop /* 80485E88-80485EB8 000188 0030+00 1/1 0/0 0/0 .text Delete__12daSetBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSetBgObj_c::Delete() { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s" +int daSetBgObj_c::Delete() { + dComIfG_resDelete(&mPhase, mArcName); + return 1; } -#pragma pop /* 80485EB8-80485ED8 0001B8 0020+00 1/0 0/0 0/0 .text daSetBgObj_Delete__FP12daSetBgObj_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSetBgObj_Delete(daSetBgObj_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s" +static int daSetBgObj_Delete(daSetBgObj_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 80485ED8-80485EF8 0001D8 0020+00 1/0 0/0 0/0 .text daSetBgObj_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSetBgObj_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s" +static int daSetBgObj_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* ############################################################################################## */ /* 80485F1C-80485F3C -00001 0020+00 1/0 0/0 0/0 .data l_daSetBgObj_Method */ -SECTION_DATA static void* l_daSetBgObj_Method[8] = { - (void*)daSetBgObj_Create__FP10fopAc_ac_c, - (void*)daSetBgObj_Delete__FP12daSetBgObj_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daSetBgObj_Method = { + (process_method_func)daSetBgObj_Create, + (process_method_func)daSetBgObj_Delete, }; /* 80485F3C-80485F6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SET_BG_OBJ */ -SECTION_DATA extern void* g_profile_SET_BG_OBJ[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02DD0000, (void*)&g_fpcLf_Method, - (void*)0x00000580, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02F20000, (void*)&l_daSetBgObj_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_SET_BG_OBJ = { + -3, + 7, + -3, + PROC_SET_BG_OBJ, + 0, + &g_fpcLf_Method.mBase, + sizeof(daSetBgObj_c), + 0, + 0, + &g_fopAc_Method, + 0x02F2, + 0, + 0, + &l_daSetBgObj_Method, + 0x00040100, + 0, + 14, + 0, + 0, }; - -/* 80485F0C-80485F0C 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp index e61860c311..7a6d908e77 100644 --- a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp +++ b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp @@ -419,7 +419,7 @@ extern "C" extern u32 g_blackColor; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80450C9C[4]; +extern "C" extern u8 cDmr_SkipInfo[4]; extern "C" extern u8 data_80450CA0[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp index ea8231e94f..c2d7c16dfe 100644 --- a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp +++ b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp @@ -175,7 +175,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C9C[4]; +extern "C" extern u8 cDmr_SkipInfo[4]; // // Declarations: diff --git a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp index 1f5d5bc489..68a89067bf 100644 --- a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp +++ b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp @@ -1,186 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_web0 -// +/** + * d_a_obj_web0.cpp + * Spider Web (Wall) + */ #include "rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h" +#include "SSystem/SComponent/c_math.h" +#include "d/d_procname.h" #include "dol2asm.h" -#include "dolphin/types.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_web0_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Web0_HIO_c { - /* 80D3452C */ daObj_Web0_HIO_c(); - /* 80D350E4 */ ~daObj_Web0_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 80084658 */ void ChkCoHit(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80D35054 */ ~cM3dGSph(); -}; - -struct cM3dGAab { - /* 80D3509C */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D34D44 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void __ct__16daObj_Web0_HIO_cFv(); -extern "C" static void daObj_Web0_Draw__FP14obj_web0_class(); extern "C" static void damage_check__FP14obj_web0_class(); -extern "C" static void daObj_Web0_Execute__FP14obj_web0_class(); -extern "C" static bool daObj_Web0_IsDelete__FP14obj_web0_class(); -extern "C" static void daObj_Web0_Delete__FP14obj_web0_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daObj_Web0_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__16daObj_Web0_HIO_cFv(); -extern "C" void __sinit_d_a_obj_web0_cpp(); -extern "C" extern char const* const d_a_obj_web0__stringBase0; // // External References: @@ -234,109 +62,30 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; +extern "C" extern leafdraw_method_class g_fopAc_Method; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D351C8-80D35208 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src$3944 */ -SECTION_DATA static u8 cc_sph_src[64] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, -}; - -/* 80D35208-80D35228 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Web0_Method */ -SECTION_DATA static void* l_daObj_Web0_Method[8] = { - (void*)daObj_Web0_Create__FP10fopAc_ac_c, - (void*)daObj_Web0_Delete__FP14obj_web0_class, - (void*)daObj_Web0_Execute__FP14obj_web0_class, - (void*)daObj_Web0_IsDelete__FP14obj_web0_class, - (void*)daObj_Web0_Draw__FP14obj_web0_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D35228-80D35258 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB0 */ -SECTION_DATA extern void* g_profile_OBJ_WEB0[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00280000, (void*)&g_fpcLf_Method, - (void*)0x0000073C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x002F0000, (void*)&l_daObj_Web0_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80D35258-80D35264 000090 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80D35264-80D35270 00009C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80D35270-80D3527C 0000A8 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80D3527C-80D35288 0000B4 000C+00 2/2 0/0 0/0 .data __vt__16daObj_Web0_HIO_c */ -SECTION_DATA extern void* __vt__16daObj_Web0_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daObj_Web0_HIO_cFv, -}; /* 80D3452C-80D34544 0000EC 0018+00 1/1 0/0 0/0 .text __ct__16daObj_Web0_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Web0_HIO_c::daObj_Web0_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s" +daObj_Web0_HIO_c::daObj_Web0_HIO_c() { + field_0x4 = -1; } -#pragma pop /* 80D34544-80D345C0 000104 007C+00 1/0 0/0 0/0 .text daObj_Web0_Draw__FP14obj_web0_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web0_Draw(obj_web0_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s" +static int daObj_Web0_Draw(obj_web0_class* i_this) { + g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + i_this->mpBrk->entry(i_this->mpModel->getModelData()); + + mDoExt_modelUpdateDL(i_this->mpModel); + return 1; } -#pragma pop /* ############################################################################################## */ /* 80D3517C-80D35180 000000 0004+00 3/3 0/0 0/0 .rodata @3724 */ @@ -358,14 +107,58 @@ COMPILER_STRIP_GATE(0x80D35184, &lit_3726); #pragma pop /* 80D345C0-80D34794 000180 01D4+00 1/1 0/0 0/0 .text damage_check__FP14obj_web0_class */ +// matches with literals +#ifdef NONMATCHING +static void damage_check(obj_web0_class* i_this) { + i_this->mStts.Move(); + + if (i_this->mHitTimer != 0) { + return; + } + + if (i_this->mSphCc.ChkTgHit()) { + i_this->mHitTimer = 6; + + if (i_this->mSphCc.GetTgHitObj()->ChkAtType(AT_TYPE_IRON_BALL)) { + i_this->mDeleteTimer = 41; + return; + } + + if (i_this->mSphCc.GetTgHitObj()->ChkAtType(AT_TYPE_LANTERN_SWING) && + static_cast(i_this->mSphCc.GetTgHitObj())->GetAtMtrl() != 1) { + return; + } + + if (i_this->mSphCc.GetTgHitObj()->ChkAtType(AT_TYPE_BOMB) || + static_cast(i_this->mSphCc.GetTgHitObj())->GetAtMtrl() == 1) { + i_this->mDeleteTimer = 1; + return; + } + + i_this->mReboundTimer = 20; + fopAcM_seStart(i_this, Z2SE_OBJ_WEB_BOUND_L, 0); + } + + if (i_this->mSphCc.ChkCoHit()) { + i_this->mReboundTimer = 10; + } + + if (daPy_getPlayerActorClass()->checkFrontRollCrash() && + fopAcM_searchPlayerDistanceXZ(i_this) < i_this->mScale.x * 260.0f) { + i_this->mReboundTimer = 20; + fopAcM_seStart(i_this, Z2SE_OBJ_WEB_BOUND_L, 0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void damage_check(obj_web0_class* param_0) { +static asm void damage_check(obj_web0_class* i_this) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/damage_check__FP14obj_web0_class.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80D35188-80D3518C 00000C 0004+00 0/1 0/0 0/0 .rodata @3850 */ @@ -410,149 +203,261 @@ COMPILER_STRIP_GATE(0x80D3519C, &lit_3855); #pragma pop /* 80D34794-80D34B24 000354 0390+00 2/1 0/0 0/0 .text daObj_Web0_Execute__FP14obj_web0_class */ +// reg alloc +#ifdef NONMATCHING +static int daObj_Web0_Execute(obj_web0_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + + i_this->field_0x57c++; + + for (int i = 0; i < 2; i++) { + if (i_this->field_0x584[i] != 0) { + i_this->field_0x584[i]--; + } + } + + if (i_this->mHitTimer != 0) { + i_this->mHitTimer--; + } + + if (i_this->mDeleteTimer != 0) { + if (i_this->mDeleteTimer == 1) { + cXyz sp30(i_this->mScale); + sp30.z = 1.0f; + + dComIfGp_particle_set(0x840C, &i_this->current.pos, &i_this->shape_angle, &sp30); + i_this->mpBrk->setPlaySpeed(1.0f); + } else if (i_this->mDeleteTimer == 41) { + i_this->mpBrk->setPlaySpeed(1.0f); + } + + fopAcM_seStartLevel(i_this, Z2SE_OBJ_WEB_BURN, 0); + + if (i_this->mDeleteTimer == 40 || i_this->mDeleteTimer == 80) { + dComIfGs_onSwitch(fopAcM_GetParam(i_this) >> 0x18, fopAcM_GetRoomNo(i_this)); + fopAcM_delete(i_this); + } + + i_this->mDeleteTimer++; + } else { + damage_check(i_this); + } + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); + mDoMtx_stack_c::scaleM(i_this->mScale.x, i_this->mScale.y, i_this->mScale.z); + + i_this->mpBrk->play(); + i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + + if (i_this->mReboundTimer != 0) { + i_this->mReboundTimer--; + } + + i_this->mScale.z = i_this->mReboundTimer * cM_ssin(i_this->mReboundTimer * 0x1900) * 0.075f; + + s16 tmp = (fopAcM_searchPlayerAngleY(i_this) + 0x4000) - i_this->shape_angle.y; + if (tmp < 0) { + mDoMtx_stack_c::YrotM(-0x8000); + } + PSMTXCopy(mDoMtx_stack_c::get(), i_this->mMtx); + + i_this->mpBgW->Move(); + + cXyz sp3C(i_this->current.pos); + if (i_this->field_0x57c & 1) { + sp3C.y -= i_this->mScale.x * 70.0f; + } + + s16 svar9 = i_this->shape_angle.y; + if (tmp < 0) { + svar9 += (s16)-0x8000; + } + + svar9 -= player->shape_angle.y; + if ((svar9 < 20000 && svar9 > -20000) || i_this->mHitTimer != 0) { + sp3C.x += 20000.0f; + } + + i_this->mSphCc.SetC(sp3C); + i_this->mSphCc.SetR(i_this->mScale.x * 150.0f); + + dComIfG_Ccsp()->Set(&i_this->mSphCc); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daObj_Web0_Execute(obj_web0_class* param_0) { +static asm int daObj_Web0_Execute(obj_web0_class* i_this) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Execute__FP14obj_web0_class.s" } #pragma pop +#endif /* 80D34B24-80D34B2C 0006E4 0008+00 1/0 0/0 0/0 .text daObj_Web0_IsDelete__FP14obj_web0_class */ -static bool daObj_Web0_IsDelete(obj_web0_class* param_0) { - return true; +static int daObj_Web0_IsDelete(obj_web0_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80D351BC-80D351BC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D351BC = "Obj_web0"; -#pragma pop - /* 80D35290-80D35294 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80D35290[4]; +static u8 data_80D35290; /* 80D34B2C-80D34B94 0006EC 0068+00 1/0 0/0 0/0 .text daObj_Web0_Delete__FP14obj_web0_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web0_Delete(obj_web0_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s" -} -#pragma pop +static int daObj_Web0_Delete(obj_web0_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "Obj_web0"); -/* ############################################################################################## */ -/* 80D351A4-80D351A8 000028 0004+00 1/1 0/0 0/0 .rodata @3917 */ -SECTION_RODATA static u8 const lit_3917[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D351A4, &lit_3917); + if (i_this->field_0x739) { + data_80D35290 = 0; + } + + dComIfG_Bgsp().Release(i_this->mpBgW); + return 1; +} /* 80D34B94-80D34D44 000754 01B0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + obj_web0_class* _this = static_cast(i_this); + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_web0", 5); + _this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + + if (_this->mpModel == NULL) { + return 0; + } + + _this->mpBrk = new mDoExt_brkAnm(); + if (_this->mpBrk == NULL) { + return 0; + } + + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Obj_web0", 8); + if (!_this->mpBrk->init(_this->mpModel->getModelData(), brk, TRUE, 0, FLOAT_LABEL(lit_3724), 0, + -1)) { + return 0; + } + + _this->mpBrk->setPlaySpeed(0.0f); + + _this->mpBgW = new dBgW(); + if (_this->mpBgW == NULL) { + return 0; + } + + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Obj_web0", 11); + if (_this->mpBgW->Set(dzb, 1, &_this->mMtx) == 1) { + return 0; + } + + _this->mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); + return 1; } -#pragma pop - -/* 80D34D44-80D34D8C 000904 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D351A8-80D351AC 00002C 0004+00 1/1 0/0 0/0 .rodata @4014 */ -SECTION_RODATA static f32 const lit_4014 = -1000.0f; -COMPILER_STRIP_GATE(0x80D351A8, &lit_4014); - -/* 80D351AC-80D351B4 000030 0004+04 1/1 0/0 0/0 .rodata @4015 */ -SECTION_RODATA static f32 const lit_4015[1 + 1 /* padding */] = { - 1000.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80D351AC, &lit_4015); - -/* 80D351B4-80D351BC 000038 0008+00 1/1 0/0 0/0 .rodata @4017 */ -SECTION_RODATA static u8 const lit_4017[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D351B4, &lit_4017); - -/* 80D35294-80D352A0 00000C 000C+00 1/1 0/0 0/0 .bss @3643 */ -static u8 lit_3643[12]; /* 80D352A0-80D352A8 000018 0008+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; +static daObj_Web0_HIO_c l_HIO; /* 80D34D8C-80D35054 00094C 02C8+00 1/0 0/0 0/0 .text daObj_Web0_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web0_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s" +static int daObj_Web0_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) obj_web0_class(); + fopAcM_OnCondition(i_this, 8); + } + obj_web0_class* _this = static_cast(i_this); + + static dCcD_SrcSph cc_sph_src = { + { + {0, {{0, 0, 0}, {0xD8FBFFFF, 3}, 0}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {dCcD_SE_HARD_BODY, 0, 0, 0, {3}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 40.0f, + }, + }; + + int phase = dComIfG_resLoad(&_this->mPhase, "Obj_web0"); + if (phase == cPhs_COMPLEATE_e) { + int switchNo = fopAcM_GetParam(_this) >> 0x18; + + if (switchNo != 0xFF && dComIfGs_isSwitch(switchNo, fopAcM_GetRoomNo(_this))) { + return cPhs_ERROR_e; + } + + _this->mPrm0 = fopAcM_GetParam(_this); + if (_this->mPrm0 == 0xFF) { + _this->mPrm0 = 0; + } + + _this->mScaleXY = fopAcM_GetParam(_this) >> 8; + + if (!fopAcM_entrySolidHeap(_this, (heapCallbackFunc)useHeapInit, 0xA20)) { + return cPhs_ERROR_e; + } + + if (_this->mpBgW != NULL && dComIfG_Bgsp().Regist(_this->mpBgW, _this)) { + return cPhs_ERROR_e; + } + + if (!data_80D35290) { + _this->field_0x739 = 1; + data_80D35290 = true; + l_HIO.field_0x4 = -1; + } + + fopAcM_SetMtx(_this, _this->mpModel->getBaseTRMtx()); + fopAcM_SetMin(_this, -1000.0f, -1000.0f, -1000.0f); + fopAcM_SetMax(_this, 1000.0f, 1000.0f, 1000.0f); + _this->field_0x562 = 30; + _this->field_0x560 = 30; + + _this->mStts.Init(250, 0, _this); + _this->mSphCc.Set(cc_sph_src); + _this->mSphCc.SetStts(&_this->mStts); + _this->mSphCc.OnTgNoHitMark(); + + if (_this->mScaleXY != 0xFF && _this->mScaleXY != 0) { + _this->mScale.x = _this->mScaleXY; + _this->mScale.y = _this->mScaleXY; + } + + _this->mEyePos = _this->current.pos; + daObj_Web0_Execute(_this); + } + + return phase; } -#pragma pop -/* 80D35054-80D3509C 000C14 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s" -} -#pragma pop +/* 80D35208-80D35228 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Web0_Method */ +static actor_method_class l_daObj_Web0_Method = { + (process_method_func)daObj_Web0_Create, (process_method_func)daObj_Web0_Delete, + (process_method_func)daObj_Web0_Execute, (process_method_func)daObj_Web0_IsDelete, + (process_method_func)daObj_Web0_Draw, +}; -/* 80D3509C-80D350E4 000C5C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80D350E4-80D3512C 000CA4 0048+00 2/1 0/0 0/0 .text __dt__16daObj_Web0_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Web0_HIO_c::~daObj_Web0_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s" -} -#pragma pop - -/* 80D3512C-80D35168 000CEC 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_web0_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_web0_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80D3512C, __sinit_d_a_obj_web0_cpp); -#pragma pop - -/* 80D351BC-80D351BC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80D35228-80D35258 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB0 */ +extern actor_process_profile_definition g_profile_OBJ_WEB0 = { + -3, + 3, + -3, + PROC_OBJ_WEB0, + 0, + &g_fpcLf_Method.mBase, + sizeof(obj_web0_class), + 0, + 0, + &g_fopAc_Method, + 0x002F, + 0, + 0, + &l_daObj_Web0_Method, + 0x00040100, + 0, + 14, + 0, + 0, +}; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp index fe9e1328cb..1b02c8d5f0 100644 --- a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp +++ b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp @@ -1,642 +1,354 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_web1 -// +/** + * d_a_obj_web1.cpp + * Spider Web (Floor) + */ #include "rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" +#include "d/d_procname.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_web1_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Web1_HIO_c { - /* 80D353AC */ daObj_Web1_HIO_c(); - /* 80D36028 */ ~daObj_Web1_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F200 */ void SetR(f32); - /* 80D35F98 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80D35FE0 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D35C9C */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void __ct__16daObj_Web1_HIO_cFv(); -extern "C" static void daObj_Web1_Draw__FP14obj_web1_class(); -extern "C" static void ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" static void action__FP14obj_web1_class(); -extern "C" static void daObj_Web1_Execute__FP14obj_web1_class(); -extern "C" static bool daObj_Web1_IsDelete__FP14obj_web1_class(); -extern "C" static void daObj_Web1_Delete__FP14obj_web1_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daObj_Web1_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__16daObj_Web1_HIO_cFv(); -extern "C" void __sinit_d_a_obj_web1_cpp(); -extern "C" extern char const* const d_a_obj_web1__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D3612C-80D36170 000000 0044+00 1/1 0/0 0/0 .data cc_cyl_src$3969 */ -SECTION_DATA static u8 cc_cyl_src[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, -}; - -/* 80D36170-80D36190 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Web1_Method */ -SECTION_DATA static void* l_daObj_Web1_Method[8] = { - (void*)daObj_Web1_Create__FP10fopAc_ac_c, - (void*)daObj_Web1_Delete__FP14obj_web1_class, - (void*)daObj_Web1_Execute__FP14obj_web1_class, - (void*)daObj_Web1_IsDelete__FP14obj_web1_class, - (void*)daObj_Web1_Draw__FP14obj_web1_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D36190-80D361C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB1 */ -SECTION_DATA extern void* g_profile_OBJ_WEB1[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00290000, (void*)&g_fpcLf_Method, - (void*)0x00000770, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00300000, (void*)&l_daObj_Web1_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80D361C0-80D361CC 000094 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80D361CC-80D361D8 0000A0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80D361D8-80D361E4 0000AC 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80D361E4-80D361F0 0000B8 000C+00 2/2 0/0 0/0 .data __vt__16daObj_Web1_HIO_c */ -SECTION_DATA extern void* __vt__16daObj_Web1_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daObj_Web1_HIO_cFv, -}; +extern "C" extern leafdraw_method_class g_fopAc_Method; /* 80D353AC-80D353C4 0000EC 0018+00 1/1 0/0 0/0 .text __ct__16daObj_Web1_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Web1_HIO_c::daObj_Web1_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s" +daObj_Web1_HIO_c::daObj_Web1_HIO_c() { + field_0x4 = -1; } -#pragma pop /* 80D353C4-80D35440 000104 007C+00 1/0 0/0 0/0 .text daObj_Web1_Draw__FP14obj_web1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web1_Draw(obj_web1_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s" +static int daObj_Web1_Draw(obj_web1_class* i_this) { + g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + i_this->mpBrk->entry(i_this->mpModel->getModelData()); + + mDoExt_modelUpdateDL(i_this->mpModel); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80D360C0-80D360C4 000000 0004+00 5/5 0/0 0/0 .rodata @3703 */ -SECTION_RODATA static u8 const lit_3703[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D360C0, &lit_3703); - -/* 80D360C4-80D360C8 000004 0004+00 1/1 0/0 0/0 .rodata @3704 */ -SECTION_RODATA static f32 const lit_3704 = 140.0f; -COMPILER_STRIP_GATE(0x80D360C4, &lit_3704); /* 80D35440-80D35508 000180 00C8+00 1/1 0/0 0/0 .text * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void ride_call_back(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s" +static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) { + obj_web1_class* _this = static_cast(i_this); + + f32 x_diff = i_actor->current.pos.x - _this->current.pos.x; + f32 z_diff = i_actor->current.pos.z - _this->current.pos.z; + _this->mDistToActor = JMAFastSqrt((x_diff * x_diff) + (z_diff * z_diff)); + + if (_this->mDistToActor < 140.0f) { + if (fopAcM_GetName(i_actor) == PROC_ALINK || fopAcM_GetName(i_actor) == PROC_ALINK) { + if (_this->field_0x5aa == 0) { + _this->mReboundTimer = 60; + } + + if (daPy_getPlayerActorClass()->i_checkEquipHeavyBoots()) { + _this->field_0x5aa = 120; + } else { + _this->field_0x5aa = 6; + } + } else if (fopAcM_GetName(i_actor) == PROC_OBJ_GM) { + _this->field_0x5aa = 120; + } else { + _this->field_0x5aa = 3; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80D360C8-80D360CC 000008 0004+00 1/3 0/0 0/0 .rodata @3798 */ -SECTION_RODATA static f32 const lit_3798 = 1.0f; -COMPILER_STRIP_GATE(0x80D360C8, &lit_3798); - -/* 80D360CC-80D360D0 00000C 0004+00 0/2 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3799 = -1.0f; -COMPILER_STRIP_GATE(0x80D360CC, &lit_3799); -#pragma pop - -/* 80D360D0-80D360D4 000010 0004+00 0/1 0/0 0/0 .rodata @3800 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3800 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(0x80D360D0, &lit_3800); -#pragma pop - -/* 80D360D4-80D360D8 000014 0004+00 0/1 0/0 0/0 .rodata @3801 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3801 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80D360D4, &lit_3801); -#pragma pop - -/* 80D360D8-80D360DC 000018 0004+00 0/1 0/0 0/0 .rodata @3802 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3802 = 10.0f; -COMPILER_STRIP_GATE(0x80D360D8, &lit_3802); -#pragma pop - -/* 80D360DC-80D360E0 00001C 0004+00 0/1 0/0 0/0 .rodata @3803 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3803 = 5.0f; -COMPILER_STRIP_GATE(0x80D360DC, &lit_3803); -#pragma pop - -/* 80D360E0-80D360E4 000020 0004+00 0/1 0/0 0/0 .rodata @3804 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3804 = 2.0f; -COMPILER_STRIP_GATE(0x80D360E0, &lit_3804); -#pragma pop - -/* 80D360E4-80D360E8 000024 0004+00 0/1 0/0 0/0 .rodata @3805 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3805 = 0x3BA3D70A; -COMPILER_STRIP_GATE(0x80D360E4, &lit_3805); -#pragma pop - -/* 80D360E8-80D360F0 000028 0004+04 0/1 0/0 0/0 .rodata @3806 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3806[1 + 1 /* padding */] = { - 0.5f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80D360E8, &lit_3806); -#pragma pop - -/* 80D360F0-80D360F8 000030 0008+00 0/1 0/0 0/0 .rodata @3808 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3808[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D360F0, &lit_3808); -#pragma pop /* 80D35508-80D35774 000248 026C+00 1/1 0/0 0/0 .text action__FP14obj_web1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(obj_web1_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s" +static void action(obj_web1_class* i_this) { + if (i_this->mReboundTimer != 0) { + if (i_this->mReboundTimer == 60 || i_this->mReboundTimer == 40 || + i_this->mReboundTimer == 20) { + fopAcM_seStart(i_this, Z2SE_OBJ_WEB_BOUND_S, 0); + } + + i_this->mReboundTimer--; + } + + switch (i_this->mActionMode) { + case 0: + if (i_this->mHitTimer == 0 && i_this->mCylCc.ChkTgHit()) { + i_this->mHitTimer = 6; + + if (i_this->mCylCc.GetTgHitObj()->ChkAtType(AT_TYPE_BOMB)) { + i_this->mActionMode = 10; + } + + if (i_this->mCylCc.GetTgHitGObj()->GetAtMtrl() == 1) { + i_this->mActionMode = 10; + } + } + break; + case 1: + if (i_this->field_0x5a2[0] == 0) { + i_this->mZ2SoundObj.startCollisionSE(0x40000, 0x21, NULL); + fopAcM_delete(i_this); + } + break; + case 10: + i_this->mDeleteTimer = 1; + break; + } + + i_this->mScale.y = i_this->field_0x5b0 + + i_this->mReboundTimer * cM_ssin(i_this->mReboundTimer * 0xF00) * 0.02f; + if (i_this->mScale.y < 0.1f) { + i_this->mScale.y = 0.1f; + } + + f32 target = 0.0f; + if (i_this->field_0x5aa != 0) { + if (i_this->field_0x5aa > 100) { + target = 10.0f; + i_this->mActionMode++; + i_this->field_0x5a2[0] = 0; + } else if (i_this->field_0x5aa > 80) { + target = 5.0f; + } else if (i_this->field_0x5aa >= 4) { + target = 2.0f; + } else { + target = 1.0f; + } + + f32 fvar6 = i_this->mDistToActor * 0.005f; + if (fvar6 > 1.0f) { + fvar6 = 1.0f; + } + target *= 1.0f - fvar6; + + i_this->field_0x5aa--; + } + + cLib_addCalc2(&i_this->field_0x5b0, target, 0.5f, 0.5f); } -#pragma pop - -/* ############################################################################################## */ -/* 80D360F8-80D360FC 000038 0004+00 0/1 0/0 0/0 .rodata @3871 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3871 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80D360F8, &lit_3871); -#pragma pop - -/* 80D360FC-80D36100 00003C 0004+00 0/1 0/0 0/0 .rodata @3872 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3872 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(0x80D360FC, &lit_3872); -#pragma pop - -/* 80D36100-80D36104 000040 0004+00 0/1 0/0 0/0 .rodata @3873 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3873 = 9.0f; -COMPILER_STRIP_GATE(0x80D36100, &lit_3873); -#pragma pop - -/* 80D36104-80D36108 000044 0004+00 0/1 0/0 0/0 .rodata @3874 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3874 = -15.0f; -COMPILER_STRIP_GATE(0x80D36104, &lit_3874); -#pragma pop - -/* 80D36108-80D3610C 000048 0004+00 0/1 0/0 0/0 .rodata @3875 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3875 = 150.0f; -COMPILER_STRIP_GATE(0x80D36108, &lit_3875); -#pragma pop /* 80D35774-80D35A3C 0004B4 02C8+00 2/1 0/0 0/0 .text daObj_Web1_Execute__FP14obj_web1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web1_Execute(obj_web1_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s" +static int daObj_Web1_Execute(obj_web1_class* i_this) { + i_this->field_0x59c++; + + for (int i = 0; i < 2; i++) { + if (i_this->field_0x5a2[i] != 0) { + i_this->field_0x5a2[i]--; + } + } + + if (i_this->mHitTimer != 0) { + i_this->mHitTimer--; + } + + int roomNo = fopAcM_GetRoomNo(i_this); + i_this->mZ2SoundObj.framework(0, dComIfGp_getReverb(roomNo)); + + if (i_this->mDeleteTimer != 0) { + if (i_this->mDeleteTimer == 1) { + cXyz scale; + scale.x = i_this->mScale.x; + scale.y = i_this->mScale.x; + scale.z = i_this->mScale.x; + + dComIfGp_particle_set(0x840E, &i_this->current.pos, &i_this->shape_angle, &scale); + i_this->mpBrk->setPlaySpeed(1.0f); + } + + fopAcM_seStartLevel(i_this, Z2SE_OBJ_WEB_BURN, 0); + + if (i_this->mDeleteTimer == 35) { + dComIfGs_onSwitch(fopAcM_GetParam(i_this) >> 0x18, fopAcM_GetRoomNo(i_this)); + fopAcM_delete(i_this); + } + + i_this->mDeleteTimer++; + } else { + action(i_this); + } + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::scaleM(i_this->mScale.x, i_this->mScale.y * i_this->mScale.x + 0.05f, + i_this->mScale.x); + + i_this->mpBrk->play(); + i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::scaleM(i_this->mScale.x * 1.2f, i_this->mScale.x, i_this->mScale.x * 1.2f); + mDoMtx_stack_c::transM(0.0f, i_this->mScale.x * i_this->mScale.y * -15.0f + 9.0f, 0.0f); + PSMTXCopy(mDoMtx_stack_c::get(), i_this->mMtx); + + i_this->mpBgW->Move(); + i_this->mCylCc.SetC(i_this->current.pos); + i_this->mCylCc.SetR(i_this->mScale.x * 150.0f); + + dComIfG_Ccsp()->Set(&i_this->mCylCc); + return 1; } -#pragma pop /* 80D35A3C-80D35A44 00077C 0008+00 1/0 0/0 0/0 .text daObj_Web1_IsDelete__FP14obj_web1_class */ -static bool daObj_Web1_IsDelete(obj_web1_class* param_0) { - return true; +static int daObj_Web1_IsDelete(obj_web1_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80D36120-80D36120 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D36120 = "Obj_web1"; -#pragma pop - /* 80D361F8-80D361FC 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80D361F8[4]; +static u8 data_80D361F8; /* 80D35A44-80D35AC0 000784 007C+00 1/0 0/0 0/0 .text daObj_Web1_Delete__FP14obj_web1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web1_Delete(obj_web1_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s" +static int daObj_Web1_Delete(obj_web1_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "Obj_web1"); + + if (i_this->field_0x76c) { + data_80D361F8 = 0; + } + + dComIfG_Bgsp().Release(i_this->mpBgW); + + if (i_this->mHeap != NULL) { + i_this->mZ2SoundObj.deleteObject(); + } + return 1; } -#pragma pop /* 80D35AC0-80D35C9C 000800 01DC+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + obj_web1_class* _this = static_cast(i_this); + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_web1", 5); + _this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + + if (_this->mpModel == NULL) { + return 0; + } + + _this->mpBrk = new mDoExt_brkAnm(); + if (_this->mpBrk == NULL) { + return 0; + } + + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Obj_web1", 8); + if (!_this->mpBrk->init(_this->mpModel->getModelData(), brk, TRUE, 0, 1.0f, 0, -1)) { + return 0; + } + + _this->mpBrk->setPlaySpeed(0.0f); + + _this->mpBgW = new dBgW(); + if (_this->mpBgW == NULL) { + return 0; + } + + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Obj_web1", 11); + if (_this->mpBgW->Set(dzb, 1, &_this->mMtx) == 1) { + return 0; + } + + _this->mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); + _this->mpBgW->SetRideCallback(ride_call_back); + _this->mZ2SoundObj.init(&i_this->current.pos, 1); + return 1; } -#pragma pop - -/* 80D35C9C-80D35CE4 0009DC 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D3610C-80D36110 00004C 0004+00 0/1 0/0 0/0 .rodata @4036 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4036 = -1000.0f; -COMPILER_STRIP_GATE(0x80D3610C, &lit_4036); -#pragma pop - -/* 80D36110-80D36114 000050 0004+00 0/1 0/0 0/0 .rodata @4037 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4037 = 1000.0f; -COMPILER_STRIP_GATE(0x80D36110, &lit_4037); -#pragma pop - -/* 80D36114-80D36118 000054 0004+00 0/1 0/0 0/0 .rodata @4038 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4038 = 13.0f; -COMPILER_STRIP_GATE(0x80D36114, &lit_4038); -#pragma pop - -/* 80D36118-80D36120 000058 0008+00 0/1 0/0 0/0 .rodata @4040 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4040[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D36118, &lit_4040); -#pragma pop - -/* 80D361FC-80D36208 00000C 000C+00 1/1 0/0 0/0 .bss @3643 */ -static u8 lit_3643[12]; /* 80D36208-80D36210 000018 0008+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; +static daObj_Web1_HIO_c l_HIO; /* 80D35CE4-80D35F98 000A24 02B4+00 1/0 0/0 0/0 .text daObj_Web1_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web1_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s" +static int daObj_Web1_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) obj_web1_class(); + fopAcM_OnCondition(i_this, 8); + } + obj_web1_class* _this = static_cast(i_this); + + static dCcD_SrcCyl cc_cyl_src = { + { + {0, {{0, 0, 0}, {0xD8FBFFFF, 17}, 0}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {dCcD_SE_HARD_BODY, 2, 0, 0, {2}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 2.0f, + }, + }; + + int phase = dComIfG_resLoad(&_this->mPhase, "Obj_web1"); + if (phase == cPhs_COMPLEATE_e) { + u8 switchNo = fopAcM_GetParam(_this) >> 0x18; + + if (switchNo != 0xFF && dComIfGs_isSwitch(switchNo, fopAcM_GetRoomNo(_this))) { + return cPhs_ERROR_e; + } + + _this->mPrm0 = fopAcM_GetParam(_this); + if (_this->mPrm0 == 0xFF) { + _this->mPrm0 = 0; + } + + _this->mScaleX = fopAcM_GetParam(_this) >> 8; + + if (!fopAcM_entrySolidHeap(_this, (heapCallbackFunc)useHeapInit, 0x4B000)) { + return cPhs_ERROR_e; + } + + if (dComIfG_Bgsp().Regist(_this->mpBgW, _this)) { + return cPhs_ERROR_e; + } + + if (!data_80D361F8) { + _this->field_0x76c = 1; + data_80D361F8 = true; + l_HIO.field_0x4 = -1; + } + + fopAcM_SetMtx(_this, _this->mpModel->getBaseTRMtx()); + fopAcM_SetMin(_this, -1000.0f, -1000.0f, -1000.0f); + fopAcM_SetMax(_this, 1000.0f, 1000.0f, 1000.0f); + + if (_this->mScaleX != 0xFF && _this->mScaleX != 0) { + _this->mScale.x = _this->mScaleX; + } + + _this->current.pos.y -= 13.0f; + + _this->mStts.Init(255, 0, _this); + _this->mCylCc.Set(cc_cyl_src); + _this->mCylCc.SetStts(&_this->mStts); + _this->mCylCc.OnTgNoHitMark(); + + _this->mEyePos = _this->current.pos; + daObj_Web1_Execute(_this); + } + + return phase; } -#pragma pop -/* 80D35F98-80D35FE0 000CD8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s" -} -#pragma pop +/* 80D36170-80D36190 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Web1_Method */ +static actor_method_class l_daObj_Web1_Method = { + (process_method_func)daObj_Web1_Create, (process_method_func)daObj_Web1_Delete, + (process_method_func)daObj_Web1_Execute, (process_method_func)daObj_Web1_IsDelete, + (process_method_func)daObj_Web1_Draw, +}; -/* 80D35FE0-80D36028 000D20 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80D36028-80D36070 000D68 0048+00 2/1 0/0 0/0 .text __dt__16daObj_Web1_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Web1_HIO_c::~daObj_Web1_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s" -} -#pragma pop - -/* 80D36070-80D360AC 000DB0 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_web1_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_web1_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80D36070, __sinit_d_a_obj_web1_cpp); -#pragma pop - -/* 80D36120-80D36120 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80D36190-80D361C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB1 */ +extern actor_process_profile_definition g_profile_OBJ_WEB1 = { + -3, + 3, + -3, + PROC_OBJ_WEB1, + 0, + &g_fpcLf_Method.mBase, + sizeof(obj_web1_class), + 0, + 0, + &g_fopAc_Method, + 0x0030, + 0, + 0, + &l_daObj_Web1_Method, + 0x00040100, + 0, + 14, + 0, + 0, +}; diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 2b04c61fcb..5a87192790 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -55,6 +55,17 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; // Declarations: // +/* ############################################################################################## */ +/* 80450C98-80450C9C -00001 0004+00 0/0 0/0 50/50 .sbss None */ +extern u8 struct_80450C98[4]; +u8 struct_80450C98[4]; + +/* 80450C9C-80450CA0 -00001 0004+00 0/0 0/0 6/6 .sbss None */ +#pragma push +#pragma force_active on +u8 cDmr_SkipInfo; +#pragma pop + /* ############################################################################################## */ /* 80451BA8-80451BAC 0001A8 0004+00 1/1 0/0 0/0 .sdata2 @3731 */ SECTION_SDATA2 static f32 lit_3731 = 25.0f; @@ -97,7 +108,7 @@ void JPTraceParticleCallBack4::draw(JPABaseEmitter* param_0, JPABaseParticle* pa #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cDmrNowMidnaTalk() { +asm BOOL cDmrNowMidnaTalk() { nofralloc #include "asm/c/c_damagereaction/cDmrNowMidnaTalk__Fv.s" } diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp index 94b766c4f9..80608168b8 100644 --- a/src/d/a/d_a_obj_item.cpp +++ b/src/d/a/d_a_obj_item.cpp @@ -4,13 +4,13 @@ // #include "d/a/d_a_obj_item.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_item.h" +#include "d/d_item_data.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "d/d_item_data.h" -#include "d/d_item.h" -#include "d/com/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" -#include "SSystem/SComponent/c_math.h" // // Forward References: @@ -261,7 +261,7 @@ void daItem_c::initBaseMtx() { void daItem_c::setBaseMtx() { if (mpModel != NULL) { mpModel->setBaseScale(mScale); - + switch (m_itemNo) { case GREEN_RUPEE: case BLUE_RUPEE: @@ -500,18 +500,25 @@ SECTION_DATA u8 daItem_c::mFuncPtr[120] = { }; /* SECTION_DATA procFunc daItem_c::mFuncPtr[9] = { - &daItem_c::procMainNormal, &daItem_c::procMainEnemyCarry, &daItem_c::procMainSimpleGetDemo, - &daItem_c::procWaitGetDemoEvent, &daItem_c::procMainGetDemoEvent, &daItem_c::procMainBoomerangCarry, - &daItem_c::procMainSwOnWait, &daItem_c::procMainBoomHitWait, &daItem_c::procMainForceGet, + &daItem_c::procMainNormal, &daItem_c::procMainEnemyCarry, &daItem_c::procMainSimpleGetDemo, + &daItem_c::procWaitGetDemoEvent, &daItem_c::procMainGetDemoEvent, +&daItem_c::procMainBoomerangCarry, &daItem_c::procMainSwOnWait, &daItem_c::procMainBoomHitWait, +&daItem_c::procMainForceGet, }; */ /* 803B9F10-803B9F54 017030 0044+00 1/1 0/0 0/0 .data m_cyl_src__8daItem_c */ -SECTION_DATA u8 daItem_c::m_cyl_src[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x59, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, +dCcD_SrcCyl daItem_c::m_cyl_src = { + { + {0, {{0, 0, 0}, {0xFFFFFFFF, 17}, 0x59}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {dCcD_SE_NONE, 0, 0, 0, {4}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 10.0f, + 50.0f, + }, }; /* 80453574-80453578 001B74 0004+00 1/1 0/0 0/0 .sdata2 @4067 */ @@ -534,6 +541,103 @@ SECTION_SDATA2 static f32 lit_4070[1 + 1 /* padding */] = { SECTION_SDATA2 static f64 lit_4072 = 4503599627370496.0 /* cast u32 to float */; /* 8015B3D8-8015B7BC 155D18 03E4+00 1/1 0/0 0/0 .text CreateInit__8daItem_cFv */ +// matches with literals +#ifdef NONMATCHING +void daItem_c::CreateInit() { + mAcchCir.SetWall(30.0f, 30.0f); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &mSpeed, NULL, NULL); + mAcch.ClrWaterNone(); + mAcch.ClrRoofNone(); + mAcch.SetWtrChkMode(2); + mAcch.SetWaterCheckOffset(10000.0f); + + mColStatus.Init(0, 0xFF, this); + mCollider.Set(m_cyl_src); + mCollider.SetStts(&mColStatus); + mCollider.SetCoHitCallback(itemGetCoCallBack); + mCollider.SetTgHitCallback(itemGetTgCallBack); + + f32 cylHeight = dItem_data::getH(m_itemNo); + f32 cylRadius = dItem_data::getR(m_itemNo); + + if (mScale.x > 1.0f) { + cylHeight *= mScale.x; + cylRadius *= mScale.x; + } + + mCollider.SetR(cylRadius); + mCollider.SetH(cylHeight); + + setCullInfo(); + + field_0x942 = getData().field_0x16; + field_0x944 = getData().field_0x18; + + procInitNormal(); + show(); + + field_0x930.setAll(1.0f); + + switch (daItem_prm::getType(this)) { + case 5: + hide(); + procInitBoomHitWait(); + break; + case 7: + procInitForceGet(); + break; + case 4: + procInitSimpleGetDemo(); + procMainSimpleGetDemo(); + break; + default: + case 6: + field_0x93c = daItem_prm::getSwitchNo(this); + if (field_0x93c != 0xFF && !i_fopAcM_isSwitch(this, field_0x93c)) { + hide(); + setFlag(8); + procInitSwOnWait(); + } + break; + } + + initAction(); + initBaseMtx(); + animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + + if (m_itemNo == BOOMERANG) { + itemGetNextExecute(); + } else if ((m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) && + field_0x998.getEmitter() == NULL) { + dComIfGp_particle_set(0x0C14, &field_0x9ac, NULL, NULL, -1, &field_0x998, -1, NULL, NULL, + NULL); + } + + field_0x978.init(¤t.pos, 1); + + f32 old_speedF = mSpeedF; + cXyz old_speed = mSpeed; + + mAcch.CrrPos(dComIfG_Bgsp()); + + if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > orig.pos.y + 150.0f) { + field_0x9c0 = 1; + } + + if (daItem_prm::checkInWater(this) == true) { + field_0x9c0 = 1; + } + + mSpeedF = old_speedF; + mSpeed = old_speed; + + mAcch.ClrGroundLanding(); + mAcch.i_ClrGroundHit(); + mAcch.ClrWaterHit(); + mAcch.ClrWaterIn(); + mAcch.ClrWallHit(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -542,6 +646,7 @@ asm void daItem_c::CreateInit() { #include "asm/a/obj/d_a_obj_item/CreateInit__8daItem_cFv.s" } #pragma pop +#endif /* 8015B7BC-8015B7D4 1560FC 0018+00 1/1 0/0 0/0 .text setCullInfo__8daItem_cFv */ void daItem_c::setCullInfo() { @@ -668,7 +773,8 @@ int daItem_c::_daItem_create() { phase_state = dComIfG_resLoad(&mPhase, dItem_data::getFieldArc(m_itemNo)); if (phase_state == cPhs_COMPLEATE_e) { - if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckFieldItemCreateHeap, dItem_data::getFieldHeapSize(m_itemNo))) { + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckFieldItemCreateHeap, + dItem_data::getFieldHeapSize(m_itemNo))) { return cPhs_ERROR_e; } else { CreateInit(); @@ -713,7 +819,7 @@ SECTION_SDATA2 static f32 lit_4321 = 18.0f; int daItem_c::_daItem_execute() { field_0x950 = mSpeed; CountTimer(); - + mEyePos = current.pos; mEyePos.y += (f32)dItem_data::getH(m_itemNo) * 0.5f; @@ -750,7 +856,6 @@ int daItem_c::_daItem_execute() { daPy_getPlayerActorClass()->setHookshotCarryOffset(fopAcM_GetID(this), &carry_pos); } - animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); setBaseMtx(); field_0x978.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); @@ -910,7 +1015,8 @@ void daItem_c::procInitGetDemoEvent() { fopAcM_orderItemEvent(this, 0, 0); mEvtInfo.i_onCondition(8); - m_item_id = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), NULL, NULL); + m_item_id = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), + NULL, NULL); setStatus(3); } @@ -1203,7 +1309,8 @@ void daItem_c::itemGetNextExecute() { case ORANGE_RUPEE: case SILVER_RUPEE: case PACHINKO_SHOT: - if (daPy_getPlayerActorClass()->checkCanoeRide() || daPy_getPlayerActorClass()->checkHorseRide()) { + if (daPy_getPlayerActorClass()->checkCanoeRide() || + daPy_getPlayerActorClass()->checkHorseRide()) { if (checkItemGet(m_itemNo, 1)) { haveItem = true; } @@ -1306,7 +1413,7 @@ BOOL daItem_c::checkCountTimer() { if (i_dComIfGp_event_runCheck()) { count = false; } - + if (mStatus == 5 || fopAcM_checkHookCarryNow(this)) { count = false; } @@ -1578,8 +1685,7 @@ static asm void daItem_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_d_a_obj_item_cpp() { - nofralloc +asm void __sinit_d_a_obj_item_cpp(){nofralloc #include "asm/a/obj/d_a_obj_item/__sinit_d_a_obj_item_cpp.s" } #pragma pop diff --git a/src/d/bg/d_bg_pc.cpp b/src/d/bg/d_bg_pc.cpp index e90096b82f..8b98f83b16 100644 --- a/src/d/bg/d_bg_pc.cpp +++ b/src/d/bg/d_bg_pc.cpp @@ -1,6 +1,9 @@ +/** + * d_bg_pc.cpp + * + */ + #include "d/bg/d_bg_pc.h" -#include "dol2asm.h" -#include "dolphin/types.h" void dBgPc::setCode(sBgPc& code) { m_code = code; diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index 5c15f0b296..d04cba9df7 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -1048,27 +1048,6 @@ f32 dBgS_GetNY(cBgS_PolyInfo const& poly) { return pla.mNormal.y; } -/* ############################################################################################## */ -/* 803AB608-803AB61C 008728 0014+00 0/0 3/3 0/0 .data __vt__4dBgS */ -SECTION_DATA extern void* __vt__4dBgS[5] = { - (void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__4dBgSFv, - (void*)Ct__4dBgSFv, (void*)Dt__4dBgSFv, -}; - -/* 803AB61C-803AB630 00873C 0014+00 0/0 4/4 0/0 .data __vt__4cBgS */ -SECTION_DATA extern void* __vt__4cBgS[5] = { - (void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__4cBgSFv, - (void*)Ct__4cBgSFv, (void*)Dt__4cBgSFv, -}; - -/* 803AB630-803AB640 008750 0010+00 0/0 2/2 0/0 .data __vt__11cBgS_ChkElm */ -SECTION_DATA extern void* __vt__11cBgS_ChkElm[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11cBgS_ChkElmFv, - (void*)Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv, -}; - /* 80450F68-80450F70 000468 0008+00 0/0 1/1 0/0 .sbss None */ extern u8 data_80450F68[8]; u8 data_80450F68[8] ALIGN_DECL(8); diff --git a/src/d/bg/d_bg_s_chk.cpp b/src/d/bg/d_bg_s_chk.cpp index 79474f4054..bc8251a5e4 100644 --- a/src/d/bg/d_bg_s_chk.cpp +++ b/src/d/bg/d_bg_s_chk.cpp @@ -1,56 +1,15 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_chk -// +/** + * d_bg_s_chk.cpp + * + */ #include "d/bg/d_bg_s_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__8dBgS_ChkFv(); -extern "C" void __dt__8dBgS_ChkFv(); -extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv(); -extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv(); -extern "C" static void func_80077574(); - -// -// External References: -// - -extern "C" void __ct__15dBgS_GrpPassChkFv(); -extern "C" void __dt__15dBgS_GrpPassChkFv(); -extern "C" void __ct__16dBgS_PolyPassChkFv(); -extern "C" void __dt__16dBgS_PolyPassChkFv(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803AB670-803AB688 008790 0018+00 2/2 0/0 0/0 .data __vt__8dBgS_Chk */ -SECTION_DATA extern void* __vt__8dBgS_Chk[6] = { - (void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__8dBgS_ChkFv, (void*)NULL, (void*)NULL, - (void*)func_80077574, -}; /* 8007749C-800774E8 071DDC 004C+00 0/0 6/6 0/0 .text __ct__8dBgS_ChkFv */ dBgS_Chk::dBgS_Chk() {} /* 800774E8-80077560 071E28 0078+00 2/1 6/6 0/0 .text __dt__8dBgS_ChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_Chk::~dBgS_Chk() { -extern "C" asm void __dt__8dBgS_ChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s" -} -#pragma pop +dBgS_Chk::~dBgS_Chk() {} /* 80077560-80077564 071EA0 0004+00 0/0 6/6 0/0 .text GetPolyPassChkInfo__8dBgS_ChkFv */ cBgS_PolyPassChk* dBgS_Chk::GetPolyPassChkInfo() { @@ -61,13 +20,3 @@ cBgS_PolyPassChk* dBgS_Chk::GetPolyPassChkInfo() { cBgS_GrpPassChk* dBgS_Chk::GetGrpPassChkInfo() { return this; } - -/* 80077574-8007757C 071EB4 0008+00 1/0 0/0 0/0 .text @16@__dt__8dBgS_ChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077574() { - nofralloc -#include "asm/d/bg/d_bg_s_chk/func_80077574.s" -} -#pragma pop diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp index 90ee3982d9..09f479d083 100644 --- a/src/d/bg/d_bg_s_movebg_actor.cpp +++ b/src/d/bg/d_bg_s_movebg_actor.cpp @@ -56,21 +56,6 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; // Declarations: // -/* ############################################################################################## */ -/* 803AB9A0-803AB9C8 008AC0 0028+00 1/1 0/0 34/34 .data __vt__16dBgS_MoveBgActor */ -SECTION_DATA extern void* __vt__16dBgS_MoveBgActor[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__16dBgS_MoveBgActorFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__16dBgS_MoveBgActorFPPA3_A4_f, - (void*)Draw__16dBgS_MoveBgActorFv, - (void*)Delete__16dBgS_MoveBgActorFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - /* 80078624-80078668 072F64 0044+00 0/0 0/0 173/173 .text __ct__16dBgS_MoveBgActorFv */ dBgS_MoveBgActor::dBgS_MoveBgActor() { field_0x568 = NULL; diff --git a/src/d/bg/d_bg_s_roof_chk.cpp b/src/d/bg/d_bg_s_roof_chk.cpp index fb4e37b0c8..2a0387ec65 100644 --- a/src/d/bg/d_bg_s_roof_chk.cpp +++ b/src/d/bg/d_bg_s_roof_chk.cpp @@ -1,58 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_roof_chk -// +/** + * d_bg_s_roof_chk.cpp + * + */ #include "d/bg/d_bg_s_roof_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__12dBgS_RoofChkFv(); -extern "C" void __dt__12dBgS_RoofChkFv(); -extern "C" void Init__12dBgS_RoofChkFv(); -extern "C" static void func_8007914C(); -extern "C" static void func_80079154(); -extern "C" static void func_8007915C(); - -// -// External References: -// - -extern "C" void __ct__8dBgS_ChkFv(); -extern "C" void __dt__8dBgS_ChkFv(); -extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv(); -extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv(); -extern "C" void __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ClearPi__13cBgS_PolyInfoFv(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803ABA50-803ABA80 008B70 0030+00 2/2 0/0 0/0 .data __vt__12dBgS_RoofChk */ -SECTION_DATA extern void* __vt__12dBgS_RoofChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_RoofChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_8007914C, - (void*)NULL, - (void*)NULL, - (void*)func_8007915C, - (void*)NULL, - (void*)NULL, - (void*)func_80079154, -}; /* 80078FF4-80079090 073934 009C+00 0/0 10/10 1/1 .text __ct__12dBgS_RoofChkFv */ dBgS_RoofChk::dBgS_RoofChk() { @@ -66,48 +17,10 @@ dBgS_RoofChk::dBgS_RoofChk() { } /* 80079090-80079124 0739D0 0094+00 4/3 11/11 1/1 .text __dt__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_RoofChk::~dBgS_RoofChk() { -extern "C" asm void __dt__12dBgS_RoofChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s" -} -#pragma pop +dBgS_RoofChk::~dBgS_RoofChk() {} /* 80079124-8007914C 073A64 0028+00 0/0 1/1 0/0 .text Init__12dBgS_RoofChkFv */ void dBgS_RoofChk::Init() { SetNowY(1000000000.0f); ClearPi(); } - -/* 8007914C-80079154 073A8C 0008+00 1/0 0/0 0/0 .text @16@__dt__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007914C() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/func_8007914C.s" -} -#pragma pop - -/* 80079154-8007915C 073A94 0008+00 1/0 0/0 0/0 .text @52@__dt__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80079154() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/func_80079154.s" -} -#pragma pop - -/* 8007915C-80079164 073A9C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007915C() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/func_8007915C.s" -} -#pragma pop diff --git a/src/d/bg/d_bg_s_sph_chk.cpp b/src/d/bg/d_bg_s_sph_chk.cpp index a79529cc43..e92a7e70d0 100644 --- a/src/d/bg/d_bg_s_sph_chk.cpp +++ b/src/d/bg/d_bg_s_sph_chk.cpp @@ -1,64 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_sph_chk -// +/** + * d_bg_s_sph_chk.cpp + * + */ #include "d/bg/d_bg_s_sph_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__11dBgS_SphChkFv(); -extern "C" void __dt__11dBgS_SphChkFv(); -extern "C" static void func_80078B70(); -extern "C" static void func_80078B78(); -extern "C" static void func_80078B80(); -extern "C" static void func_80078B88(); - -// -// External References: -// - -extern "C" void __ct__8dBgS_ChkFv(); -extern "C" void __dt__8dBgS_ChkFv(); -extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv(); -extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv(); -extern "C" void __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ClearPi__13cBgS_PolyInfoFv(); -extern "C" void __dl__FPv(); -extern "C" extern void* __vt__8cM3dGSph[3]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803AB9C8-803ABA08 008AE8 003C+04 2/2 0/0 0/0 .data __vt__11dBgS_SphChk */ -SECTION_DATA extern void* __vt__11dBgS_SphChk[15 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11dBgS_SphChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80078B70, - (void*)NULL, - (void*)NULL, - (void*)func_80078B78, - (void*)NULL, - (void*)NULL, - (void*)func_80078B88, - (void*)NULL, - (void*)NULL, - (void*)func_80078B80, - /* padding */ - NULL, -}; /* 80078A14-80078AC0 073354 00AC+00 0/0 1/1 1/1 .text __ct__11dBgS_SphChkFv */ dBgS_SphChk::dBgS_SphChk() { @@ -71,43 +16,3 @@ dBgS_SphChk::dBgS_SphChk() { /* 80078AC0-80078B70 073400 00B0+00 5/4 2/2 0/0 .text __dt__11dBgS_SphChkFv */ dBgS_SphChk::~dBgS_SphChk() {} - -/* 80078B70-80078B78 0734B0 0008+00 1/0 0/0 0/0 .text @20@__dt__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078B70() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/func_80078B70.s" -} -#pragma pop - -/* 80078B78-80078B80 0734B8 0008+00 1/0 0/0 0/0 .text @36@__dt__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078B78() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/func_80078B78.s" -} -#pragma pop - -/* 80078B80-80078B88 0734C0 0008+00 1/0 0/0 0/0 .text @72@__dt__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078B80() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/func_80078B80.s" -} -#pragma pop - -/* 80078B88-80078B90 0734C8 0008+00 1/0 0/0 0/0 .text @56@__dt__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078B88() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/func_80078B88.s" -} -#pragma pop diff --git a/src/d/bg/d_bg_s_spl_grp_chk.cpp b/src/d/bg/d_bg_s_spl_grp_chk.cpp index 68900a8c79..aed701f8a1 100644 --- a/src/d/bg/d_bg_s_spl_grp_chk.cpp +++ b/src/d/bg/d_bg_s_spl_grp_chk.cpp @@ -1,42 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_spl_grp_chk -// +/** + * d_bg_s_spl_grp_chk.cpp + * + */ #include "d/bg/d_bg_s_spl_grp_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void Set__14dBgS_SplGrpChkFR4cXyzf(); -extern "C" void __ct__14dBgS_SplGrpChkFv(); -extern "C" void __dt__14dBgS_SplGrpChkFv(); -extern "C" void Init__14dBgS_SplGrpChkFv(); -extern "C" static void func_80078D4C(); -extern "C" static void func_80078D54(); -extern "C" static void func_80078D5C(); - -// -// External References: -// - -extern "C" void __ct__8dBgS_ChkFv(); -extern "C" void __dt__8dBgS_ChkFv(); -extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv(); -extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv(); -extern "C" void __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ClearPi__13cBgS_PolyInfoFv(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// /* 80078B90-80078BB0 0734D0 0020+00 0/0 2/2 3/3 .text Set__14dBgS_SplGrpChkFR4cXyzf */ void dBgS_SplGrpChk::Set(cXyz& ground, f32 roof) { @@ -44,23 +11,6 @@ void dBgS_SplGrpChk::Set(cXyz& ground, f32 roof) { m_roof = roof; } -/* ############################################################################################## */ -/* 803ABA08-803ABA38 008B28 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_SplGrpChk */ -SECTION_DATA extern void* __vt__14dBgS_SplGrpChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14dBgS_SplGrpChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80078D4C, - (void*)NULL, - (void*)NULL, - (void*)func_80078D5C, - (void*)NULL, - (void*)NULL, - (void*)func_80078D54, -}; - /* 80078BB0-80078C78 0734F0 00C8+00 0/0 1/1 0/0 .text __ct__14dBgS_SplGrpChkFv */ dBgS_SplGrpChk::dBgS_SplGrpChk() { SetPolyPassChk(GetPolyPassChkInfo()); @@ -88,33 +38,3 @@ void dBgS_SplGrpChk::Init() { SetHeight(GetPosP().y); ClearPi(); } - -/* 80078D4C-80078D54 07368C 0008+00 1/0 0/0 0/0 .text @16@__dt__14dBgS_SplGrpChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078D4C() { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s" -} -#pragma pop - -/* 80078D54-80078D5C 073694 0008+00 1/0 0/0 0/0 .text @52@__dt__14dBgS_SplGrpChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078D54() { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s" -} -#pragma pop - -/* 80078D5C-80078D64 07369C 0008+00 1/0 0/0 0/0 .text @36@__dt__14dBgS_SplGrpChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078D5C() { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s" -} -#pragma pop diff --git a/src/d/bg/d_bg_s_wtr_chk.cpp b/src/d/bg/d_bg_s_wtr_chk.cpp index 499179c8ab..6e1c83835d 100644 --- a/src/d/bg/d_bg_s_wtr_chk.cpp +++ b/src/d/bg/d_bg_s_wtr_chk.cpp @@ -1,6 +1,9 @@ +/** + * d_bg_s_wtr_chk.cpp + * + */ + #include "d/bg/d_bg_s_wtr_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" dBgS_WtrChk::dBgS_WtrChk() { OnWaterGrp(); diff --git a/src/d/bg/d_bg_w_base.cpp b/src/d/bg/d_bg_w_base.cpp index 050a7cdd63..28b72cda0a 100644 --- a/src/d/bg/d_bg_w_base.cpp +++ b/src/d/bg/d_bg_w_base.cpp @@ -1,128 +1,17 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_w_base -// +/** + * d_bg_w_base.cpp + * + */ #include "d/bg/d_bg_w_base.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__9dBgW_BaseFv(); -extern "C" void __dt__9cBgW_BgIdFv(); -extern "C" void __dt__9dBgW_BaseFv(); -extern "C" void ClrDBgWBase__9dBgW_BaseFv(); -extern "C" bool ChkMemoryError__9dBgW_BaseFv(); -extern "C" void CallRideCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" void CallArrowStickCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_cR4cXyz(); -extern "C" void CalcDiffShapeAngleY__9dBgW_BaseFs(); - -// -// External References: -// - -extern "C" void SetOldShapeAngleY__9dBgW_BaseFs(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803ABCC8-803ABDB8 008DE8 00F0+00 2/2 0/0 0/0 .data __vt__9dBgW_Base */ -SECTION_DATA extern void* __vt__9dBgW_Base[60] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9dBgW_BaseFv, - (void*)ChkMemoryError__9dBgW_BaseFv, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)SetOldShapeAngleY__9dBgW_BaseFs, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)CallRideCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_c, - (void*)CallArrowStickCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_cR4cXyz, -}; - -/* 803ABDB8-803ABDC8 008ED8 000C+04 3/3 0/0 0/0 .data __vt__9cBgW_BgId */ -SECTION_DATA extern void* __vt__9cBgW_BgId[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9cBgW_BgIdFv, - /* padding */ - NULL, -}; /* 8007E5A8-8007E5F8 078EE8 0050+00 0/0 2/2 0/0 .text __ct__9dBgW_BaseFv */ dBgW_Base::dBgW_Base() { ClrDBgWBase(); } -/* 8007E5F8-8007E640 078F38 0048+00 1/0 0/0 0/0 .text __dt__9cBgW_BgIdFv */ -cBgW_BgId::~cBgW_BgId() {} - /* 8007E640-8007E69C 078F80 005C+00 1/0 2/2 0/0 .text __dt__9dBgW_BaseFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgW_Base::~dBgW_Base() { -extern "C" asm void __dt__9dBgW_BaseFv() { - nofralloc -#include "asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s" -} -#pragma pop +dBgW_Base::~dBgW_Base() {} /* 8007E69C-8007E6D0 078FDC 0034+00 1/1 1/1 0/0 .text ClrDBgWBase__9dBgW_BaseFv */ void dBgW_Base::ClrDBgWBase() { diff --git a/src/d/cc/d_cc_mass_s.cpp b/src/d/cc/d_cc_mass_s.cpp index ef0b179a28..95c93417f1 100644 --- a/src/d/cc/d_cc_mass_s.cpp +++ b/src/d/cc/d_cc_mass_s.cpp @@ -1,13 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d/cc/d_cc_mass_s -// +/** + * d_cc_mass_s.cpp + * + */ #include "d/cc/d_cc_mass_s.h" #include "SSystem/SComponent/c_math.h" #include "d/cc/d_cc_d.h" -#include "dol2asm.h" -#include "dolphin/types.h" /* 800852E0-800852F0 07FC20 0010+00 1/1 0/0 0/0 .text * Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v */ @@ -156,7 +154,8 @@ u32 dCcMassS_Mng::Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitI cCcD_ShapeAttr* objShape = obj->GetShapeAttr(); cXyz unusedVec; if (obj->ChkAtSet() && !gobjInf->ChkAtNoMass() && - mCylAttr.CrossAtTg(*objShape, &unusedVec) && (field_0x200 & 1)) { + mCylAttr.CrossAtTg(*objShape, &unusedVec) && (field_0x200 & 1)) + { flagsMaybe |= 1; *p_actor = obj->GetStts()->GetAc(); if (p_hitInf != NULL) { diff --git a/src/d/cc/d_cc_s.cpp b/src/d/cc/d_cc_s.cpp index 59beb30238..3d5095e9ed 100644 --- a/src/d/cc/d_cc_s.cpp +++ b/src/d/cc/d_cc_s.cpp @@ -1,12 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d/cc/d_cc_s -// +/** + * d_cc_s.cpp + * + */ #include "d/cc/d_cc_s.h" +#include "JSystem/JMath/JMath.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "dolphin/types.h" // // Forward References: @@ -111,38 +111,94 @@ void dCcS::Dt() { cCcS::Dt(); } -/* ############################################################################################## */ -/* 80452778-8045277C 000D78 0004+00 3/3 0/0 0/0 .sdata2 @3705 */ -SECTION_SDATA2 static u8 lit_3705[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 80085F28-800860F8 080868 01D0+00 1/1 0/0 0/0 .text * ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::ChkShieldFrontRange(cCcD_Obj* param_0, cCcD_Obj* param_1, int param_2, - cXyz const* param_3) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s" +bool dCcS::ChkShieldFrontRange(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, int param_2, + cXyz const* i_hitPos) { + dCcD_GObjInf* atObj = (dCcD_GObjInf*)i_atObj->GetGObjInf(); + if (atObj == NULL) { + return false; + } + + dCcD_GObjInf* tgObj = (dCcD_GObjInf*)i_tgObj->GetGObjInf(); + if (tgObj == NULL) { + return false; + } + + fopAc_ac_c* tgActor = tgObj->GetAc(); + if (tgActor == NULL) { + return false; + } + + csXyz sp10; + CalcParticleAngle(atObj, i_atObj->GetStts(), i_tgObj->GetStts(), &sp10); + + if (param_2 != 0) { + dJntCol_c* jntcol = fopAcM_GetJntCol(tgActor); + + if (jntcol != NULL) { + cXyz pos; + csXyz angle; + + int temp_r3 = jntcol->getHitmarkPosAndAngle(i_hitPos, &sp10, &pos, &angle, 0); + + if (temp_r3 >= 0 && jntcol->checkShieldType(temp_r3)) { + cXyz sp18; + mDoMtx_stack_c::ZXYrotS(sp10); + mDoMtx_stack_c::multVecSR(&cXyz::BaseZ, &sp18); + mDoMtx_stack_c::ZXYrotS(angle); + mDoMtx_stack_c::multVecSR(&cXyz::BaseZ, &pos); + + if (pos.inprod(sp18) > 0.0f) { + return true; + } else { + return false; + } + } + + return false; + } + } + + s16 var_r4; + if (tgObj->GetTgShieldFrontRangeYAngle() != NULL) { + var_r4 = *tgObj->GetTgShieldFrontRangeYAngle(); + } else { + var_r4 = fopAcM_GetShapeAngle_p(tgActor).y; + } + + s16 shield_range = tgObj->GetTgShieldRange(); + if (param_2 != 0) { + shield_range >>= 1; + } + + if (cLib_distanceAngleS(sp10.y - -0x8000, var_r4) > shield_range) { + return false; + } + + return true; } -#pragma pop /* 800860F8-800861B0 080A38 00B8+00 1/1 0/0 0/0 .text * ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::ChkShield(cCcD_Obj* param_0, cCcD_Obj* param_1, dCcD_GObjInf* param_2, - dCcD_GObjInf* param_3, cXyz const* param_4) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s" +bool dCcS::ChkShield(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, dCcD_GObjInf* i_atObjInf, + dCcD_GObjInf* i_tgObjInf, cXyz const* i_hitPos) { + if (i_atObjInf->ChkAtNoGuard()) { + return false; + } + + if (i_tgObjInf->ChkTgShield() || i_tgObjInf->ChkTgSpShield() || + (i_tgObjInf->ChkTgSmallShield() && i_atObjInf->GetAtSpl() == 8)) + { + if (i_tgObjInf->ChkTgShieldFrontRange()) { + return ChkShieldFrontRange(i_atObj, i_tgObj, !i_tgObjInf->ChkTgShield(), i_hitPos); + } + + return true; + } + + return false; } -#pragma pop /* 800861B0-800861B4 080AF0 0004+00 1/0 0/0 0/0 .text * CalcTgPlusDmg__4dCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts */ @@ -154,20 +210,81 @@ void dCcS::CalcTgPlusDmg(cCcD_Obj* param_0, cCcD_Obj* param_1, cCcD_Stts* param_ /* 800861B4-80086240 080AF4 008C+00 1/0 0/0 0/0 .text * ChkAtTgHitAfterCross__4dCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dCcS::ChkAtTgHitAfterCross(bool param_0, bool param_1, cCcD_GObjInf const* param_2, - cCcD_GObjInf const* param_3, cCcD_Stts* param_4, - cCcD_Stts* param_5, cCcD_GStts* param_6, cCcD_GStts* param_7) { - nofralloc -#include "asm/d/cc/d_cc_s/func_800861B4.s" +bool dCcS::ChkAtTgHitAfterCross(bool i_setAt, bool i_setTg, cCcD_GObjInf const* i_atObjInf, + cCcD_GObjInf const* i_tgObjInf, cCcD_Stts* param_4, + cCcD_Stts* param_5, cCcD_GStts* param_6, cCcD_GStts* param_7) { + dCcD_GObjInf* atObjInf = (dCcD_GObjInf*)i_atObjInf; + dCcD_GObjInf* tgObjInf = (dCcD_GObjInf*)i_tgObjInf; + + u32 tgApid = param_4->GetApid(); + u32 atApid = param_5->GetApid(); + + if (i_setAt) { + static_cast(param_6)->SetAtApid(atApid); + + if (atObjInf->ChkAtNoConHit() && !tgObjInf->ChkTgStopNoConHit()) { + if (static_cast(param_6)->GetAtOldApid() == param_5->GetApid()) { + return true; + } + } + } + + if (i_setTg) { + static_cast(param_7)->SetTgApid(tgApid); + + if (tgObjInf->ChkTgNoConHit() && !atObjInf->ChkAtStopNoConHit()) { + if (static_cast(param_7)->GetTgOldApid() == param_4->GetApid()) { + return true; + } + } + } + + return false; } -#pragma pop /* 80086240-80086360 080B80 0120+00 1/0 0/0 0/0 .text * SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts */ +// weird reg alloc +#ifdef NONMATCHING +void dCcS::SetCoGObjInf(bool param_0, bool param_1, cCcD_GObjInf* param_2, cCcD_GObjInf* param_3, + cCcD_Stts* param_4, cCcD_Stts* param_5, cCcD_GStts* param_6, + cCcD_GStts* param_7) { + if (param_0) { + static_cast(param_2)->SetCoHitApid(param_5->GetApid()); + + if (static_cast(param_7)->ChkNoActor()) { + static_cast(param_2)->OnCoHitNoActor(); + } + } + + if (param_1) { + static_cast(param_3)->SetCoHitApid(param_4->GetApid()); + + if (static_cast(param_6)->ChkNoActor()) { + static_cast(param_3)->OnCoHitNoActor(); + } + } + + if (param_0) { + dCcD_HitCallback cb = static_cast(param_2)->GetCoHitCallback(); + + if (cb != NULL) { + cb(param_2->GetAc(), static_cast(param_2), param_3->GetAc(), + static_cast(param_3)); + } + } + + if (param_1) { + dCcD_HitCallback cb = static_cast(param_3)->GetCoHitCallback(); + + if (cb != NULL) { + cb(param_3->GetAc(), static_cast(param_3), param_2->GetAc(), + static_cast(param_2)); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -178,16 +295,52 @@ asm void dCcS::SetCoGObjInf(bool param_0, bool param_1, cCcD_GObjInf* param_2, #include "asm/d/cc/d_cc_s/SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts.s" } #pragma pop +#endif /* 80086360-80086404 080CA0 00A4+00 1/1 0/0 0/0 .text GetRank__4dCcSFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::GetRank(u8 param_0) { - nofralloc -#include "asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s" +int dCcS::GetRank(u8 weight) { + if (weight == 255) { + return 10; + } + + if (weight == 254) { + return 9; + } + + if (weight >= 217) { + return 8; + } + + if (weight >= 181) { + return 7; + } + + if (weight >= 145) { + return 6; + } + + if (weight >= 109) { + return 5; + } + + if (weight >= 73) { + return 4; + } + + if (weight >= 37) { + return 3; + } + + if (weight >= 2) { + return 2; + } + + if (weight == 1) { + return 1; + } + + return 0; } -#pragma pop /* 80086404-8008640C 080D44 0008+00 1/0 0/0 0/0 .text ChkNoHitGCo__4dCcSFP8cCcD_ObjP8cCcD_Obj */ bool dCcS::ChkNoHitGCo(cCcD_Obj* param_0, cCcD_Obj* param_1) { @@ -196,174 +349,208 @@ bool dCcS::ChkNoHitGCo(cCcD_Obj* param_0, cCcD_Obj* param_1) { /* ############################################################################################## */ /* 803AC328-803AC3A4 009448 0079+03 1/1 0/0 0/0 .data rank_tbl */ -SECTION_DATA static u8 rank_tbl[121 + 3 /* padding */] = { - 0x00, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x32, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x19, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x4B, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x32, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, +static u8 rank_tbl[11][11] = { + 0x00, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x00, 0x32, 0x64, 0x64, 0x64, + 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x32, 0x4B, 0x5A, 0x64, 0x64, 0x64, 0x64, 0x64, + 0x64, 0x00, 0x00, 0x19, 0x32, 0x4B, 0x5A, 0x64, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x0A, 0x19, + 0x32, 0x4B, 0x5A, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x00, 0x0A, 0x19, 0x32, 0x4B, 0x5A, 0x64, + 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x19, 0x32, 0x4B, 0x5A, 0x64, 0x64, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0A, 0x19, 0x32, 0x4B, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x19, + 0x32, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x64, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 8045277C-80452780 000D7C 0004+00 1/1 0/0 0/0 .sdata2 @3924 */ -SECTION_SDATA2 static f32 lit_3924 = 1.0f / 100.0f; - -/* 80452780-80452788 000D80 0004+04 2/2 0/0 0/0 .sdata2 @3925 */ -SECTION_SDATA2 static f32 lit_3925[1 + 1 /* padding */] = { - -1.0f, - /* padding */ - 0.0f, -}; - -/* 80452788-80452790 000D88 0008+00 1/1 0/0 0/0 .sdata2 @3927 */ -SECTION_SDATA2 static f64 lit_3927 = 4503599627370496.0 /* cast u32 to float */; - /* 8008640C-80086754 080D4C 0348+00 1/0 0/0 0/0 .text * SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::SetPosCorrect(cCcD_Obj* param_0, cXyz* param_1, cCcD_Obj* param_2, cXyz* param_3, - f32 param_4) { - nofralloc -#include "asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s" +void dCcS::SetPosCorrect(cCcD_Obj* param_0, cXyz* param_1, cCcD_Obj* param_2, cXyz* param_3, + f32 param_4) { + if (param_0->ChkCoNoCrr() || param_2->ChkCoNoCrr()) { + return; + } + + if (param_0->GetStts() == NULL || param_2->GetStts() == NULL) { + return; + } + + if (cM3d_IsZero(param_4)) { + return; + } + + SetCoGCorrectProc(param_0, param_2); + + bool bvar2 = false; + if (param_0->ChkCoSph3DCrr() && param_2->ChkCoSph3DCrr()) { + bvar2 = true; + } + + if ((param_0->GetStts()->GetWeightUc() == 0 && param_2->GetStts()->GetWeightUc() == 0) || + (param_0->GetStts()->GetWeightUc() == 0xFF && param_2->GetStts()->GetWeightUc() == 0xFF)) + { + return; + } + + int weight1 = GetRank(param_0->GetStts()->GetWeightUc()); + int weight2 = GetRank(param_2->GetStts()->GetWeightUc()); + u8 rank = rank_tbl[weight1][weight2]; + + f32 fvar1 = rank * 0.01f; + f32 fvar2 = (u8)(100 - rank) * 0.01f; + + cXyz local_b0; + cXyz local_bc; + Vec local_c8; + + f32 fvar14; + if (bvar2) { + PSVECSubtract(param_3, param_1, &local_c8); + fvar14 = PSVECMag(&local_c8); + } else { + local_c8.x = param_3->x - param_1->x; + local_c8.y = 0.0f; + local_c8.z = param_3->z - param_1->z; + fvar14 = JMAFastSqrt((local_c8.x * local_c8.x) + (local_c8.z * local_c8.z)); + } + + if (!cM3d_IsZero(fvar14)) { + if (bvar2) { + PSVECScale(&local_c8, &local_c8, param_4 / fvar14); + fvar1 *= -1.0f; + PSVECScale(&local_c8, &local_b0, fvar1); + PSVECScale(&local_c8, &local_bc, fvar2); + } else { + fvar14 = param_4 / fvar14; + local_c8.x *= fvar14; + local_c8.z *= fvar14; + + local_b0.x = -local_c8.x * fvar1; + local_b0.y = 0.0f; + local_b0.z = -local_c8.z * fvar1; + + local_bc.x = local_c8.x * fvar2; + local_bc.y = 0.0f; + local_bc.z = local_c8.z * fvar2; + } + } else { + local_b0.y = 0.0f; + local_b0.z = 0.0f; + local_bc.y = 0.0f; + local_bc.z = 0.0f; + + if (!cM3d_IsZero(param_4)) { + local_b0.x = -param_4 * fvar1; + local_bc.x = param_4 * fvar2; + } else { + local_b0.x = -fvar1; + local_bc.x = fvar2; + } + } + + param_0->GetStts()->PlusCcMove(local_b0.x, local_b0.y, local_b0.z); + param_2->GetStts()->PlusCcMove(local_bc.x, local_bc.y, local_bc.z); + *param_1 += local_b0; + *param_3 += local_bc; } -#pragma pop /* 80086754-8008685C 081094 0108+00 1/0 0/0 0/0 .text * CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::CalcParticleAngle(dCcD_GObjInf* param_0, cCcD_Stts* param_1, cCcD_Stts* param_2, - csXyz* param_3) { - nofralloc -#include "asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s" +void dCcS::CalcParticleAngle(dCcD_GObjInf* i_atObjInf, cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts, + csXyz* o_angle) { + cXyz vec(*i_atObjInf->GetAtVecP()); + + if (cM3d_IsZero(PSVECMag(&vec))) { + fopAc_ac_c* atActor = i_atStts->GetActor(); + fopAc_ac_c* tgActor = i_tgStts->GetActor(); + + if (atActor == NULL || tgActor == NULL) { + vec.z = 0.0f; + vec.x = 0.0f; + vec.y = -1.0f; + } else { + PSVECSubtract(&tgActor->current.pos, &atActor->current.pos, &vec); + + if (cM3d_IsZero(PSVECMag(&vec))) { + vec.z = 0.0f; + vec.x = 0.0f; + vec.y = -1.0f; + } else { + PSVECNormalize(&vec, &vec); + } + } + } else { + PSVECNormalize(&vec, &vec); + } + + cM3d_CalcVecZAngle(vec, o_angle); } -#pragma pop /* 8008685C-80086AC0 08119C 0264+00 1/1 0/0 0/0 .text * ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb */ +// one branch issue +#ifdef NONMATCHING +void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Obj* param_3, + dCcD_GObjInf* i_atObjInf, dCcD_GObjInf* i_tgObjInf, cCcD_Stts* param_6, + cCcD_Stts* param_7, dCcD_GStts* param_8, dCcD_GStts* param_9, + cXyz* i_hitPos, bool i_chkShield) { + if (!i_atObjInf->ChkAtNoHitMark() && !i_tgObjInf->ChkTgNoHitMark() && + (i_atObjInf->GetAtType() != AT_TYPE_10000000 || i_tgObjInf->GetAc() == NULL || + fopAcM_checkStatus(i_tgObjInf->GetAc(), AT_TYPE_10000000))) + { + if ((i_atObjInf->GetAtType() & + (AT_TYPE_WOLF_ATTACK | AT_TYPE_WOLF_CUT_TURN | AT_TYPE_10000000 | AT_TYPE_MIDNA_LOCK | + AT_TYPE_HOOKSHOT | AT_TYPE_SHIELD_ATTACK | AT_TYPE_NORMAL_SWORD)) == 0 || + i_tgObjInf->GetTgSpl() == 1) + { + return; + } + + if ((i_atObjInf->GetAtType() != AT_TYPE_HOOKSHOT || + !i_tgObjInf->ChkTgHookShotNoHitMark()) && + (i_atObjInf->GetAtType() != AT_TYPE_ARROW || !i_tgObjInf->ChkTgArrowNoHitMark()) && + param_9->ChkNoneActorPerfTblId()) + { + if (!i_chkShield) { + if ((i_atObjInf->GetAtHitMark() != 0 || i_tgObjInf->GetTgHitMark() == 8) && + (i_atObjInf->GetAtHitMark() != 4 || i_tgObjInf->GetTgHitMark() != 4)) + { + csXyz sp10; + CalcParticleAngle(i_atObjInf, param_6, param_7, &sp10); + + if (i_tgObjInf->GetTgHitMark() == 5 || i_tgObjInf->GetTgHitMark() == 8) { + u32 atType = i_atObjInf->GetAtType(); + fopAc_ac_c* ac = i_tgObjInf->GetAc(); + + i_dComIfGp_setHitMark(2, ac, i_hitPos, &sp10, NULL, atType); + } else { + u16 hitmark; + if (i_tgObjInf->GetTgHitMark() == 3) { + hitmark = 3; + } else { + hitmark = i_atObjInf->GetAtHitMark(); + } + + if ((hitmark != 1 && hitmark != 3) || i_atObjInf->GetAtAtp() != 0) { + u32 atType = i_atObjInf->GetAtType(); + fopAc_ac_c* ac = i_tgObjInf->GetAc(); + + i_dComIfGp_setHitMark(hitmark, ac, i_hitPos, &sp10, NULL, atType); + } + } + } + } else if (i_tgObjInf->GetTgHitMark() != 0) { + csXyz sp8; + CalcParticleAngle(i_atObjInf, param_6, param_7, &sp8); + + u32 atType = i_atObjInf->GetAtType(); + fopAc_ac_c* ac = i_tgObjInf->GetAc(); + u16 hitmark = i_tgObjInf->GetTgHitMark(); + + i_dComIfGp_setHitMark(hitmark, ac, i_hitPos, &sp8, NULL, atType); + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -375,74 +562,179 @@ asm void dCcS::ProcAtTgHitmark(bool param_0, bool param_1, cCcD_Obj* param_2, cC #include "asm/d/cc/d_cc_s/func_8008685C.s" } #pragma pop +#endif /* 80086AC0-80086D8C 081400 02CC+00 1/0 0/0 0/0 .text * SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::SetAtTgGObjInf(bool param_0, bool param_1, cCcD_Obj* param_2, cCcD_Obj* param_3, - cCcD_GObjInf* param_4, cCcD_GObjInf* param_5, cCcD_Stts* param_6, - cCcD_Stts* param_7, cCcD_GStts* param_8, cCcD_GStts* param_9, - cXyz* param_10) { - nofralloc -#include "asm/d/cc/d_cc_s/func_80086AC0.s" +void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Obj* param_3, + cCcD_GObjInf* i_atObjInf, cCcD_GObjInf* i_tgObjInf, cCcD_Stts* param_6, + cCcD_Stts* param_7, cCcD_GStts* param_8, cCcD_GStts* param_9, + cXyz* i_hitPos) { + dCcD_GObjInf* atObjInf = (dCcD_GObjInf*)i_atObjInf; + dCcD_GObjInf* tgObjInf = (dCcD_GObjInf*)i_tgObjInf; + dCcD_GStts* stts1 = (dCcD_GStts*)param_8; + dCcD_GStts* stts2 = (dCcD_GStts*)param_9; + + bool chk_shield = ChkShield(param_2, param_3, atObjInf, tgObjInf, i_hitPos); + + if (i_setAt) { + atObjInf->SetAtHitPos(*i_hitPos); + atObjInf->SetAtRVec(*tgObjInf->GetTgVecP()); + + if (stts1 != NULL && stts1->GetTgSpl() == 0) { + stts1->SetTgSpl(tgObjInf->GetTgSpl()); + } + + atObjInf->SetAtHitApid(param_7->GetApid()); + + if (chk_shield || tgObjInf->GetTgHitMark() == 8 && atObjInf->GetAtMtrl() != 2 && + (atObjInf->GetAtSpl() == 0 || atObjInf->GetAtSpl() == 5 || + atObjInf->GetAtSpl() == 8)) + { + atObjInf->OnAtShieldHit(); + } + + if (stts2->ChkNoActor()) { + atObjInf->OnAtHitNoActor(); + } + } + + if (i_setTg) { + tgObjInf->SetTgHitPos(*i_hitPos); + tgObjInf->SetTgRVec(*atObjInf->GetAtVecP()); + + if (stts2 != NULL && stts1->GetAtSpl() == 0) { + stts2->SetAtSpl(atObjInf->GetAtSpl()); + } + + tgObjInf->SetTgHitApid(param_6->GetApid()); + + if (chk_shield) { + tgObjInf->OnTgShieldHit(); + } else { + param_7->PlusDmg(param_2->GetAtAtp()); + } + + if (stts1->ChkNoActor()) { + tgObjInf->OnTgHitNoActor(); + } + } + + if (i_setAt) { + dCcD_HitCallback cb = atObjInf->GetAtHitCallback(); + + if (cb != NULL) { + cb(atObjInf->GetAc(), atObjInf, tgObjInf->GetAc(), tgObjInf); + } + } + + if (i_setTg) { + dCcD_HitCallback cb = tgObjInf->GetTgHitCallback(); + + if (cb != NULL) { + cb(tgObjInf->GetAc(), tgObjInf, atObjInf->GetAc(), atObjInf); + } + } + + if (i_setAt && i_setTg && (!atObjInf->ChkAtEffCounter() || !tgObjInf->ChkTgEffCounter())) { + atObjInf->SetAtEffCounterTimer(); + tgObjInf->SetTgEffCounterTimer(); + + ProcAtTgHitmark(i_setAt, i_setTg, param_2, param_3, atObjInf, tgObjInf, param_6, param_7, + stts1, stts2, i_hitPos, chk_shield); + } } -#pragma pop /* 80086D8C-80086FBC 0816CC 0230+00 0/0 2/2 0/0 .text * ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::ChkCamera(cXyz& param_0, cXyz& param_1, f32 param_2, fopAc_ac_c* param_3, - fopAc_ac_c* param_4, fopAc_ac_c* param_5) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s" -} -#pragma pop +bool dCcS::ChkCamera(cXyz& param_0, cXyz& param_1, f32 param_2, fopAc_ac_c* param_3, + fopAc_ac_c* param_4, fopAc_ac_c* param_5) { + if (mObjCoCount == 0) { + return false; + } -/* ############################################################################################## */ -/* 80452790-80452798 000D90 0004+04 1/1 0/0 0/0 .sdata2 @4336 */ -SECTION_SDATA2 static f32 lit_4336[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; + cCcD_Obj** temp_r29 = &mpObjCo[mObjCoCount]; + + cCcD_CpsAttr sp48; + sp48.Set(param_0, param_1, param_2); + sp48.CalcAabBox(); + + cCcD_DivideInfo sp18; + f32 sp14; + mDivideArea.CalcDivideInfoOverArea(&sp18, sp48.GetWorkAab()); + + for (cCcD_Obj** i = mpObjCo; i < temp_r29; i++) { + if ((*i)->ChkCoSet() && (*i)->GetAc() != param_3 && (*i)->GetAc() != param_4 && + (*i)->GetAc() != param_5) + { + if ((*i)->GetPDivideInfo()->Chk(sp18)) { + dCcD_GObjInf* obj = (dCcD_GObjInf*)(*i)->GetGObjInf(); + + if (obj == NULL || !obj->ChkCoNoCamHit()) { + cCcD_ShapeAttr* shapeAttr = (*i)->GetShapeAttr(); + + if (sp48.CrossCo(*shapeAttr, &sp14)) { + return true; + } + } + } + } + } + + return false; +} /* 80086FBC-8008721C 0818FC 0260+00 0/0 1/1 0/0 .text * chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::chkCameraPoint(cXyz const& param_0, cCcD_ShapeAttr::Shape* param_1, - fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - nofralloc -#include "asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s" -} -#pragma pop +bool dCcS::chkCameraPoint(cXyz const& param_0, cCcD_ShapeAttr::Shape* param_1, fopAc_ac_c* param_2, + fopAc_ac_c* param_3) { + if (mObjCoCount == 0) { + return false; + } -/* 8008721C-800872A8 081B5C 008C+00 0/0 2/1 0/0 .text __dt__12cCcD_SphAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_SphAttr::~cCcD_SphAttr() { -extern "C" asm void __dt__12cCcD_SphAttrFv() { - nofralloc -#include "asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s" + cCcD_Obj** temp_r29 = &mpObjCo[mObjCoCount]; + + cCcD_SphAttr sp48; + cCcD_SrcSphAttr sp1C; + + sp1C.mCenter = param_0; + sp1C.mRadius = 1.0f; + sp48.Set(sp1C); + sp48.CalcAabBox(); + + cCcD_DivideInfo sp18; + f32 sp14; + mDivideArea.CalcDivideInfoOverArea(&sp18, sp48.GetWorkAab()); + + for (cCcD_Obj** i = mpObjCo; i < temp_r29; i++) { + if ((*i)->ChkCoSet() && (*i)->GetAc() != param_2 && (*i)->GetAc() != param_3) { + if ((*i)->GetPDivideInfo()->Chk(sp18)) { + dCcD_GObjInf* obj = (dCcD_GObjInf*)(*i)->GetGObjInf(); + + if (obj == NULL || !obj->ChkCoNoCamHit()) { + cCcD_ShapeAttr* shapeAttr = (*i)->GetShapeAttr(); + + if (sp48.CrossCo(*shapeAttr, &sp14)) { + shapeAttr->getShapeAccess(param_1); + + if (param_1->_0 != 2) { + return true; + } + } + } + } + } + } + + return false; } -#pragma pop /* 800872A8-800872AC 081BE8 0004+00 1/0 0/0 0/0 .text MoveAfterCheck__4dCcSFv */ -void dCcS::MoveAfterCheck() { - /* empty function */ -} +void dCcS::MoveAfterCheck() {} /* 800872AC-800872B0 081BEC 0004+00 1/1 0/0 0/0 .text DrawAfter__4dCcSFv */ -void dCcS::DrawAfter() { - /* empty function */ -} +void dCcS::DrawAfter() {} /* 800872B0-800872D0 081BF0 0020+00 0/0 1/1 0/0 .text Move__4dCcSFv */ void dCcS::Move() { @@ -463,7 +755,7 @@ void dCcS::MassClear() { /* ############################################################################################## */ /* 803AC3A4-803AC3E4 0094C4 0040+00 1/1 0/0 0/0 .data m_mtrl_hit_tbl__4dCcS */ -SECTION_DATA u8 dCcS::m_mtrl_hit_tbl[64] = { +u8 dCcS::m_mtrl_hit_tbl[64] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, @@ -471,44 +763,23 @@ SECTION_DATA u8 dCcS::m_mtrl_hit_tbl[64] = { }; /* 80087330-8008734C 081C70 001C+00 1/1 0/0 0/0 .text ChkAtTgMtrlHit__4dCcSFUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::ChkAtTgMtrlHit(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s" +int dCcS::ChkAtTgMtrlHit(u8 i_atMtrl, u8 i_tgMtrl) { + return m_mtrl_hit_tbl[i_atMtrl + i_tgMtrl * 8]; } -#pragma pop /* 8008734C-800873B0 081C8C 0064+00 1/0 0/0 0/0 .text * ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dCcS::ChkNoHitGAtTg(cCcD_GObjInf const* param_0, cCcD_GObjInf const* param_1, - cCcD_GStts* param_2, cCcD_GStts* param_3) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s" -} -#pragma pop +bool dCcS::ChkNoHitGAtTg(cCcD_GObjInf const* i_atObjInf, cCcD_GObjInf const* i_tgObjInf, + cCcD_GStts*, cCcD_GStts*) { + dCcD_GObjInf* atObjInf = (dCcD_GObjInf*)i_atObjInf; + dCcD_GObjInf* tgObjInf = (dCcD_GObjInf*)i_tgObjInf; -/* ############################################################################################## */ -/* 803AC3E4-803AC418 009504 0034+00 0/0 2/2 0/0 .data __vt__4dCcS */ -SECTION_DATA extern void* __vt__4dCcS[13] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CalcTgPlusDmg__4dCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts, - (void*)SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf, - (void*) - SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts, - (void*) - SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz, - (void*)ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts, - (void*) - ChkAtTgHitAfterCross__4dCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts, - (void*)ChkNoHitGCo__4dCcSFP8cCcD_ObjP8cCcD_Obj, - (void*)__dt__4dCcSFv, - (void*)MoveAfterCheck__4dCcSFv, - (void*)SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj, - (void*)CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz, -}; + if (tgObjInf->ChkTgWolfSpNoDamage() && atObjInf->GetAtMtrl() == 0 && + atObjInf->GetAtType() & + (AT_TYPE_CSTATUE_BOSS_SWING | AT_TYPE_1000 | AT_TYPE_800 | AT_TYPE_CSTATUE_SWING)) + { + return true; + } + + return ChkAtTgMtrlHit(atObjInf->GetAtMtrl(), tgObjInf->GetTgMtrl()) == 0; +} diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index aff853bd74..e5fca33ebc 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -462,10 +462,10 @@ u8 daYkgr_c::m_emitter[4]; /* 80031870-800318B4 02C1B0 0044+00 0/0 0/0 19/19 .text getArcName__12daSetBgObj_cFP10fopAc_ac_c */ -const char* daSetBgObj_c::getArcName(fopAc_ac_c* param_0) { +const char* daSetBgObj_c::getArcName(fopAc_ac_c* i_this) { static char arcName[8]; - sprintf(arcName, "@bg%04x", (u16)fopAcM_GetParam(param_0)); + sprintf(arcName, "@bg%04x", (u16)fopAcM_GetParam(i_this)); return arcName; } diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index a21ea16079..8aad481d05 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -92,13 +92,13 @@ dJntCol_c::dJntCol_c() { /* 80035CA0-80035CC8 0305E0 0028+00 0/0 2/2 8/8 .text * init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli */ int dJntCol_c::init(fopAc_ac_c* i_actorP, dJntColData_c const* i_jntColP, J3DModel* i_modelP, - int param_3) { + int param_3) { mData = (dJntColData_c*)i_jntColP; mModel = i_modelP; field_0x8 = param_3; field_0xc = 0; if (i_actorP) { - fopAcM_SetJntCol(i_actorP,this); + fopAcM_SetJntCol(i_actorP, this); } return 1; } @@ -112,18 +112,17 @@ SECTION_SDATA2 static f32 lit_3655 = 500.0f; #ifdef NONMATCHING // regalloc, parameters are loading in wrong? void dJntCol_c::setNowLine(cM3dGLin* param_0, cXyz const* param_1, csXyz const* param_2, - cXyz* param_3) { - + cXyz* param_3) { if (param_2) { mDoMtx_stack_c::ZXYrotS(*param_2); - mDoMtx_stack_c::multVec(&cXyz::BaseZ,param_3); + mDoMtx_stack_c::multVec(&cXyz::BaseZ, param_3); } else { *param_3 = cXyz::BaseZ; } cXyz start_pos = *param_1 - *param_3 * FLOAT_LABEL(lit_3655); cXyz end_pos = *param_1 + *param_3 * FLOAT_LABEL(lit_3655); - param_0->SetStartEnd(start_pos,end_pos); + param_0->SetStartEnd(start_pos, end_pos); } #else #pragma push @@ -234,7 +233,7 @@ asm void dJntCol_c::getArrowOffsetPosAndAngle(cXyz const* param_0, csXyz const* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_0, csXyz const* param_1, cXyz* param_2, +asm int dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_0, csXyz const* param_1, cXyz* param_2, csXyz* param_3, int param_4) const { nofralloc #include "asm/d/d_jnt_col/getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi.s" @@ -244,10 +243,10 @@ asm void dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_0, csXyz const* para /* 80036FA8-80037038 0318E8 0090+00 0/0 0/0 1/1 .text * setArrowPosAndAngle__9dJntCol_cFPC4cXyzPC4cXyziP4cXyzP5csXyz */ void dJntCol_c::setArrowPosAndAngle(cXyz const* param_0, cXyz const* i_srcPos, int i_anmMtxIdx, - cXyz* param_3, csXyz* i_arrowPosP) { - cXyz dst_pos; - mDoMtx_multVecSR(mModel->i_getAnmMtx(i_anmMtxIdx),i_srcPos,&dst_pos); + cXyz* param_3, csXyz* i_arrowPosP) { + cXyz dst_pos; + mDoMtx_multVecSR(mModel->i_getAnmMtx(i_anmMtxIdx), i_srcPos, &dst_pos); i_arrowPosP->x = dst_pos.atan2sY_XZ(); i_arrowPosP->y = dst_pos.atan2sX_Z(); - mDoMtx_multVec(mModel->i_getAnmMtx(i_anmMtxIdx),param_0,param_3); + mDoMtx_multVec(mModel->i_getAnmMtx(i_anmMtxIdx), param_0, param_3); } diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp index 183e64e5e5..8a3ef899bf 100644 --- a/src/m_Do/m_Do_machine_exception.cpp +++ b/src/m_Do/m_Do_machine_exception.cpp @@ -121,21 +121,4 @@ void exception_addition(JUTConsole* pConsole) { dispGameInfo(); } -/* ############################################################################################## */ -/* 80450C98-80450C9C -00001 0004+00 0/0 0/0 50/50 .sbss None */ -/* 80450C98 0001+00 data_80450C98 None */ -/* 80450C99 0001+00 data_80450C99 None */ -/* 80450C9A 0001+00 data_80450C9A None */ -/* 80450C9B 0001+00 data_80450C9B None */ -extern u8 struct_80450C98[4]; -u8 struct_80450C98[4]; - -/* 80450C9C-80450CA0 -00001 0004+00 0/0 0/0 6/6 .sbss None */ -/* 80450C9C 0001+00 data_80450C9C None */ -/* 80450C9D 0001+00 data_80450C9D None */ -/* 80450C9E 0001+00 data_80450C9E None */ -/* 80450C9F 0001+00 data_80450C9F None */ -extern u8 struct_80450C9C[4]; -u8 struct_80450C9C[4]; - /* 80374460-80374460 000AC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/tools/tp.py b/tools/tp.py index a62a7ae68c..89466bb4f5 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -419,7 +419,7 @@ def calculate_rel_progress(build_path: Path, matching: bool, format: str, asm_fi str_file = str(file) if not str_file.startswith("asm/rel/"): continue - rel = str_file.split("/")[-2] + rel = str_file.split("/")[-3] range_dict[rel].append(range[1] - range[0]) end = time.time() @@ -890,7 +890,7 @@ def find_all_asm_files() -> Tuple[Set[Path], Set[Path]]: if path.is_dir(): recursive(path) else: - if path.suffix == ".s" or path.suffix == ".inc": + if path.suffix == ".s": files.add(path) else: errors.add(path) @@ -988,7 +988,7 @@ def find_all_files() -> Set[Path]: return files -def find_includes(lines: List[str], non_matching: bool, ext: Tuple[str, str] = (".s",".inc")) -> Set[Path]: +def find_includes(lines: List[str], non_matching: bool, ext: str = ".s") -> Set[Path]: includes = set() for line in lines: key = '#include "' @@ -1003,8 +1003,6 @@ def find_includes(lines: List[str], non_matching: bool, ext: Tuple[str, str] = ( include_path = line[start:end] if include_path.endswith(ext): - if include_path.endswith(".inc"): - include_path = "src/"+include_path includes.add(Path(include_path)) return includes @@ -1116,6 +1114,7 @@ def check_sha1(game_path: Path, build_path: Path, include_rels: bool): "", "4997D93B9692620C40E90374A0F1DBF0E4889395", ) + if include_rels: with open('sha1sums.json') as f: rel_shas = json.load(f) @@ -1143,7 +1142,7 @@ def check_sha1(game_path: Path, build_path: Path, include_rels: bool): ) if include_rels: - build_rels_path = get_files_with_ext(build_path, ".rel") + build_rels_path = get_files_with_ext(build_path/"rel", ".rel") for rel_filepath in build_rels_path: with rel_filepath.open("rb") as file: data = bytearray(file.read()) From 6e05f7133bed071b28791fa48193d876e02e6ca8 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sun, 15 Jan 2023 21:10:41 +0200 Subject: [PATCH 14/19] chmod 755 decompctx.py (#246) --- tools/decompctx.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools/decompctx.py diff --git a/tools/decompctx.py b/tools/decompctx.py old mode 100644 new mode 100755 From eda70a786e6fd8ce2d9957c5b96fcbf20140a72a Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Sun, 15 Jan 2023 18:51:08 +0200 Subject: [PATCH 15/19] Match J2DScreen::getResReference and improve J2DScreen::createMaterial --- Progress.md | 8 +-- ...ce__9J2DScreenFP20JSURandomInputStreamUl.s | 67 ------------------- libs/JSystem/J2DGraph/J2DScreen.cpp | 48 ++++++------- 3 files changed, 23 insertions(+), 100 deletions(-) delete mode 100644 asm/JSystem/J2DGraph/J2DScreen/getResReference__9J2DScreenFP20JSURandomInputStreamUl.s diff --git a/Progress.md b/Progress.md index 583bcfc3c5..9a66995bc5 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 22.050391% | 793052 | 3596544 +.text | 22.057397% | 793304 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 30.268274% | 1216988 | 4020672 +Total | 30.274541% | 1217240 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 30.268274% | 1216988 | 4020672 +main.dol | 30.274541% | 1217240 | 4020672 RELs | 33.041295% | 3799856 | 11500324 -Total | 32.322951% | 5016844 | 15520996 +Total | 32.324575% | 5017096 | 15520996 ## RELs diff --git a/asm/JSystem/J2DGraph/J2DScreen/getResReference__9J2DScreenFP20JSURandomInputStreamUl.s b/asm/JSystem/J2DGraph/J2DScreen/getResReference__9J2DScreenFP20JSURandomInputStreamUl.s deleted file mode 100644 index e5cb0e135c..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/getResReference__9J2DScreenFP20JSURandomInputStreamUl.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_802F9280: -/* 802F9280 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802F9284 7C 08 02 A6 */ mflr r0 -/* 802F9288 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F928C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F9290 48 06 8F 45 */ bl _savegpr_27 -/* 802F9294 7C 9B 23 78 */ mr r27, r4 -/* 802F9298 7C BC 2B 78 */ mr r28, r5 -/* 802F929C 7F 63 DB 78 */ mr r3, r27 -/* 802F92A0 81 9B 00 00 */ lwz r12, 0(r27) -/* 802F92A4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F92A8 7D 89 03 A6 */ mtctr r12 -/* 802F92AC 4E 80 04 21 */ bctrl -/* 802F92B0 7C 7F 1B 78 */ mr r31, r3 -/* 802F92B4 7F 63 DB 78 */ mr r3, r27 -/* 802F92B8 38 80 00 04 */ li r4, 4 -/* 802F92BC 81 9B 00 00 */ lwz r12, 0(r27) -/* 802F92C0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802F92C4 7D 89 03 A6 */ mtctr r12 -/* 802F92C8 4E 80 04 21 */ bctrl -/* 802F92CC 7F 63 DB 78 */ mr r3, r27 -/* 802F92D0 38 81 00 0C */ addi r4, r1, 0xc -/* 802F92D4 38 A0 00 04 */ li r5, 4 -/* 802F92D8 4B FE 2F C1 */ bl read__14JSUInputStreamFPvl -/* 802F92DC 83 A1 00 0C */ lwz r29, 0xc(r1) -/* 802F92E0 7F 63 DB 78 */ mr r3, r27 -/* 802F92E4 38 80 00 04 */ li r4, 4 -/* 802F92E8 81 9B 00 00 */ lwz r12, 0(r27) -/* 802F92EC 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802F92F0 7D 89 03 A6 */ mtctr r12 -/* 802F92F4 4E 80 04 21 */ bctrl -/* 802F92F8 7F 63 DB 78 */ mr r3, r27 -/* 802F92FC 38 81 00 08 */ addi r4, r1, 8 -/* 802F9300 38 A0 00 04 */ li r5, 4 -/* 802F9304 4B FE 2F 95 */ bl read__14JSUInputStreamFPvl -/* 802F9308 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F930C 7F 63 DB 78 */ mr r3, r27 -/* 802F9310 7C 9F F2 14 */ add r4, r31, r30 -/* 802F9314 38 A0 00 00 */ li r5, 0 -/* 802F9318 4B FE 31 C5 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F931C 7F BE E8 50 */ subf r29, r30, r29 -/* 802F9320 57 80 02 DF */ rlwinm. r0, r28, 0, 0xb, 0xf -/* 802F9324 41 82 00 14 */ beq lbl_802F9338 -/* 802F9328 7F A3 EB 78 */ mr r3, r29 -/* 802F932C 4B FD 59 99 */ bl __nwa__FUl -/* 802F9330 7C 64 1B 78 */ mr r4, r3 -/* 802F9334 48 00 00 14 */ b lbl_802F9348 -lbl_802F9338: -/* 802F9338 7F A3 EB 78 */ mr r3, r29 -/* 802F933C 38 80 FF FC */ li r4, -4 -/* 802F9340 4B FD 59 AD */ bl __nwa__FUli -/* 802F9344 7C 64 1B 78 */ mr r4, r3 -lbl_802F9348: -/* 802F9348 7C 9E 23 78 */ mr r30, r4 -/* 802F934C 28 04 00 00 */ cmplwi r4, 0 -/* 802F9350 41 82 00 10 */ beq lbl_802F9360 -/* 802F9354 7F 63 DB 78 */ mr r3, r27 -/* 802F9358 7F A5 EB 78 */ mr r5, r29 -/* 802F935C 4B FE 2F 3D */ bl read__14JSUInputStreamFPvl -lbl_802F9360: -/* 802F9360 7F C3 F3 78 */ mr r3, r30 -/* 802F9364 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F9368 48 06 8E B9 */ bl _restgpr_27 -/* 802F936C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802F9370 7C 08 03 A6 */ mtlr r0 -/* 802F9374 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F9378 4E 80 00 20 */ blr diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index d4aeeaa12b..55e337eb99 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -33,7 +33,6 @@ extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); extern "C" void search__9J2DScreenFUx(); extern "C" void searchUserInfo__9J2DScreenFUx(); extern "C" void drawSelf__9J2DScreenFffPA3_A4_f(); -extern "C" void getResReference__9J2DScreenFP20JSURandomInputStreamUl(); extern "C" void createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive(); extern "C" void isUsed__9J2DScreenFPC7ResTIMG(); extern "C" void isUsed__9J2DScreenFPC7ResFONT(); @@ -575,43 +574,31 @@ asm void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { /* 802F9280-802F937C 2F3BC0 00FC+00 1/1 0/0 0/0 .text * getResReference__9J2DScreenFP20JSURandomInputStreamUl */ -// small regalloc -#ifdef NONMATCHING J2DResReference* J2DScreen::getResReference(JSURandomInputStream* p_stream, u32 param_1) { s32 position = p_stream->getPosition(); p_stream->skip(4); - s32 start, end; - start = p_stream->readS32(); + s32 size1, size2; + size1 = p_stream->readS32(); p_stream->skip(4); - end = p_stream->readS32(); - p_stream->seek(position + end, JSUStreamSeekFrom_SET); + size2 = p_stream->readS32(); + p_stream->seek(position + size2, JSUStreamSeekFrom_SET); - s32 size = end - start; + size1 = size1 - size2; char* buffer; if (param_1 & 0x1F0000) { - buffer = new char[size]; + buffer = new char[size1]; } else { - buffer = new (-4) char[size]; + buffer = new (-4) char[size1]; } if (buffer != NULL) { - p_stream->read(buffer, size); + p_stream->read(buffer, size1); } return (J2DResReference*)buffer; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DResReference* J2DScreen::getResReference(JSURandomInputStream* param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/getResReference__9J2DScreenFP20JSURandomInputStreamUl.s" -} -#pragma pop -#endif /* 802F937C-802F9600 2F3CBC 0284+00 1/1 0/0 0/0 .text * createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ @@ -646,28 +633,31 @@ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRA u32 offset = buffer[0x14] << 0x18 | buffer[0x15] << 0x10 | buffer[0x16] << 8 | buffer[0x17]; char* sec = (char*)buffer + offset; - u16* sec_s = (u16*)sec + *(u16*)sec; - - u16 num = sec_s[1]; + u16* sec_s = ((u16*)sec); + u32 size = ((u16*)sec)[0]*2; + u16 num = sec_s[size + 1]; while (sec[num] != 0) { - num++; + num++; } - num++; + num++; - ResNTAB* nametab = new ResNTAB[num]; + u8* nametab = new u8[num]; if (nametab != NULL) { for (u16 i = 0; i < num; i++) { - nametab->mEntries[i].mKeyCode = sec[i]; + nametab[i] = sec[i]; } - mNameTable = new JUTNameTab(nametab); + mNameTable = new JUTNameTab((ResNTAB*)nametab); if (mNameTable == NULL) { delete[] nametab; } else { + success: delete[] buffer; return true; } } + } else { + goto success; } } From 41221f7df99815b503c05403315e7ed93be70c18 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Mon, 16 Jan 2023 20:47:31 +0200 Subject: [PATCH 16/19] Match PADReset --- Progress.md | 8 ++-- asm/dolphin/pad/Pad/PADReset.s | 71 ---------------------------------- libs/dolphin/pad/Pad.c | 12 +----- 3 files changed, 5 insertions(+), 86 deletions(-) delete mode 100644 asm/dolphin/pad/Pad/PADReset.s diff --git a/Progress.md b/Progress.md index 9a66995bc5..371fe221a9 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 22.057397% | 793304 | 3596544 +.text | 22.064960% | 793576 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 30.274541% | 1217240 | 4020672 +Total | 30.281306% | 1217512 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 30.274541% | 1217240 | 4020672 +main.dol | 30.281306% | 1217512 | 4020672 RELs | 33.041295% | 3799856 | 11500324 -Total | 32.324575% | 5017096 | 15520996 +Total | 32.326328% | 5017368 | 15520996 ## RELs diff --git a/asm/dolphin/pad/Pad/PADReset.s b/asm/dolphin/pad/Pad/PADReset.s deleted file mode 100644 index 7b9c1708d6..0000000000 --- a/asm/dolphin/pad/Pad/PADReset.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_8034EB2C: -/* 8034EB2C 7C 08 02 A6 */ mflr r0 -/* 8034EB30 90 01 00 04 */ stw r0, 4(r1) -/* 8034EB34 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 8034EB38 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034EB3C 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8034EB40 7C 7E 1B 78 */ mr r30, r3 -/* 8034EB44 4B FE EB B1 */ bl OSDisableInterrupts -/* 8034EB48 80 8D 92 E0 */ lwz r4, PendingBits(r13) -/* 8034EB4C 39 00 00 00 */ li r8, 0 -/* 8034EB50 80 AD 92 D8 */ lwz r5, WaitingBits(r13) -/* 8034EB54 7C 7F 1B 78 */ mr r31, r3 -/* 8034EB58 80 0D 92 DC */ lwz r0, CheckingBits(r13) -/* 8034EB5C 7F DE 23 78 */ or r30, r30, r4 -/* 8034EB60 80 8D 92 D0 */ lwz r4, ResettingBits(r13) -/* 8034EB64 7C A5 03 78 */ or r5, r5, r0 -/* 8034EB68 80 0D 84 B0 */ lwz r0, Spec(r13) -/* 8034EB6C 7F DE 28 78 */ andc r30, r30, r5 -/* 8034EB70 80 CD 92 CC */ lwz r6, EnabledBits(r13) -/* 8034EB74 7C 85 F3 78 */ or r5, r4, r30 -/* 8034EB78 80 8D 92 E4 */ lwz r4, BarrelBits(r13) -/* 8034EB7C 7F C7 F0 F8 */ nor r7, r30, r30 -/* 8034EB80 90 AD 92 D0 */ stw r5, ResettingBits(r13) -/* 8034EB84 7C C5 38 38 */ and r5, r6, r7 -/* 8034EB88 7C 84 38 38 */ and r4, r4, r7 -/* 8034EB8C 80 ED 92 D0 */ lwz r7, ResettingBits(r13) -/* 8034EB90 28 00 00 04 */ cmplwi r0, 4 -/* 8034EB94 91 0D 92 E0 */ stw r8, PendingBits(r13) -/* 8034EB98 7C E3 30 38 */ and r3, r7, r6 -/* 8034EB9C 90 AD 92 CC */ stw r5, EnabledBits(r13) -/* 8034EBA0 90 8D 92 E4 */ stw r4, BarrelBits(r13) -/* 8034EBA4 40 82 00 10 */ bne lbl_8034EBB4 -/* 8034EBA8 80 0D 92 D4 */ lwz r0, RecalibrateBits(r13) -/* 8034EBAC 7C 00 F3 78 */ or r0, r0, r30 -/* 8034EBB0 90 0D 92 D4 */ stw r0, RecalibrateBits(r13) -lbl_8034EBB4: -/* 8034EBB4 4B FF 6D 49 */ bl SIDisablePolling -/* 8034EBB8 80 0D 84 A4 */ lwz r0, ResettingChan(r13) -/* 8034EBBC 2C 00 00 20 */ cmpwi r0, 0x20 -/* 8034EBC0 40 82 00 58 */ bne lbl_8034EC18 -/* 8034EBC4 80 AD 92 D0 */ lwz r5, ResettingBits(r13) -/* 8034EBC8 7C A0 00 34 */ cntlzw r0, r5 -/* 8034EBCC 90 0D 84 A4 */ stw r0, ResettingChan(r13) -/* 8034EBD0 80 8D 84 A4 */ lwz r4, ResettingChan(r13) -/* 8034EBD4 2C 04 00 20 */ cmpwi r4, 0x20 -/* 8034EBD8 41 82 00 40 */ beq lbl_8034EC18 -/* 8034EBDC 3C 00 80 00 */ lis r0, 0x8000 -/* 8034EBE0 7C 00 24 30 */ srw r0, r0, r4 -/* 8034EBE4 7C A0 00 78 */ andc r0, r5, r0 -/* 8034EBE8 1C 84 00 0C */ mulli r4, r4, 0xc -/* 8034EBEC 90 0D 92 D0 */ stw r0, ResettingBits(r13) -/* 8034EBF0 3C 60 80 45 */ lis r3, Origin@ha /* 0x8044CB80@ha */ -/* 8034EBF4 38 03 CB 80 */ addi r0, r3, Origin@l /* 0x8044CB80@l */ -/* 8034EBF8 7C 60 22 14 */ add r3, r0, r4 -/* 8034EBFC 38 80 00 00 */ li r4, 0 -/* 8034EC00 38 A0 00 0C */ li r5, 0xc -/* 8034EC04 4B CB 48 55 */ bl memset -/* 8034EC08 3C 80 80 35 */ lis r4, PADTypeAndStatusCallback@ha /* 0x8034E6C0@ha */ -/* 8034EC0C 80 6D 84 A4 */ lwz r3, ResettingChan(r13) -/* 8034EC10 38 84 E6 C0 */ addi r4, r4, PADTypeAndStatusCallback@l /* 0x8034E6C0@l */ -/* 8034EC14 4B FF 75 41 */ bl SIGetTypeAsync -lbl_8034EC18: -/* 8034EC18 7F E3 FB 78 */ mr r3, r31 -/* 8034EC1C 4B FE EB 01 */ bl OSRestoreInterrupts -/* 8034EC20 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8034EC24 38 60 00 01 */ li r3, 1 -/* 8034EC28 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8034EC2C 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 8034EC30 38 21 00 18 */ addi r1, r1, 0x18 -/* 8034EC34 7C 08 03 A6 */ mtlr r0 -/* 8034EC38 4E 80 00 20 */ blr diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c index 535eba9da4..aee189ab33 100644 --- a/libs/dolphin/pad/Pad.c +++ b/libs/dolphin/pad/Pad.c @@ -296,7 +296,6 @@ static asm void PADReceiveCheckCallback(s32 chan, u32 type) { #pragma pop /* 8034EB2C-8034EC3C 34946C 0110+00 2/2 1/1 0/0 .text PADReset */ -#ifdef NONMATCHING BOOL PADReset(u32 mask) { BOOL enabled; u32 diableBits; @@ -309,6 +308,7 @@ BOOL PADReset(u32 mask) { ResettingBits |= mask; diableBits = ResettingBits & EnabledBits; EnabledBits &= ~mask; + BarrelBits &= ~mask; if (Spec == PAD_SPEC_4) { RecalibrateBits |= mask; @@ -322,16 +322,6 @@ BOOL PADReset(u32 mask) { OSRestoreInterrupts(enabled); return TRUE; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL PADReset(u32 mask) { - nofralloc -#include "asm/dolphin/pad/Pad/PADReset.s" -} -#pragma pop -#endif /* 8034EC3C-8034ED50 34957C 0114+00 1/1 1/1 0/0 .text PADRecalibrate */ #ifdef NONMATCHING From ba79ab4789cf5158532e7f25b3d98b4066b39c61 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Mon, 16 Jan 2023 20:55:36 +0200 Subject: [PATCH 17/19] Match PADRecalibrate --- Progress.md | 8 ++-- asm/dolphin/pad/Pad/PADRecalibrate.s | 72 ---------------------------- libs/dolphin/pad/Pad.c | 13 +---- 3 files changed, 5 insertions(+), 88 deletions(-) delete mode 100644 asm/dolphin/pad/Pad/PADRecalibrate.s diff --git a/Progress.md b/Progress.md index 371fe221a9..d567152eb0 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 22.064960% | 793576 | 3596544 +.text | 22.072634% | 793852 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 30.281306% | 1217512 | 4020672 +Total | 30.288171% | 1217788 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 30.281306% | 1217512 | 4020672 +main.dol | 30.288171% | 1217788 | 4020672 RELs | 33.041295% | 3799856 | 11500324 -Total | 32.326328% | 5017368 | 15520996 +Total | 32.328106% | 5017644 | 15520996 ## RELs diff --git a/asm/dolphin/pad/Pad/PADRecalibrate.s b/asm/dolphin/pad/Pad/PADRecalibrate.s deleted file mode 100644 index 4328d69241..0000000000 --- a/asm/dolphin/pad/Pad/PADRecalibrate.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8034EC3C: -/* 8034EC3C 7C 08 02 A6 */ mflr r0 -/* 8034EC40 90 01 00 04 */ stw r0, 4(r1) -/* 8034EC44 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 8034EC48 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034EC4C 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8034EC50 7C 7E 1B 78 */ mr r30, r3 -/* 8034EC54 4B FE EA A1 */ bl OSDisableInterrupts -/* 8034EC58 80 AD 92 E0 */ lwz r5, PendingBits(r13) -/* 8034EC5C 39 00 00 00 */ li r8, 0 -/* 8034EC60 80 CD 92 D8 */ lwz r6, WaitingBits(r13) -/* 8034EC64 3C 80 80 00 */ lis r4, 0x8000 /* 0x800030E3@ha */ -/* 8034EC68 80 0D 92 DC */ lwz r0, CheckingBits(r13) -/* 8034EC6C 7F DE 2B 78 */ or r30, r30, r5 -/* 8034EC70 80 AD 92 D0 */ lwz r5, ResettingBits(r13) -/* 8034EC74 7C C6 03 78 */ or r6, r6, r0 -/* 8034EC78 88 04 30 E3 */ lbz r0, 0x30E3(r4) /* 0x800030E3@l */ -/* 8034EC7C 7F DE 30 78 */ andc r30, r30, r6 -/* 8034EC80 80 CD 92 CC */ lwz r6, EnabledBits(r13) -/* 8034EC84 7C A5 F3 78 */ or r5, r5, r30 -/* 8034EC88 80 8D 92 E4 */ lwz r4, BarrelBits(r13) -/* 8034EC8C 90 AD 92 D0 */ stw r5, ResettingBits(r13) -/* 8034EC90 7F C9 F0 F8 */ nor r9, r30, r30 -/* 8034EC94 7C C5 48 38 */ and r5, r6, r9 -/* 8034EC98 7C 84 48 38 */ and r4, r4, r9 -/* 8034EC9C 80 ED 92 D0 */ lwz r7, ResettingBits(r13) -/* 8034ECA0 7C 7F 1B 78 */ mr r31, r3 -/* 8034ECA4 91 0D 92 E0 */ stw r8, PendingBits(r13) -/* 8034ECA8 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 8034ECAC 90 AD 92 CC */ stw r5, EnabledBits(r13) -/* 8034ECB0 7C E3 30 38 */ and r3, r7, r6 -/* 8034ECB4 90 8D 92 E4 */ stw r4, BarrelBits(r13) -/* 8034ECB8 40 82 00 10 */ bne lbl_8034ECC8 -/* 8034ECBC 80 0D 92 D4 */ lwz r0, RecalibrateBits(r13) -/* 8034ECC0 7C 00 F3 78 */ or r0, r0, r30 -/* 8034ECC4 90 0D 92 D4 */ stw r0, RecalibrateBits(r13) -lbl_8034ECC8: -/* 8034ECC8 4B FF 6C 35 */ bl SIDisablePolling -/* 8034ECCC 80 0D 84 A4 */ lwz r0, ResettingChan(r13) -/* 8034ECD0 2C 00 00 20 */ cmpwi r0, 0x20 -/* 8034ECD4 40 82 00 58 */ bne lbl_8034ED2C -/* 8034ECD8 80 AD 92 D0 */ lwz r5, ResettingBits(r13) -/* 8034ECDC 7C A0 00 34 */ cntlzw r0, r5 -/* 8034ECE0 90 0D 84 A4 */ stw r0, ResettingChan(r13) -/* 8034ECE4 80 8D 84 A4 */ lwz r4, ResettingChan(r13) -/* 8034ECE8 2C 04 00 20 */ cmpwi r4, 0x20 -/* 8034ECEC 41 82 00 40 */ beq lbl_8034ED2C -/* 8034ECF0 3C 00 80 00 */ lis r0, 0x8000 -/* 8034ECF4 7C 00 24 30 */ srw r0, r0, r4 -/* 8034ECF8 7C A0 00 78 */ andc r0, r5, r0 -/* 8034ECFC 1C 84 00 0C */ mulli r4, r4, 0xc -/* 8034ED00 90 0D 92 D0 */ stw r0, ResettingBits(r13) -/* 8034ED04 3C 60 80 45 */ lis r3, Origin@ha /* 0x8044CB80@ha */ -/* 8034ED08 38 03 CB 80 */ addi r0, r3, Origin@l /* 0x8044CB80@l */ -/* 8034ED0C 7C 60 22 14 */ add r3, r0, r4 -/* 8034ED10 38 80 00 00 */ li r4, 0 -/* 8034ED14 38 A0 00 0C */ li r5, 0xc -/* 8034ED18 4B CB 47 41 */ bl memset -/* 8034ED1C 3C 80 80 35 */ lis r4, PADTypeAndStatusCallback@ha /* 0x8034E6C0@ha */ -/* 8034ED20 80 6D 84 A4 */ lwz r3, ResettingChan(r13) -/* 8034ED24 38 84 E6 C0 */ addi r4, r4, PADTypeAndStatusCallback@l /* 0x8034E6C0@l */ -/* 8034ED28 4B FF 74 2D */ bl SIGetTypeAsync -lbl_8034ED2C: -/* 8034ED2C 7F E3 FB 78 */ mr r3, r31 -/* 8034ED30 4B FE E9 ED */ bl OSRestoreInterrupts -/* 8034ED34 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8034ED38 38 60 00 01 */ li r3, 1 -/* 8034ED3C 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8034ED40 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 8034ED44 38 21 00 18 */ addi r1, r1, 0x18 -/* 8034ED48 7C 08 03 A6 */ mtlr r0 -/* 8034ED4C 4E 80 00 20 */ blr diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c index aee189ab33..d60c08cb7b 100644 --- a/libs/dolphin/pad/Pad.c +++ b/libs/dolphin/pad/Pad.c @@ -324,7 +324,6 @@ BOOL PADReset(u32 mask) { } /* 8034EC3C-8034ED50 34957C 0114+00 1/1 1/1 0/0 .text PADRecalibrate */ -#ifdef NONMATCHING BOOL PADRecalibrate(u32 mask) { BOOL enabled; u32 disableBits; @@ -335,9 +334,9 @@ BOOL PADRecalibrate(u32 mask) { PendingBits = 0; mask &= ~(WaitingBits | CheckingBits); ResettingBits |= mask; - BarrelBits &= ~mask; disableBits = ResettingBits & EnabledBits; EnabledBits &= ~mask; + BarrelBits &= ~mask; if (!(UnkVal & 0x40)) { RecalibrateBits |= mask; @@ -350,16 +349,6 @@ BOOL PADRecalibrate(u32 mask) { OSRestoreInterrupts(enabled); return TRUE; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL PADRecalibrate(u32 mask) { - nofralloc -#include "asm/dolphin/pad/Pad/PADRecalibrate.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 803D1B90-803D1BA0 -00001 0010+00 1/1 0/0 0/0 .data ResetFunctionInfo */ From e1419fe7198606abcf9f5689335f9623f7956d5b Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Mon, 16 Jan 2023 21:10:26 +0200 Subject: [PATCH 18/19] Match PADControlMotors --- Progress.md | 8 ++--- asm/dolphin/pad/Pad/PADControlMotor.s | 50 --------------------------- libs/dolphin/pad/Pad.c | 15 +++----- 3 files changed, 8 insertions(+), 65 deletions(-) delete mode 100644 asm/dolphin/pad/Pad/PADControlMotor.s diff --git a/Progress.md b/Progress.md index d567152eb0..c66944acf8 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 22.072634% | 793852 | 3596544 +.text | 22.077750% | 794036 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 30.288171% | 1217788 | 4020672 +Total | 30.292747% | 1217972 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 30.288171% | 1217788 | 4020672 +main.dol | 30.292747% | 1217972 | 4020672 RELs | 33.041295% | 3799856 | 11500324 -Total | 32.328106% | 5017644 | 15520996 +Total | 32.329291% | 5017828 | 15520996 ## RELs diff --git a/asm/dolphin/pad/Pad/PADControlMotor.s b/asm/dolphin/pad/Pad/PADControlMotor.s deleted file mode 100644 index b7034a776c..0000000000 --- a/asm/dolphin/pad/Pad/PADControlMotor.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8034F1A0: -/* 8034F1A0 7C 08 02 A6 */ mflr r0 -/* 8034F1A4 90 01 00 04 */ stw r0, 4(r1) -/* 8034F1A8 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 8034F1AC 93 E1 00 24 */ stw r31, 0x24(r1) -/* 8034F1B0 93 C1 00 20 */ stw r30, 0x20(r1) -/* 8034F1B4 3B C4 00 00 */ addi r30, r4, 0 -/* 8034F1B8 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 8034F1BC 3B A3 00 00 */ addi r29, r3, 0 -/* 8034F1C0 4B FE E5 35 */ bl OSDisableInterrupts -/* 8034F1C4 3C 00 80 00 */ lis r0, 0x8000 -/* 8034F1C8 80 8D 92 CC */ lwz r4, EnabledBits(r13) -/* 8034F1CC 7C 00 EC 30 */ srw r0, r0, r29 -/* 8034F1D0 7C 80 00 39 */ and. r0, r4, r0 -/* 8034F1D4 3B E3 00 00 */ addi r31, r3, 0 -/* 8034F1D8 41 82 00 5C */ beq lbl_8034F234 -/* 8034F1DC 7F A3 EB 78 */ mr r3, r29 -/* 8034F1E0 4B FF 6D B1 */ bl SIGetType -/* 8034F1E4 54 60 00 85 */ rlwinm. r0, r3, 0, 2, 2 -/* 8034F1E8 40 82 00 4C */ bne lbl_8034F234 -/* 8034F1EC 80 0D 84 B0 */ lwz r0, Spec(r13) -/* 8034F1F0 28 00 00 02 */ cmplwi r0, 2 -/* 8034F1F4 40 80 00 10 */ bge lbl_8034F204 -/* 8034F1F8 28 1E 00 02 */ cmplwi r30, 2 -/* 8034F1FC 40 82 00 08 */ bne lbl_8034F204 -/* 8034F200 3B C0 00 00 */ li r30, 0 -lbl_8034F204: -/* 8034F204 3C 60 80 00 */ lis r3, 0x8000 /* 0x800030E3@ha */ -/* 8034F208 88 03 30 E3 */ lbz r0, 0x30E3(r3) /* 0x800030E3@l */ -/* 8034F20C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 8034F210 41 82 00 08 */ beq lbl_8034F218 -/* 8034F214 3B C0 00 00 */ li r30, 0 -lbl_8034F218: -/* 8034F218 80 8D 84 AC */ lwz r4, AnalogMode(r13) -/* 8034F21C 57 C0 07 BE */ clrlwi r0, r30, 0x1e -/* 8034F220 38 7D 00 00 */ addi r3, r29, 0 -/* 8034F224 64 84 00 40 */ oris r4, r4, 0x40 -/* 8034F228 7C 84 03 78 */ or r4, r4, r0 -/* 8034F22C 4B FF 65 A5 */ bl SISetCommand -/* 8034F230 4B FF 65 B5 */ bl SITransferCommands -lbl_8034F234: -/* 8034F234 7F E3 FB 78 */ mr r3, r31 -/* 8034F238 4B FE E4 E5 */ bl OSRestoreInterrupts -/* 8034F23C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8034F240 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 8034F244 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 8034F248 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 8034F24C 38 21 00 28 */ addi r1, r1, 0x28 -/* 8034F250 7C 08 03 A6 */ mtlr r0 -/* 8034F254 4E 80 00 20 */ blr diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c index d60c08cb7b..908ab7d14f 100644 --- a/libs/dolphin/pad/Pad.c +++ b/libs/dolphin/pad/Pad.c @@ -510,7 +510,6 @@ u32 PADRead(PADStatus* status) { } /* 8034F1A0-8034F258 349AE0 00B8+00 0/0 2/2 0/0 .text PADControlMotor */ -#ifdef NONMATCHING void PADControlMotor(s32 chan, u32 command) { BOOL enabled; u32 chanBit; @@ -522,21 +521,15 @@ void PADControlMotor(s32 chan, u32 command) { command = PAD_MOTOR_STOP; } + if (UnkVal & 0x20) { + command = PAD_MOTOR_STOP; + } + SISetCommand(chan, (0x40 << 16) | AnalogMode | (command & (0x00000001 | 0x00000002))); SITransferCommands(); } OSRestoreInterrupts(enabled); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void PADControlMotor(s32 channel, u32 command) { - nofralloc -#include "asm/dolphin/pad/Pad/PADControlMotor.s" -} -#pragma pop -#endif /* 8034F258-8034F2B8 349B98 0060+00 1/1 1/1 0/0 .text PADSetSpec */ void PADSetSpec(u32 spec) { From 7825666971f79f8b589da1f9c60088261370386d Mon Sep 17 00:00:00 2001 From: hatal175 Date: Fri, 20 Jan 2023 19:51:21 +0200 Subject: [PATCH 19/19] Add 1.2.5e to several makefiles and matching dolphin lib stuff (#247) * Fix select_occurence in diff.py * Use 1.2.5e and metroid prime decomp to match dlphin lib funcs * Fix FRANK_COMPILER WINE typo * Double WINE use removal * Organize dolphin compiler makefile names * Use inline auto instead of special inline where applicable I couldn't make CARDOpen work with the flag though --- Makefile | 2 + Progress.md | 8 +- README.md | 2 +- asm/dolphin/ar/ar/ARAlloc.s | 27 - asm/dolphin/ar/ar/ARGetDMAStatus.s | 16 - asm/dolphin/ar/ar/ARInit.s | 52 -- asm/dolphin/ar/ar/ARRegisterDMACallback.s | 18 - asm/dolphin/ar/ar/__ARClearInterrupt.s | 9 - asm/dolphin/ar/ar/__ARGetInterruptStatus.s | 5 - asm/dolphin/ar/arq/ARQInit.s | 30 - asm/dolphin/ar/arq/ARQPostRequest.s | 101 --- .../ar/arq/__ARQInterruptServiceRoutine.s | 58 -- asm/dolphin/ar/arq/__ARQServiceQueueLo.s | 72 -- asm/dolphin/card/CARDBios/CARDFreeBlocks.s | 98 --- asm/dolphin/card/CARDBios/Retry.s | 182 ----- .../card/CARDBios/__CARDPutControlBlock.s | 28 - .../card/CARDBios/__CARDReadVendorID.s | 64 -- asm/dolphin/card/CARDBios/__CARDStart.s | 149 ---- asm/dolphin/card/CARDBios/__CARDWritePage.s | 86 -- asm/dolphin/card/CARDBlock/EraseCallback.s | 54 -- asm/dolphin/card/CARDBlock/__CARDAllocBlock.s | 81 -- .../card/CARDBlock/__CARDUpdateFatBlock.s | 44 -- asm/dolphin/card/CARDCheck/CARDCheckExAsync.s | 391 --------- asm/dolphin/card/CARDCheck/VerifyDir.s | 161 ---- asm/dolphin/card/CARDCheck/VerifyFAT.s | 182 ----- asm/dolphin/card/CARDCheck/VerifyID.s | 176 ----- asm/dolphin/card/CARDDir/EraseCallback.s | 54 -- asm/dolphin/card/CARDDir/__CARDUpdateDir.s | 52 -- .../card/CARDFormat/__CARDFormatRegionAsync.s | 422 ---------- asm/dolphin/card/CARDMount/CARDUnmount.s | 47 -- asm/dolphin/card/CARDMount/DoMount.s | 300 ------- asm/dolphin/card/CARDOpen/CARDOpen.s | 81 -- asm/dolphin/card/CARDOpen/__CARDAccess.s | 42 - asm/dolphin/card/CARDOpen/__CARDIsReadable.s | 66 -- asm/dolphin/card/CARDOpen/__CARDIsWritable.s | 85 -- .../card/CARDRdwr/BlockWriteCallback.s | 62 -- asm/dolphin/card/CARDRead/CARDReadAsync.s | 91 --- asm/dolphin/card/CARDStat/CARDGetStatus.s | 75 -- .../card/CARDStat/CARDSetStatusAsync.s | 102 --- asm/dolphin/card/CARDUnlock/DoneCallback.s | 212 ----- asm/dolphin/card/CARDUnlock/DummyLen.s | 55 -- asm/dolphin/card/CARDUnlock/InitCallback.s | 32 - asm/dolphin/card/CARDUnlock/__CARDUnlock.s | 745 ------------------ asm/dolphin/card/CARDWrite/EraseCallback.s | 47 -- asm/dolphin/card/CARDWrite/WriteCallback.s | 100 --- asm/dolphin/dvd/dvd/DVDCancelAsync.s | 177 ----- asm/dolphin/dvd/dvd/DVDCancelStreamAsync.s | 51 -- asm/dolphin/dvd/dvd/DVDCheckDisk.s | 72 -- .../dvd/dvd/DVDGetCommandBlockStatus.s | 22 - asm/dolphin/dvd/dvd/DVDGetDriveStatus.s | 50 -- asm/dolphin/dvd/dvd/DVDInquiryAsync.s | 56 -- asm/dolphin/dvd/dvd/DVDReadAbsAsyncForBS.s | 56 -- asm/dolphin/dvd/dvd/DVDReadAbsAsyncPrio.s | 59 -- asm/dolphin/dvd/dvd/DVDReadDiskID.s | 57 -- asm/dolphin/dvd/dvd/__DVDPrepareResetAsync.s | 81 -- asm/dolphin/dvd/dvd/cbForStateBusy.s | 462 ----------- asm/dolphin/dvd/dvd/cbForStateCheckID2.s | 59 -- asm/dolphin/dvd/dvd/stateReadingFST.s | 39 - asm/dolphin/dvd/dvd/stateReady.s | 209 ----- asm/dolphin/dvd/dvdlow/DVDLowClearCallback.s | 8 - asm/dolphin/pad/Pad/PADReceiveCheckCallback.s | 83 -- asm/dolphin/pad/Pad/PADSetSamplingCallback.s | 24 - .../pad/Pad/__PADDisableRecalibration.s | 35 - diff.py | 24 +- include/dolphin/ar/arq.h | 12 + include/dolphin/card/CARDPriv.h | 2 +- include/dolphin/dvd/dvd.h | 3 - include/dolphin/dvd/dvdlow.h | 3 + include/dolphin/os/OS.h | 2 +- libs/dolphin/ai/Makefile | 6 +- libs/dolphin/ai/ai.c | 36 +- libs/dolphin/ar/Makefile | 5 +- libs/dolphin/ar/ar.c | 281 +++++-- libs/dolphin/ar/arq.c | 211 +++-- libs/dolphin/base/Makefile | 2 +- libs/dolphin/card/CARDBios.c | 286 +++++-- libs/dolphin/card/CARDBlock.c | 67 +- libs/dolphin/card/CARDCheck.c | 162 +++- libs/dolphin/card/CARDDir.c | 23 - libs/dolphin/card/CARDFormat.c | 83 +- libs/dolphin/card/CARDMount.c | 152 +++- libs/dolphin/card/CARDNet.c | 4 +- libs/dolphin/card/CARDOpen.c | 140 +++- libs/dolphin/card/CARDRdwr.c | 39 +- libs/dolphin/card/CARDRead.c | 17 +- libs/dolphin/card/CARDStat.c | 31 +- libs/dolphin/card/CARDUnlock.c | 327 +++++++- libs/dolphin/card/CARDWrite.c | 85 +- libs/dolphin/card/Makefile | 10 +- libs/dolphin/db/Makefile | 2 +- libs/dolphin/dsp/Makefile | 2 +- libs/dolphin/dvd/Makefile | 6 +- libs/dolphin/dvd/dvd.c | 564 ++++++++----- libs/dolphin/dvd/dvdlow.c | 20 +- libs/dolphin/exi/Makefile | 2 +- libs/dolphin/gd/Makefile | 2 +- libs/dolphin/gx/Makefile | 2 +- libs/dolphin/mtx/Makefile | 2 +- libs/dolphin/os/Makefile | 2 +- libs/dolphin/os/OS.c | 2 +- libs/dolphin/pad/Makefile | 5 +- libs/dolphin/pad/Pad.c | 96 ++- libs/dolphin/si/Makefile | 2 +- libs/dolphin/vi/Makefile | 2 +- tools/tp.py | 10 + 105 files changed, 2072 insertions(+), 7028 deletions(-) delete mode 100644 asm/dolphin/ar/ar/ARAlloc.s delete mode 100644 asm/dolphin/ar/ar/ARGetDMAStatus.s delete mode 100644 asm/dolphin/ar/ar/ARInit.s delete mode 100644 asm/dolphin/ar/ar/ARRegisterDMACallback.s delete mode 100644 asm/dolphin/ar/ar/__ARClearInterrupt.s delete mode 100644 asm/dolphin/ar/ar/__ARGetInterruptStatus.s delete mode 100644 asm/dolphin/ar/arq/ARQInit.s delete mode 100644 asm/dolphin/ar/arq/ARQPostRequest.s delete mode 100644 asm/dolphin/ar/arq/__ARQInterruptServiceRoutine.s delete mode 100644 asm/dolphin/ar/arq/__ARQServiceQueueLo.s delete mode 100644 asm/dolphin/card/CARDBios/CARDFreeBlocks.s delete mode 100644 asm/dolphin/card/CARDBios/Retry.s delete mode 100644 asm/dolphin/card/CARDBios/__CARDPutControlBlock.s delete mode 100644 asm/dolphin/card/CARDBios/__CARDReadVendorID.s delete mode 100644 asm/dolphin/card/CARDBios/__CARDStart.s delete mode 100644 asm/dolphin/card/CARDBios/__CARDWritePage.s delete mode 100644 asm/dolphin/card/CARDBlock/EraseCallback.s delete mode 100644 asm/dolphin/card/CARDBlock/__CARDAllocBlock.s delete mode 100644 asm/dolphin/card/CARDBlock/__CARDUpdateFatBlock.s delete mode 100644 asm/dolphin/card/CARDCheck/CARDCheckExAsync.s delete mode 100644 asm/dolphin/card/CARDCheck/VerifyDir.s delete mode 100644 asm/dolphin/card/CARDCheck/VerifyFAT.s delete mode 100644 asm/dolphin/card/CARDCheck/VerifyID.s delete mode 100644 asm/dolphin/card/CARDDir/EraseCallback.s delete mode 100644 asm/dolphin/card/CARDDir/__CARDUpdateDir.s delete mode 100644 asm/dolphin/card/CARDFormat/__CARDFormatRegionAsync.s delete mode 100644 asm/dolphin/card/CARDMount/CARDUnmount.s delete mode 100644 asm/dolphin/card/CARDMount/DoMount.s delete mode 100644 asm/dolphin/card/CARDOpen/CARDOpen.s delete mode 100644 asm/dolphin/card/CARDOpen/__CARDAccess.s delete mode 100644 asm/dolphin/card/CARDOpen/__CARDIsReadable.s delete mode 100644 asm/dolphin/card/CARDOpen/__CARDIsWritable.s delete mode 100644 asm/dolphin/card/CARDRdwr/BlockWriteCallback.s delete mode 100644 asm/dolphin/card/CARDRead/CARDReadAsync.s delete mode 100644 asm/dolphin/card/CARDStat/CARDGetStatus.s delete mode 100644 asm/dolphin/card/CARDStat/CARDSetStatusAsync.s delete mode 100644 asm/dolphin/card/CARDUnlock/DoneCallback.s delete mode 100644 asm/dolphin/card/CARDUnlock/DummyLen.s delete mode 100644 asm/dolphin/card/CARDUnlock/InitCallback.s delete mode 100644 asm/dolphin/card/CARDUnlock/__CARDUnlock.s delete mode 100644 asm/dolphin/card/CARDWrite/EraseCallback.s delete mode 100644 asm/dolphin/card/CARDWrite/WriteCallback.s delete mode 100644 asm/dolphin/dvd/dvd/DVDCancelAsync.s delete mode 100644 asm/dolphin/dvd/dvd/DVDCancelStreamAsync.s delete mode 100644 asm/dolphin/dvd/dvd/DVDCheckDisk.s delete mode 100644 asm/dolphin/dvd/dvd/DVDGetCommandBlockStatus.s delete mode 100644 asm/dolphin/dvd/dvd/DVDGetDriveStatus.s delete mode 100644 asm/dolphin/dvd/dvd/DVDInquiryAsync.s delete mode 100644 asm/dolphin/dvd/dvd/DVDReadAbsAsyncForBS.s delete mode 100644 asm/dolphin/dvd/dvd/DVDReadAbsAsyncPrio.s delete mode 100644 asm/dolphin/dvd/dvd/DVDReadDiskID.s delete mode 100644 asm/dolphin/dvd/dvd/__DVDPrepareResetAsync.s delete mode 100644 asm/dolphin/dvd/dvd/cbForStateBusy.s delete mode 100644 asm/dolphin/dvd/dvd/cbForStateCheckID2.s delete mode 100644 asm/dolphin/dvd/dvd/stateReadingFST.s delete mode 100644 asm/dolphin/dvd/dvd/stateReady.s delete mode 100644 asm/dolphin/dvd/dvdlow/DVDLowClearCallback.s delete mode 100644 asm/dolphin/pad/Pad/PADReceiveCheckCallback.s delete mode 100644 asm/dolphin/pad/Pad/PADSetSamplingCallback.s delete mode 100644 asm/dolphin/pad/Pad/__PADDisableRecalibration.s diff --git a/Makefile b/Makefile index 2ff44c50cf..2cd79d6bfa 100644 --- a/Makefile +++ b/Makefile @@ -71,6 +71,8 @@ AS := $(DEVKITPPC)/bin/powerpc-eabi-as OBJCOPY := $(DEVKITPPC)/bin/powerpc-eabi-objcopy STRIP := $(DEVKITPPC)/bin/powerpc-eabi-strip CC := $(WINE) tools/mwcc_compiler/$(MWCC_VERSION)/mwcceppc_patched.exe +DOLPHIN_LIB_CC := $(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe +FRANK_CC := $(WINE) tools/mwcc_compiler/1.2.5e/mwcceppc.exe LD := $(WINE_LD) tools/mwcc_compiler/$(MWCC_VERSION)/mwldeppc.exe ELF2DOL := $(BUILD_PATH)/elf2dol PYTHON := python3 diff --git a/Progress.md b/Progress.md index c66944acf8..25fbc2edf4 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 22.077750% | 794036 | 3596544 +.text | 22.734158% | 817644 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 30.292747% | 1217972 | 4020672 +Total | 30.879913% | 1241580 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 30.292747% | 1217972 | 4020672 +main.dol | 30.879913% | 1241580 | 4020672 RELs | 33.041295% | 3799856 | 11500324 -Total | 32.329291% | 5017828 | 15520996 +Total | 32.481395% | 5041436 | 15520996 ## RELs diff --git a/README.md b/README.md index 6d753df2cd..61b52feb52 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ git clone https://github.com/zeldaret/tp mkdir -p tools/mwcc_compiler/ ``` -3. Download `GC_COMPILERS.zip` from the [Discord](https://discord.gg/Nshw5pHS4h) server. See the pins in the `#tp-decomp` channel under the Twilight Princess group. +3. Download [GC_WII_COMPILERS.zip](https://cdn.discordapp.com/attachments/727918646525165659/917185027656286218/GC_WII_COMPILERS.zip). 4. Extract `GC_COMPILERS.zip` into the previously created `mwcc_compiler` directory diff --git a/asm/dolphin/ar/ar/ARAlloc.s b/asm/dolphin/ar/ar/ARAlloc.s deleted file mode 100644 index b71ef79763..0000000000 --- a/asm/dolphin/ar/ar/ARAlloc.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_803506C4: -/* 803506C4 7C 08 02 A6 */ mflr r0 -/* 803506C8 90 01 00 04 */ stw r0, 4(r1) -/* 803506CC 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 803506D0 93 E1 00 14 */ stw r31, 0x14(r1) -/* 803506D4 93 C1 00 10 */ stw r30, 0x10(r1) -/* 803506D8 7C 7E 1B 78 */ mr r30, r3 -/* 803506DC 4B FE D0 19 */ bl OSDisableInterrupts -/* 803506E0 83 ED 93 48 */ lwz r31, __AR_StackPointer(r13) -/* 803506E4 80 8D 93 50 */ lwz r4, __AR_BlockLength(r13) -/* 803506E8 7C 1F F2 14 */ add r0, r31, r30 -/* 803506EC 90 0D 93 48 */ stw r0, __AR_StackPointer(r13) -/* 803506F0 93 C4 00 00 */ stw r30, 0(r4) -/* 803506F4 80 AD 93 50 */ lwz r5, __AR_BlockLength(r13) -/* 803506F8 80 8D 93 4C */ lwz r4, __AR_FreeBlocks(r13) -/* 803506FC 38 A5 00 04 */ addi r5, r5, 4 -/* 80350700 38 04 FF FF */ addi r0, r4, -1 -/* 80350704 90 AD 93 50 */ stw r5, __AR_BlockLength(r13) -/* 80350708 90 0D 93 4C */ stw r0, __AR_FreeBlocks(r13) -/* 8035070C 4B FE D0 11 */ bl OSRestoreInterrupts -/* 80350710 7F E3 FB 78 */ mr r3, r31 -/* 80350714 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80350718 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8035071C 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 80350720 38 21 00 18 */ addi r1, r1, 0x18 -/* 80350724 7C 08 03 A6 */ mtlr r0 -/* 80350728 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/ar/ARGetDMAStatus.s b/asm/dolphin/ar/ar/ARGetDMAStatus.s deleted file mode 100644 index 3fe00537dd..0000000000 --- a/asm/dolphin/ar/ar/ARGetDMAStatus.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80350598: -/* 80350598 7C 08 02 A6 */ mflr r0 -/* 8035059C 90 01 00 04 */ stw r0, 4(r1) -/* 803505A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803505A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803505A8 4B FE D1 4D */ bl OSDisableInterrupts -/* 803505AC 3C 80 CC 00 */ lis r4, 0xCC00 /* 0xCC00500A@ha */ -/* 803505B0 A0 04 50 0A */ lhz r0, 0x500A(r4) /* 0xCC00500A@l */ -/* 803505B4 54 1F 05 AC */ rlwinm r31, r0, 0, 0x16, 0x16 -/* 803505B8 4B FE D1 65 */ bl OSRestoreInterrupts -/* 803505BC 7F E3 FB 78 */ mr r3, r31 -/* 803505C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803505C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803505C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803505CC 7C 08 03 A6 */ mtlr r0 -/* 803505D0 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/ar/ARInit.s b/asm/dolphin/ar/ar/ARInit.s deleted file mode 100644 index 905a62ce33..0000000000 --- a/asm/dolphin/ar/ar/ARInit.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8035072C: -/* 8035072C 7C 08 02 A6 */ mflr r0 -/* 80350730 90 01 00 04 */ stw r0, 4(r1) -/* 80350734 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80350738 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8035073C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80350740 3B C4 00 00 */ addi r30, r4, 0 -/* 80350744 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80350748 3B A3 00 00 */ addi r29, r3, 0 -/* 8035074C 80 0D 93 54 */ lwz r0, __AR_init_flag(r13) -/* 80350750 2C 00 00 01 */ cmpwi r0, 1 -/* 80350754 40 82 00 0C */ bne lbl_80350760 -/* 80350758 38 60 40 00 */ li r3, 0x4000 -/* 8035075C 48 00 00 78 */ b lbl_803507D4 -lbl_80350760: -/* 80350760 80 6D 84 C8 */ lwz r3, __ARVersion(r13) -/* 80350764 4B FE A1 11 */ bl OSRegisterVersion -/* 80350768 4B FE CF 8D */ bl OSDisableInterrupts -/* 8035076C 38 00 00 00 */ li r0, 0 -/* 80350770 3C 80 80 35 */ lis r4, __ARHandler@ha /* 0x803507F8@ha */ -/* 80350774 90 0D 93 38 */ stw r0, __AR_Callback(r13) -/* 80350778 3B E3 00 00 */ addi r31, r3, 0 -/* 8035077C 38 84 07 F8 */ addi r4, r4, __ARHandler@l /* 0x803507F8@l */ -/* 80350780 38 60 00 06 */ li r3, 6 -/* 80350784 4B FE CF BD */ bl __OSSetInterruptHandler -/* 80350788 3C 60 02 00 */ lis r3, 0x200 -/* 8035078C 4B FE D3 B9 */ bl __OSUnmaskInterrupts -/* 80350790 38 00 40 00 */ li r0, 0x4000 -/* 80350794 93 CD 93 4C */ stw r30, __AR_FreeBlocks(r13) -/* 80350798 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC005000@ha */ -/* 8035079C 90 0D 93 48 */ stw r0, __AR_StackPointer(r13) -/* 803507A0 38 83 50 00 */ addi r4, r3, 0x5000 /* 0xCC005000@l */ -/* 803507A4 93 AD 93 50 */ stw r29, __AR_BlockLength(r13) -/* 803507A8 A0 04 00 1A */ lhz r0, 0x1a(r4) -/* 803507AC A0 63 50 1A */ lhz r3, 0x501a(r3) -/* 803507B0 54 00 00 2E */ rlwinm r0, r0, 0, 0, 0x17 -/* 803507B4 50 60 06 3E */ rlwimi r0, r3, 0, 0x18, 0x1f -/* 803507B8 B0 04 00 1A */ sth r0, 0x1a(r4) -/* 803507BC 48 00 00 E5 */ bl __ARChecksize -/* 803507C0 38 00 00 01 */ li r0, 1 -/* 803507C4 90 0D 93 54 */ stw r0, __AR_init_flag(r13) -/* 803507C8 7F E3 FB 78 */ mr r3, r31 -/* 803507CC 4B FE CF 51 */ bl OSRestoreInterrupts -/* 803507D0 80 6D 93 48 */ lwz r3, __AR_StackPointer(r13) -lbl_803507D4: -/* 803507D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803507D8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 803507DC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 803507E0 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 803507E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 803507E8 7C 08 03 A6 */ mtlr r0 -/* 803507EC 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/ar/ARRegisterDMACallback.s b/asm/dolphin/ar/ar/ARRegisterDMACallback.s deleted file mode 100644 index f50162e884..0000000000 --- a/asm/dolphin/ar/ar/ARRegisterDMACallback.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80350554: -/* 80350554 7C 08 02 A6 */ mflr r0 -/* 80350558 90 01 00 04 */ stw r0, 4(r1) -/* 8035055C 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80350560 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80350564 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80350568 7C 7E 1B 78 */ mr r30, r3 -/* 8035056C 83 ED 93 38 */ lwz r31, __AR_Callback(r13) -/* 80350570 4B FE D1 85 */ bl OSDisableInterrupts -/* 80350574 93 CD 93 38 */ stw r30, __AR_Callback(r13) -/* 80350578 4B FE D1 A5 */ bl OSRestoreInterrupts -/* 8035057C 7F E3 FB 78 */ mr r3, r31 -/* 80350580 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80350584 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80350588 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 8035058C 38 21 00 18 */ addi r1, r1, 0x18 -/* 80350590 7C 08 03 A6 */ mtlr r0 -/* 80350594 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/ar/__ARClearInterrupt.s b/asm/dolphin/ar/ar/__ARClearInterrupt.s deleted file mode 100644 index 503b64907c..0000000000 --- a/asm/dolphin/ar/ar/__ARClearInterrupt.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80350870: -/* 80350870 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC005000@ha */ -/* 80350874 38 63 50 00 */ addi r3, r3, 0x5000 /* 0xCC005000@l */ -/* 80350878 A0 83 00 0A */ lhz r4, 0xa(r3) -/* 8035087C 38 00 FF 77 */ li r0, -137 -/* 80350880 7C 80 00 38 */ and r0, r4, r0 -/* 80350884 60 00 00 20 */ ori r0, r0, 0x20 -/* 80350888 B0 03 00 0A */ sth r0, 0xa(r3) -/* 8035088C 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/ar/__ARGetInterruptStatus.s b/asm/dolphin/ar/ar/__ARGetInterruptStatus.s deleted file mode 100644 index 2b0c13eaa0..0000000000 --- a/asm/dolphin/ar/ar/__ARGetInterruptStatus.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80350890: -/* 80350890 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC00500A@ha */ -/* 80350894 A0 03 50 0A */ lhz r0, 0x500A(r3) /* 0xCC00500A@l */ -/* 80350898 54 03 06 B4 */ rlwinm r3, r0, 0, 0x1a, 0x1a -/* 8035089C 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/arq/ARQInit.s b/asm/dolphin/ar/arq/ARQInit.s deleted file mode 100644 index ae1ba37c7c..0000000000 --- a/asm/dolphin/ar/arq/ARQInit.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80352264: -/* 80352264 7C 08 02 A6 */ mflr r0 -/* 80352268 90 01 00 04 */ stw r0, 4(r1) -/* 8035226C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80352270 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80352274 80 0D 93 7C */ lwz r0, __ARQ_init_flag(r13) -/* 80352278 2C 00 00 01 */ cmpwi r0, 1 -/* 8035227C 41 82 00 44 */ beq lbl_803522C0 -/* 80352280 80 6D 84 D0 */ lwz r3, __ARQVersion(r13) -/* 80352284 4B FE 85 F1 */ bl OSRegisterVersion -/* 80352288 3B E0 00 00 */ li r31, 0 -/* 8035228C 38 00 10 00 */ li r0, 0x1000 -/* 80352290 93 ED 93 60 */ stw r31, __ARQRequestQueueLo(r13) -/* 80352294 3C 60 80 35 */ lis r3, __ARQInterruptServiceRoutine@ha /* 0x80352198@ha */ -/* 80352298 93 ED 93 58 */ stw r31, __ARQRequestQueueHi(r13) -/* 8035229C 38 63 21 98 */ addi r3, r3, __ARQInterruptServiceRoutine@l /* 0x80352198@l */ -/* 803522A0 90 0D 93 78 */ stw r0, __ARQChunkSize(r13) -/* 803522A4 4B FF E2 B1 */ bl ARRegisterDMACallback -/* 803522A8 38 00 00 01 */ li r0, 1 -/* 803522AC 93 ED 93 68 */ stw r31, __ARQRequestPendingHi(r13) -/* 803522B0 93 ED 93 6C */ stw r31, __ARQRequestPendingLo(r13) -/* 803522B4 93 ED 93 70 */ stw r31, __ARQCallbackHi(r13) -/* 803522B8 93 ED 93 74 */ stw r31, __ARQCallbackLo(r13) -/* 803522BC 90 0D 93 7C */ stw r0, __ARQ_init_flag(r13) -lbl_803522C0: -/* 803522C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803522C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803522C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803522CC 7C 08 03 A6 */ mtlr r0 -/* 803522D0 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/arq/ARQPostRequest.s b/asm/dolphin/ar/arq/ARQPostRequest.s deleted file mode 100644 index c38fe5bce9..0000000000 --- a/asm/dolphin/ar/arq/ARQPostRequest.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_803522D4: -/* 803522D4 7C 08 02 A6 */ mflr r0 -/* 803522D8 28 0A 00 00 */ cmplwi r10, 0 -/* 803522DC 90 01 00 04 */ stw r0, 4(r1) -/* 803522E0 38 00 00 00 */ li r0, 0 -/* 803522E4 94 21 FF C8 */ stwu r1, -0x38(r1) -/* 803522E8 93 E1 00 34 */ stw r31, 0x34(r1) -/* 803522EC 93 C1 00 30 */ stw r30, 0x30(r1) -/* 803522F0 3B C6 00 00 */ addi r30, r6, 0 -/* 803522F4 93 A1 00 2C */ stw r29, 0x2c(r1) -/* 803522F8 3B A3 00 00 */ addi r29, r3, 0 -/* 803522FC 90 03 00 00 */ stw r0, 0(r3) -/* 80352300 90 83 00 04 */ stw r4, 4(r3) -/* 80352304 90 A3 00 08 */ stw r5, 8(r3) -/* 80352308 90 E3 00 10 */ stw r7, 0x10(r3) -/* 8035230C 91 03 00 14 */ stw r8, 0x14(r3) -/* 80352310 91 23 00 18 */ stw r9, 0x18(r3) -/* 80352314 41 82 00 0C */ beq lbl_80352320 -/* 80352318 91 5D 00 1C */ stw r10, 0x1c(r29) -/* 8035231C 48 00 00 10 */ b lbl_8035232C -lbl_80352320: -/* 80352320 3C 60 80 35 */ lis r3, __ARQCallbackHack@ha /* 0x80352194@ha */ -/* 80352324 38 03 21 94 */ addi r0, r3, __ARQCallbackHack@l /* 0x80352194@l */ -/* 80352328 90 1D 00 1C */ stw r0, 0x1c(r29) -lbl_8035232C: -/* 8035232C 4B FE B3 C9 */ bl OSDisableInterrupts -/* 80352330 2C 1E 00 01 */ cmpwi r30, 1 -/* 80352334 3B E3 00 00 */ addi r31, r3, 0 -/* 80352338 41 82 00 38 */ beq lbl_80352370 -/* 8035233C 40 80 00 54 */ bge lbl_80352390 -/* 80352340 2C 1E 00 00 */ cmpwi r30, 0 -/* 80352344 40 80 00 08 */ bge lbl_8035234C -/* 80352348 48 00 00 48 */ b lbl_80352390 -lbl_8035234C: -/* 8035234C 80 0D 93 60 */ lwz r0, __ARQRequestQueueLo(r13) -/* 80352350 28 00 00 00 */ cmplwi r0, 0 -/* 80352354 41 82 00 10 */ beq lbl_80352364 -/* 80352358 80 6D 93 64 */ lwz r3, __ARQRequestTailLo(r13) -/* 8035235C 93 A3 00 00 */ stw r29, 0(r3) -/* 80352360 48 00 00 08 */ b lbl_80352368 -lbl_80352364: -/* 80352364 93 AD 93 60 */ stw r29, __ARQRequestQueueLo(r13) -lbl_80352368: -/* 80352368 93 AD 93 64 */ stw r29, __ARQRequestTailLo(r13) -/* 8035236C 48 00 00 24 */ b lbl_80352390 -lbl_80352370: -/* 80352370 80 0D 93 58 */ lwz r0, __ARQRequestQueueHi(r13) -/* 80352374 28 00 00 00 */ cmplwi r0, 0 -/* 80352378 41 82 00 10 */ beq lbl_80352388 -/* 8035237C 80 6D 93 5C */ lwz r3, __ARQRequestTailHi(r13) -/* 80352380 93 A3 00 00 */ stw r29, 0(r3) -/* 80352384 48 00 00 08 */ b lbl_8035238C -lbl_80352388: -/* 80352388 93 AD 93 58 */ stw r29, __ARQRequestQueueHi(r13) -lbl_8035238C: -/* 8035238C 93 AD 93 5C */ stw r29, __ARQRequestTailHi(r13) -lbl_80352390: -/* 80352390 80 0D 93 68 */ lwz r0, __ARQRequestPendingHi(r13) -/* 80352394 28 00 00 00 */ cmplwi r0, 0 -/* 80352398 40 82 00 74 */ bne lbl_8035240C -/* 8035239C 80 0D 93 6C */ lwz r0, __ARQRequestPendingLo(r13) -/* 803523A0 28 00 00 00 */ cmplwi r0, 0 -/* 803523A4 40 82 00 68 */ bne lbl_8035240C -/* 803523A8 80 CD 93 58 */ lwz r6, __ARQRequestQueueHi(r13) -/* 803523AC 28 06 00 00 */ cmplwi r6, 0 -/* 803523B0 41 82 00 4C */ beq lbl_803523FC -/* 803523B4 80 66 00 08 */ lwz r3, 8(r6) -/* 803523B8 28 03 00 00 */ cmplwi r3, 0 -/* 803523BC 40 82 00 18 */ bne lbl_803523D4 -/* 803523C0 80 86 00 10 */ lwz r4, 0x10(r6) -/* 803523C4 80 A6 00 14 */ lwz r5, 0x14(r6) -/* 803523C8 80 C6 00 18 */ lwz r6, 0x18(r6) -/* 803523CC 4B FF E2 09 */ bl ARStartDMA -/* 803523D0 48 00 00 14 */ b lbl_803523E4 -lbl_803523D4: -/* 803523D4 80 86 00 14 */ lwz r4, 0x14(r6) -/* 803523D8 80 A6 00 10 */ lwz r5, 0x10(r6) -/* 803523DC 80 C6 00 18 */ lwz r6, 0x18(r6) -/* 803523E0 4B FF E1 F5 */ bl ARStartDMA -lbl_803523E4: -/* 803523E4 80 6D 93 58 */ lwz r3, __ARQRequestQueueHi(r13) -/* 803523E8 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 803523EC 90 0D 93 70 */ stw r0, __ARQCallbackHi(r13) -/* 803523F0 90 6D 93 68 */ stw r3, __ARQRequestPendingHi(r13) -/* 803523F4 80 03 00 00 */ lwz r0, 0(r3) -/* 803523F8 90 0D 93 58 */ stw r0, __ARQRequestQueueHi(r13) -lbl_803523FC: -/* 803523FC 80 0D 93 68 */ lwz r0, __ARQRequestPendingHi(r13) -/* 80352400 28 00 00 00 */ cmplwi r0, 0 -/* 80352404 40 82 00 08 */ bne lbl_8035240C -/* 80352408 4B FF FC 8D */ bl __ARQServiceQueueLo -lbl_8035240C: -/* 8035240C 7F E3 FB 78 */ mr r3, r31 -/* 80352410 4B FE B3 0D */ bl OSRestoreInterrupts -/* 80352414 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80352418 83 E1 00 34 */ lwz r31, 0x34(r1) -/* 8035241C 83 C1 00 30 */ lwz r30, 0x30(r1) -/* 80352420 83 A1 00 2C */ lwz r29, 0x2c(r1) -/* 80352424 38 21 00 38 */ addi r1, r1, 0x38 -/* 80352428 7C 08 03 A6 */ mtlr r0 -/* 8035242C 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/arq/__ARQInterruptServiceRoutine.s b/asm/dolphin/ar/arq/__ARQInterruptServiceRoutine.s deleted file mode 100644 index 849d6fcb06..0000000000 --- a/asm/dolphin/ar/arq/__ARQInterruptServiceRoutine.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80352198: -/* 80352198 7C 08 02 A6 */ mflr r0 -/* 8035219C 90 01 00 04 */ stw r0, 4(r1) -/* 803521A0 94 21 FF F8 */ stwu r1, -8(r1) -/* 803521A4 81 8D 93 70 */ lwz r12, __ARQCallbackHi(r13) -/* 803521A8 28 0C 00 00 */ cmplwi r12, 0 -/* 803521AC 41 82 00 20 */ beq lbl_803521CC -/* 803521B0 80 6D 93 68 */ lwz r3, __ARQRequestPendingHi(r13) -/* 803521B4 7D 88 03 A6 */ mtlr r12 -/* 803521B8 4E 80 00 21 */ blrl -/* 803521BC 38 00 00 00 */ li r0, 0 -/* 803521C0 90 0D 93 68 */ stw r0, __ARQRequestPendingHi(r13) -/* 803521C4 90 0D 93 70 */ stw r0, __ARQCallbackHi(r13) -/* 803521C8 48 00 00 28 */ b lbl_803521F0 -lbl_803521CC: -/* 803521CC 81 8D 93 74 */ lwz r12, __ARQCallbackLo(r13) -/* 803521D0 28 0C 00 00 */ cmplwi r12, 0 -/* 803521D4 41 82 00 1C */ beq lbl_803521F0 -/* 803521D8 80 6D 93 6C */ lwz r3, __ARQRequestPendingLo(r13) -/* 803521DC 7D 88 03 A6 */ mtlr r12 -/* 803521E0 4E 80 00 21 */ blrl -/* 803521E4 38 00 00 00 */ li r0, 0 -/* 803521E8 90 0D 93 6C */ stw r0, __ARQRequestPendingLo(r13) -/* 803521EC 90 0D 93 74 */ stw r0, __ARQCallbackLo(r13) -lbl_803521F0: -/* 803521F0 80 CD 93 58 */ lwz r6, __ARQRequestQueueHi(r13) -/* 803521F4 28 06 00 00 */ cmplwi r6, 0 -/* 803521F8 41 82 00 4C */ beq lbl_80352244 -/* 803521FC 80 66 00 08 */ lwz r3, 8(r6) -/* 80352200 28 03 00 00 */ cmplwi r3, 0 -/* 80352204 40 82 00 18 */ bne lbl_8035221C -/* 80352208 80 86 00 10 */ lwz r4, 0x10(r6) -/* 8035220C 80 A6 00 14 */ lwz r5, 0x14(r6) -/* 80352210 80 C6 00 18 */ lwz r6, 0x18(r6) -/* 80352214 4B FF E3 C1 */ bl ARStartDMA -/* 80352218 48 00 00 14 */ b lbl_8035222C -lbl_8035221C: -/* 8035221C 80 86 00 14 */ lwz r4, 0x14(r6) -/* 80352220 80 A6 00 10 */ lwz r5, 0x10(r6) -/* 80352224 80 C6 00 18 */ lwz r6, 0x18(r6) -/* 80352228 4B FF E3 AD */ bl ARStartDMA -lbl_8035222C: -/* 8035222C 80 6D 93 58 */ lwz r3, __ARQRequestQueueHi(r13) -/* 80352230 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80352234 90 0D 93 70 */ stw r0, __ARQCallbackHi(r13) -/* 80352238 90 6D 93 68 */ stw r3, __ARQRequestPendingHi(r13) -/* 8035223C 80 03 00 00 */ lwz r0, 0(r3) -/* 80352240 90 0D 93 58 */ stw r0, __ARQRequestQueueHi(r13) -lbl_80352244: -/* 80352244 80 0D 93 68 */ lwz r0, __ARQRequestPendingHi(r13) -/* 80352248 28 00 00 00 */ cmplwi r0, 0 -/* 8035224C 40 82 00 08 */ bne lbl_80352254 -/* 80352250 4B FF FE 45 */ bl __ARQServiceQueueLo -lbl_80352254: -/* 80352254 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80352258 38 21 00 08 */ addi r1, r1, 8 -/* 8035225C 7C 08 03 A6 */ mtlr r0 -/* 80352260 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/arq/__ARQServiceQueueLo.s b/asm/dolphin/ar/arq/__ARQServiceQueueLo.s deleted file mode 100644 index 8fa2e93442..0000000000 --- a/asm/dolphin/ar/arq/__ARQServiceQueueLo.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80352094: -/* 80352094 7C 08 02 A6 */ mflr r0 -/* 80352098 90 01 00 04 */ stw r0, 4(r1) -/* 8035209C 94 21 FF F8 */ stwu r1, -8(r1) -/* 803520A0 80 0D 93 6C */ lwz r0, __ARQRequestPendingLo(r13) -/* 803520A4 28 00 00 00 */ cmplwi r0, 0 -/* 803520A8 40 82 00 1C */ bne lbl_803520C4 -/* 803520AC 80 6D 93 60 */ lwz r3, __ARQRequestQueueLo(r13) -/* 803520B0 28 03 00 00 */ cmplwi r3, 0 -/* 803520B4 41 82 00 10 */ beq lbl_803520C4 -/* 803520B8 90 6D 93 6C */ stw r3, __ARQRequestPendingLo(r13) -/* 803520BC 80 03 00 00 */ lwz r0, 0(r3) -/* 803520C0 90 0D 93 60 */ stw r0, __ARQRequestQueueLo(r13) -lbl_803520C4: -/* 803520C4 80 AD 93 6C */ lwz r5, __ARQRequestPendingLo(r13) -/* 803520C8 28 05 00 00 */ cmplwi r5, 0 -/* 803520CC 41 82 00 B8 */ beq lbl_80352184 -/* 803520D0 80 C5 00 18 */ lwz r6, 0x18(r5) -/* 803520D4 80 0D 93 78 */ lwz r0, __ARQChunkSize(r13) -/* 803520D8 7C 06 00 40 */ cmplw r6, r0 -/* 803520DC 41 81 00 3C */ bgt lbl_80352118 -/* 803520E0 80 65 00 08 */ lwz r3, 8(r5) -/* 803520E4 28 03 00 00 */ cmplwi r3, 0 -/* 803520E8 40 82 00 14 */ bne lbl_803520FC -/* 803520EC 80 85 00 10 */ lwz r4, 0x10(r5) -/* 803520F0 80 A5 00 14 */ lwz r5, 0x14(r5) -/* 803520F4 4B FF E4 E1 */ bl ARStartDMA -/* 803520F8 48 00 00 10 */ b lbl_80352108 -lbl_803520FC: -/* 803520FC 80 85 00 14 */ lwz r4, 0x14(r5) -/* 80352100 80 A5 00 10 */ lwz r5, 0x10(r5) -/* 80352104 4B FF E4 D1 */ bl ARStartDMA -lbl_80352108: -/* 80352108 80 6D 93 6C */ lwz r3, __ARQRequestPendingLo(r13) -/* 8035210C 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80352110 90 0D 93 74 */ stw r0, __ARQCallbackLo(r13) -/* 80352114 48 00 00 34 */ b lbl_80352148 -lbl_80352118: -/* 80352118 80 65 00 08 */ lwz r3, 8(r5) -/* 8035211C 28 03 00 00 */ cmplwi r3, 0 -/* 80352120 40 82 00 18 */ bne lbl_80352138 -/* 80352124 80 85 00 10 */ lwz r4, 0x10(r5) -/* 80352128 7C 06 03 78 */ mr r6, r0 -/* 8035212C 80 A5 00 14 */ lwz r5, 0x14(r5) -/* 80352130 4B FF E4 A5 */ bl ARStartDMA -/* 80352134 48 00 00 14 */ b lbl_80352148 -lbl_80352138: -/* 80352138 80 85 00 14 */ lwz r4, 0x14(r5) -/* 8035213C 7C 06 03 78 */ mr r6, r0 -/* 80352140 80 A5 00 10 */ lwz r5, 0x10(r5) -/* 80352144 4B FF E4 91 */ bl ARStartDMA -lbl_80352148: -/* 80352148 80 6D 93 6C */ lwz r3, __ARQRequestPendingLo(r13) -/* 8035214C 80 8D 93 78 */ lwz r4, __ARQChunkSize(r13) -/* 80352150 80 03 00 18 */ lwz r0, 0x18(r3) -/* 80352154 7C 04 00 50 */ subf r0, r4, r0 -/* 80352158 90 03 00 18 */ stw r0, 0x18(r3) -/* 8035215C 80 8D 93 6C */ lwz r4, __ARQRequestPendingLo(r13) -/* 80352160 80 0D 93 78 */ lwz r0, __ARQChunkSize(r13) -/* 80352164 80 64 00 10 */ lwz r3, 0x10(r4) -/* 80352168 7C 03 02 14 */ add r0, r3, r0 -/* 8035216C 90 04 00 10 */ stw r0, 0x10(r4) -/* 80352170 80 8D 93 6C */ lwz r4, __ARQRequestPendingLo(r13) -/* 80352174 80 0D 93 78 */ lwz r0, __ARQChunkSize(r13) -/* 80352178 80 64 00 14 */ lwz r3, 0x14(r4) -/* 8035217C 7C 03 02 14 */ add r0, r3, r0 -/* 80352180 90 04 00 14 */ stw r0, 0x14(r4) -lbl_80352184: -/* 80352184 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80352188 38 21 00 08 */ addi r1, r1, 8 -/* 8035218C 7C 08 03 A6 */ mtlr r0 -/* 80352190 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDBios/CARDFreeBlocks.s b/asm/dolphin/card/CARDBios/CARDFreeBlocks.s deleted file mode 100644 index 5ad7ae37cc..0000000000 --- a/asm/dolphin/card/CARDBios/CARDFreeBlocks.s +++ /dev/null @@ -1,98 +0,0 @@ -lbl_80353CD0: -/* 80353CD0 7C 08 02 A6 */ mflr r0 -/* 80353CD4 90 01 00 04 */ stw r0, 4(r1) -/* 80353CD8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80353CDC 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80353CE0 3B E5 00 00 */ addi r31, r5, 0 -/* 80353CE4 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80353CE8 93 A1 00 24 */ stw r29, 0x24(r1) -/* 80353CEC 3B A4 00 00 */ addi r29, r4, 0 -/* 80353CF0 38 81 00 18 */ addi r4, r1, 0x18 -/* 80353CF4 4B FF FE C1 */ bl __CARDGetControlBlock -/* 80353CF8 2C 03 00 00 */ cmpwi r3, 0 -/* 80353CFC 40 80 00 08 */ bge lbl_80353D04 -/* 80353D00 48 00 01 04 */ b lbl_80353E04 -lbl_80353D04: -/* 80353D04 80 61 00 18 */ lwz r3, 0x18(r1) -/* 80353D08 48 00 17 0D */ bl __CARDGetFatBlock -/* 80353D0C 7C 7E 1B 78 */ mr r30, r3 -/* 80353D10 80 61 00 18 */ lwz r3, 0x18(r1) -/* 80353D14 48 00 1A 69 */ bl __CARDGetDirBlock -/* 80353D18 28 1E 00 00 */ cmplwi r30, 0 -/* 80353D1C 41 82 00 0C */ beq lbl_80353D28 -/* 80353D20 28 03 00 00 */ cmplwi r3, 0 -/* 80353D24 40 82 00 44 */ bne lbl_80353D68 -lbl_80353D28: -/* 80353D28 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80353D2C 4B FE 99 C9 */ bl OSDisableInterrupts -/* 80353D30 80 1E 00 00 */ lwz r0, 0(r30) -/* 80353D34 2C 00 00 00 */ cmpwi r0, 0 -/* 80353D38 41 82 00 10 */ beq lbl_80353D48 -/* 80353D3C 38 00 FF FA */ li r0, -6 -/* 80353D40 90 1E 00 04 */ stw r0, 4(r30) -/* 80353D44 48 00 00 18 */ b lbl_80353D5C -lbl_80353D48: -/* 80353D48 80 1E 00 04 */ lwz r0, 4(r30) -/* 80353D4C 2C 00 FF FF */ cmpwi r0, -1 -/* 80353D50 40 82 00 0C */ bne lbl_80353D5C -/* 80353D54 38 00 FF FA */ li r0, -6 -/* 80353D58 90 1E 00 04 */ stw r0, 4(r30) -lbl_80353D5C: -/* 80353D5C 4B FE 99 C1 */ bl OSRestoreInterrupts -/* 80353D60 38 60 FF FA */ li r3, -6 -/* 80353D64 48 00 00 A0 */ b lbl_80353E04 -lbl_80353D68: -/* 80353D68 28 1D 00 00 */ cmplwi r29, 0 -/* 80353D6C 41 82 00 18 */ beq lbl_80353D84 -/* 80353D70 80 81 00 18 */ lwz r4, 0x18(r1) -/* 80353D74 A0 1E 00 06 */ lhz r0, 6(r30) -/* 80353D78 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80353D7C 7C 04 01 D6 */ mullw r0, r4, r0 -/* 80353D80 90 1D 00 00 */ stw r0, 0(r29) -lbl_80353D84: -/* 80353D84 28 1F 00 00 */ cmplwi r31, 0 -/* 80353D88 41 82 00 40 */ beq lbl_80353DC8 -/* 80353D8C 38 00 00 00 */ li r0, 0 -/* 80353D90 90 1F 00 00 */ stw r0, 0(r31) -/* 80353D94 38 A0 00 00 */ li r5, 0 -/* 80353D98 48 00 00 24 */ b lbl_80353DBC -lbl_80353D9C: -/* 80353D9C 88 03 00 08 */ lbz r0, 8(r3) -/* 80353DA0 28 00 00 FF */ cmplwi r0, 0xff -/* 80353DA4 40 82 00 10 */ bne lbl_80353DB4 -/* 80353DA8 80 9F 00 00 */ lwz r4, 0(r31) -/* 80353DAC 38 04 00 01 */ addi r0, r4, 1 -/* 80353DB0 90 1F 00 00 */ stw r0, 0(r31) -lbl_80353DB4: -/* 80353DB4 38 63 00 40 */ addi r3, r3, 0x40 -/* 80353DB8 38 A5 00 01 */ addi r5, r5, 1 -lbl_80353DBC: -/* 80353DBC 54 A0 04 3E */ clrlwi r0, r5, 0x10 -/* 80353DC0 28 00 00 7F */ cmplwi r0, 0x7f -/* 80353DC4 41 80 FF D8 */ blt lbl_80353D9C -lbl_80353DC8: -/* 80353DC8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80353DCC 4B FE 99 29 */ bl OSDisableInterrupts -/* 80353DD0 80 1E 00 00 */ lwz r0, 0(r30) -/* 80353DD4 2C 00 00 00 */ cmpwi r0, 0 -/* 80353DD8 41 82 00 10 */ beq lbl_80353DE8 -/* 80353DDC 38 00 00 00 */ li r0, 0 -/* 80353DE0 90 1E 00 04 */ stw r0, 4(r30) -/* 80353DE4 48 00 00 18 */ b lbl_80353DFC -lbl_80353DE8: -/* 80353DE8 80 1E 00 04 */ lwz r0, 4(r30) -/* 80353DEC 2C 00 FF FF */ cmpwi r0, -1 -/* 80353DF0 40 82 00 0C */ bne lbl_80353DFC -/* 80353DF4 38 00 00 00 */ li r0, 0 -/* 80353DF8 90 1E 00 04 */ stw r0, 4(r30) -lbl_80353DFC: -/* 80353DFC 4B FE 99 21 */ bl OSRestoreInterrupts -/* 80353E00 38 60 00 00 */ li r3, 0 -lbl_80353E04: -/* 80353E04 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80353E08 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80353E0C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80353E10 83 A1 00 24 */ lwz r29, 0x24(r1) -/* 80353E14 38 21 00 30 */ addi r1, r1, 0x30 -/* 80353E18 7C 08 03 A6 */ mtlr r0 -/* 80353E1C 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDBios/Retry.s b/asm/dolphin/card/CARDBios/Retry.s deleted file mode 100644 index 2aed7de700..0000000000 --- a/asm/dolphin/card/CARDBios/Retry.s +++ /dev/null @@ -1,182 +0,0 @@ -lbl_80353174: -/* 80353174 7C 08 02 A6 */ mflr r0 -/* 80353178 38 A0 00 04 */ li r5, 4 -/* 8035317C 90 01 00 04 */ stw r0, 4(r1) -/* 80353180 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80353184 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80353188 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8035318C 3B C3 00 00 */ addi r30, r3, 0 -/* 80353190 1C 9E 01 10 */ mulli r4, r30, 0x110 -/* 80353194 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80353198 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 8035319C 7F E0 22 14 */ add r31, r0, r4 -/* 803531A0 38 7E 00 00 */ addi r3, r30, 0 -/* 803531A4 38 80 00 00 */ li r4, 0 -/* 803531A8 4B FF 06 C1 */ bl EXISelect -/* 803531AC 2C 03 00 00 */ cmpwi r3, 0 -/* 803531B0 40 82 00 14 */ bne lbl_803531C4 -/* 803531B4 7F C3 F3 78 */ mr r3, r30 -/* 803531B8 4B FF 0F 65 */ bl EXIUnlock -/* 803531BC 38 60 FF FD */ li r3, -3 -/* 803531C0 48 00 02 3C */ b lbl_803533FC -lbl_803531C4: -/* 803531C4 38 7F 00 E0 */ addi r3, r31, 0xe0 -/* 803531C8 4B FE 7A 75 */ bl OSCancelAlarm -/* 803531CC 88 1F 00 94 */ lbz r0, 0x94(r31) -/* 803531D0 2C 00 00 F3 */ cmpwi r0, 0xf3 -/* 803531D4 41 82 01 34 */ beq lbl_80353308 -/* 803531D8 40 80 00 14 */ bge lbl_803531EC -/* 803531DC 2C 00 00 F1 */ cmpwi r0, 0xf1 -/* 803531E0 41 82 00 C4 */ beq lbl_803532A4 -/* 803531E4 40 80 00 14 */ bge lbl_803531F8 -/* 803531E8 48 00 01 20 */ b lbl_80353308 -lbl_803531EC: -/* 803531EC 2C 00 00 F5 */ cmpwi r0, 0xf5 -/* 803531F0 40 80 01 18 */ bge lbl_80353308 -/* 803531F4 48 00 00 3C */ b lbl_80353230 -lbl_803531F8: -/* 803531F8 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 803531FC 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 80353200 3C 80 10 62 */ lis r4, 0x1062 /* 0x10624DD3@ha */ -/* 80353204 3C 60 80 35 */ lis r3, TimeoutHandler@ha /* 0x803530D0@ha */ -/* 80353208 54 00 F0 BE */ srwi r0, r0, 2 -/* 8035320C 38 84 4D D3 */ addi r4, r4, 0x4DD3 /* 0x10624DD3@l */ -/* 80353210 7C 04 00 16 */ mulhwu r0, r4, r0 -/* 80353214 54 00 D1 BE */ srwi r0, r0, 6 -/* 80353218 1C C0 00 64 */ mulli r6, r0, 0x64 -/* 8035321C 38 E3 30 D0 */ addi r7, r3, TimeoutHandler@l /* 0x803530D0@l */ -/* 80353220 38 7F 00 E0 */ addi r3, r31, 0xe0 -/* 80353224 38 A0 00 00 */ li r5, 0 -/* 80353228 4B FE 79 31 */ bl OSSetAlarm -/* 8035322C 48 00 00 DC */ b lbl_80353308 -lbl_80353230: -/* 80353230 A0 1F 00 0A */ lhz r0, 0xa(r31) -/* 80353234 28 00 00 80 */ cmplwi r0, 0x80 -/* 80353238 40 81 00 6C */ ble lbl_803532A4 -/* 8035323C 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 80353240 A0 9F 00 10 */ lhz r4, 0x10(r31) -/* 80353244 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 80353248 3C 60 80 35 */ lis r3, TimeoutHandler@ha /* 0x803530D0@ha */ -/* 8035324C 7C 89 36 70 */ srawi r9, r4, 6 -/* 80353250 54 07 F0 BE */ srwi r7, r0, 2 -/* 80353254 38 00 00 02 */ li r0, 2 -/* 80353258 38 80 00 00 */ li r4, 0 -/* 8035325C 7D 04 01 D6 */ mullw r8, r4, r0 -/* 80353260 7C C7 00 16 */ mulhwu r6, r7, r0 -/* 80353264 7D 08 32 14 */ add r8, r8, r6 -/* 80353268 7C A7 01 D6 */ mullw r5, r7, r0 -/* 8035326C 7D 29 01 94 */ addze r9, r9 -/* 80353270 7C C7 21 D6 */ mullw r6, r7, r4 -/* 80353274 7D 20 FE 70 */ srawi r0, r9, 0x1f -/* 80353278 7C 80 29 D6 */ mullw r4, r0, r5 -/* 8035327C 7C 09 28 16 */ mulhwu r0, r9, r5 -/* 80353280 38 E3 30 D0 */ addi r7, r3, TimeoutHandler@l /* 0x803530D0@l */ -/* 80353284 7C 68 32 14 */ add r3, r8, r6 -/* 80353288 7C 84 02 14 */ add r4, r4, r0 -/* 8035328C 7C 09 19 D6 */ mullw r0, r9, r3 -/* 80353290 7C C9 29 D6 */ mullw r6, r9, r5 -/* 80353294 38 7F 00 E0 */ addi r3, r31, 0xe0 -/* 80353298 7C A4 02 14 */ add r5, r4, r0 -/* 8035329C 4B FE 78 BD */ bl OSSetAlarm -/* 803532A0 48 00 00 68 */ b lbl_80353308 -lbl_803532A4: -/* 803532A4 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 803532A8 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 803532AC 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 803532B0 3C 60 80 35 */ lis r3, TimeoutHandler@ha /* 0x803530D0@ha */ -/* 803532B4 7C 89 6E 70 */ srawi r9, r4, 0xd -/* 803532B8 54 07 F0 BE */ srwi r7, r0, 2 -/* 803532BC 38 00 00 02 */ li r0, 2 -/* 803532C0 38 80 00 00 */ li r4, 0 -/* 803532C4 7D 04 01 D6 */ mullw r8, r4, r0 -/* 803532C8 7C C7 00 16 */ mulhwu r6, r7, r0 -/* 803532CC 7D 08 32 14 */ add r8, r8, r6 -/* 803532D0 7C A7 01 D6 */ mullw r5, r7, r0 -/* 803532D4 7D 29 01 94 */ addze r9, r9 -/* 803532D8 7C C7 21 D6 */ mullw r6, r7, r4 -/* 803532DC 7D 20 FE 70 */ srawi r0, r9, 0x1f -/* 803532E0 7C 80 29 D6 */ mullw r4, r0, r5 -/* 803532E4 7C 09 28 16 */ mulhwu r0, r9, r5 -/* 803532E8 38 E3 30 D0 */ addi r7, r3, TimeoutHandler@l /* 0x803530D0@l */ -/* 803532EC 7C 68 32 14 */ add r3, r8, r6 -/* 803532F0 7C 84 02 14 */ add r4, r4, r0 -/* 803532F4 7C 09 19 D6 */ mullw r0, r9, r3 -/* 803532F8 7C C9 29 D6 */ mullw r6, r9, r5 -/* 803532FC 38 7F 00 E0 */ addi r3, r31, 0xe0 -/* 80353300 7C A4 02 14 */ add r5, r4, r0 -/* 80353304 4B FE 78 55 */ bl OSSetAlarm -lbl_80353308: -/* 80353308 80 BF 00 A0 */ lwz r5, 0xa0(r31) -/* 8035330C 38 7E 00 00 */ addi r3, r30, 0 -/* 80353310 38 9F 00 94 */ addi r4, r31, 0x94 -/* 80353314 38 C0 00 01 */ li r6, 1 -/* 80353318 4B FE FC 45 */ bl EXIImmEx -/* 8035331C 2C 03 00 00 */ cmpwi r3, 0 -/* 80353320 40 82 00 1C */ bne lbl_8035333C -/* 80353324 7F C3 F3 78 */ mr r3, r30 -/* 80353328 4B FF 06 6D */ bl EXIDeselect -/* 8035332C 7F C3 F3 78 */ mr r3, r30 -/* 80353330 4B FF 0D ED */ bl EXIUnlock -/* 80353334 38 60 FF FD */ li r3, -3 -/* 80353338 48 00 00 C4 */ b lbl_803533FC -lbl_8035333C: -/* 8035333C 88 1F 00 94 */ lbz r0, 0x94(r31) -/* 80353340 28 00 00 52 */ cmplwi r0, 0x52 -/* 80353344 40 82 00 3C */ bne lbl_80353380 -/* 80353348 80 9F 00 80 */ lwz r4, 0x80(r31) -/* 8035334C 7F C3 F3 78 */ mr r3, r30 -/* 80353350 80 BF 00 14 */ lwz r5, 0x14(r31) -/* 80353354 38 C0 00 01 */ li r6, 1 -/* 80353358 38 84 02 00 */ addi r4, r4, 0x200 -/* 8035335C 4B FE FC 01 */ bl EXIImmEx -/* 80353360 2C 03 00 00 */ cmpwi r3, 0 -/* 80353364 40 82 00 1C */ bne lbl_80353380 -/* 80353368 7F C3 F3 78 */ mr r3, r30 -/* 8035336C 4B FF 06 29 */ bl EXIDeselect -/* 80353370 7F C3 F3 78 */ mr r3, r30 -/* 80353374 4B FF 0D A9 */ bl EXIUnlock -/* 80353378 38 60 FF FD */ li r3, -3 -/* 8035337C 48 00 00 80 */ b lbl_803533FC -lbl_80353380: -/* 80353380 80 7F 00 A4 */ lwz r3, 0xa4(r31) -/* 80353384 3C 03 00 01 */ addis r0, r3, 1 -/* 80353388 28 00 FF FF */ cmplwi r0, 0xffff -/* 8035338C 40 82 00 1C */ bne lbl_803533A8 -/* 80353390 7F C3 F3 78 */ mr r3, r30 -/* 80353394 4B FF 06 01 */ bl EXIDeselect -/* 80353398 7F C3 F3 78 */ mr r3, r30 -/* 8035339C 4B FF 0D 81 */ bl EXIUnlock -/* 803533A0 38 60 00 00 */ li r3, 0 -/* 803533A4 48 00 00 58 */ b lbl_803533FC -lbl_803533A8: -/* 803533A8 88 1F 00 94 */ lbz r0, 0x94(r31) -/* 803533AC 28 00 00 52 */ cmplwi r0, 0x52 -/* 803533B0 40 82 00 0C */ bne lbl_803533BC -/* 803533B4 38 A0 02 00 */ li r5, 0x200 -/* 803533B8 48 00 00 08 */ b lbl_803533C0 -lbl_803533BC: -/* 803533BC A0 BF 00 0A */ lhz r5, 0xa(r31) -lbl_803533C0: -/* 803533C0 3C 60 80 35 */ lis r3, __CARDTxHandler@ha /* 0x80352C58@ha */ -/* 803533C4 80 9F 00 B4 */ lwz r4, 0xb4(r31) -/* 803533C8 38 E3 2C 58 */ addi r7, r3, __CARDTxHandler@l /* 0x80352C58@l */ -/* 803533CC 80 DF 00 A4 */ lwz r6, 0xa4(r31) -/* 803533D0 7F C3 F3 78 */ mr r3, r30 -/* 803533D4 4B FE FC 29 */ bl EXIDma -/* 803533D8 2C 03 00 00 */ cmpwi r3, 0 -/* 803533DC 40 82 00 1C */ bne lbl_803533F8 -/* 803533E0 7F C3 F3 78 */ mr r3, r30 -/* 803533E4 4B FF 05 B1 */ bl EXIDeselect -/* 803533E8 7F C3 F3 78 */ mr r3, r30 -/* 803533EC 4B FF 0D 31 */ bl EXIUnlock -/* 803533F0 38 60 FF FD */ li r3, -3 -/* 803533F4 48 00 00 08 */ b lbl_803533FC -lbl_803533F8: -/* 803533F8 38 60 00 00 */ li r3, 0 -lbl_803533FC: -/* 803533FC 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80353400 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80353404 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 80353408 38 21 00 18 */ addi r1, r1, 0x18 -/* 8035340C 7C 08 03 A6 */ mtlr r0 -/* 80353410 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDBios/__CARDPutControlBlock.s b/asm/dolphin/card/CARDBios/__CARDPutControlBlock.s deleted file mode 100644 index af6ccaf7e0..0000000000 --- a/asm/dolphin/card/CARDBios/__CARDPutControlBlock.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80353C6C: -/* 80353C6C 7C 08 02 A6 */ mflr r0 -/* 80353C70 90 01 00 04 */ stw r0, 4(r1) -/* 80353C74 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80353C78 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80353C7C 3B E4 00 00 */ addi r31, r4, 0 -/* 80353C80 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80353C84 3B C3 00 00 */ addi r30, r3, 0 -/* 80353C88 4B FE 9A 6D */ bl OSDisableInterrupts -/* 80353C8C 80 1E 00 00 */ lwz r0, 0(r30) -/* 80353C90 2C 00 00 00 */ cmpwi r0, 0 -/* 80353C94 41 82 00 0C */ beq lbl_80353CA0 -/* 80353C98 93 FE 00 04 */ stw r31, 4(r30) -/* 80353C9C 48 00 00 14 */ b lbl_80353CB0 -lbl_80353CA0: -/* 80353CA0 80 1E 00 04 */ lwz r0, 4(r30) -/* 80353CA4 2C 00 FF FF */ cmpwi r0, -1 -/* 80353CA8 40 82 00 08 */ bne lbl_80353CB0 -/* 80353CAC 93 FE 00 04 */ stw r31, 4(r30) -lbl_80353CB0: -/* 80353CB0 4B FE 9A 6D */ bl OSRestoreInterrupts -/* 80353CB4 7F E3 FB 78 */ mr r3, r31 -/* 80353CB8 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80353CBC 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80353CC0 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 80353CC4 38 21 00 18 */ addi r1, r1, 0x18 -/* 80353CC8 7C 08 03 A6 */ mtlr r0 -/* 80353CCC 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDBios/__CARDReadVendorID.s b/asm/dolphin/card/CARDBios/__CARDReadVendorID.s deleted file mode 100644 index 4405d449ba..0000000000 --- a/asm/dolphin/card/CARDBios/__CARDReadVendorID.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80352F34: -/* 80352F34 7C 08 02 A6 */ mflr r0 -/* 80352F38 38 A0 00 04 */ li r5, 4 -/* 80352F3C 90 01 00 04 */ stw r0, 4(r1) -/* 80352F40 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 80352F44 93 E1 00 24 */ stw r31, 0x24(r1) -/* 80352F48 93 C1 00 20 */ stw r30, 0x20(r1) -/* 80352F4C 3B C4 00 00 */ addi r30, r4, 0 -/* 80352F50 38 80 00 00 */ li r4, 0 -/* 80352F54 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 80352F58 3B A3 00 00 */ addi r29, r3, 0 -/* 80352F5C 4B FF 09 0D */ bl EXISelect -/* 80352F60 2C 03 00 00 */ cmpwi r3, 0 -/* 80352F64 40 82 00 0C */ bne lbl_80352F70 -/* 80352F68 38 60 FF FD */ li r3, -3 -/* 80352F6C 48 00 00 9C */ b lbl_80353008 -lbl_80352F70: -/* 80352F70 3C 00 85 00 */ lis r0, 0x8500 -/* 80352F74 90 01 00 10 */ stw r0, 0x10(r1) -/* 80352F78 38 7D 00 00 */ addi r3, r29, 0 -/* 80352F7C 38 81 00 10 */ addi r4, r1, 0x10 -/* 80352F80 38 A0 00 02 */ li r5, 2 -/* 80352F84 38 C0 00 01 */ li r6, 1 -/* 80352F88 38 E0 00 00 */ li r7, 0 -/* 80352F8C 4B FE FD 75 */ bl EXIImm -/* 80352F90 7C 60 00 34 */ cntlzw r0, r3 -/* 80352F94 38 7D 00 00 */ addi r3, r29, 0 -/* 80352F98 54 1F D9 7E */ srwi r31, r0, 5 -/* 80352F9C 4B FF 01 4D */ bl EXISync -/* 80352FA0 7C 60 00 34 */ cntlzw r0, r3 -/* 80352FA4 54 00 D9 7E */ srwi r0, r0, 5 -/* 80352FA8 38 7D 00 00 */ addi r3, r29, 0 -/* 80352FAC 38 9E 00 00 */ addi r4, r30, 0 -/* 80352FB0 7F FF 03 78 */ or r31, r31, r0 -/* 80352FB4 38 A0 00 02 */ li r5, 2 -/* 80352FB8 38 C0 00 00 */ li r6, 0 -/* 80352FBC 38 E0 00 00 */ li r7, 0 -/* 80352FC0 4B FE FD 41 */ bl EXIImm -/* 80352FC4 7C 60 00 34 */ cntlzw r0, r3 -/* 80352FC8 54 00 D9 7E */ srwi r0, r0, 5 -/* 80352FCC 38 7D 00 00 */ addi r3, r29, 0 -/* 80352FD0 7F FF 03 78 */ or r31, r31, r0 -/* 80352FD4 4B FF 01 15 */ bl EXISync -/* 80352FD8 7C 60 00 34 */ cntlzw r0, r3 -/* 80352FDC 54 00 D9 7E */ srwi r0, r0, 5 -/* 80352FE0 38 7D 00 00 */ addi r3, r29, 0 -/* 80352FE4 7F FF 03 78 */ or r31, r31, r0 -/* 80352FE8 4B FF 09 AD */ bl EXIDeselect -/* 80352FEC 7C 60 00 34 */ cntlzw r0, r3 -/* 80352FF0 54 00 D9 7E */ srwi r0, r0, 5 -/* 80352FF4 7F FF 03 79 */ or. r31, r31, r0 -/* 80352FF8 41 82 00 0C */ beq lbl_80353004 -/* 80352FFC 38 60 FF FD */ li r3, -3 -/* 80353000 48 00 00 08 */ b lbl_80353008 -lbl_80353004: -/* 80353004 38 60 00 00 */ li r3, 0 -lbl_80353008: -/* 80353008 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8035300C 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 80353010 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 80353014 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 80353018 38 21 00 28 */ addi r1, r1, 0x28 -/* 8035301C 7C 08 03 A6 */ mtlr r0 -/* 80353020 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDBios/__CARDStart.s b/asm/dolphin/card/CARDBios/__CARDStart.s deleted file mode 100644 index ab557843f7..0000000000 --- a/asm/dolphin/card/CARDBios/__CARDStart.s +++ /dev/null @@ -1,149 +0,0 @@ -lbl_80353524: -/* 80353524 7C 08 02 A6 */ mflr r0 -/* 80353528 90 01 00 04 */ stw r0, 4(r1) -/* 8035352C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80353530 BF 61 00 1C */ stmw r27, 0x1c(r1) -/* 80353534 3B 63 00 00 */ addi r27, r3, 0 -/* 80353538 3B 84 00 00 */ addi r28, r4, 0 -/* 8035353C 3B A5 00 00 */ addi r29, r5, 0 -/* 80353540 4B FE A1 B5 */ bl OSDisableInterrupts -/* 80353544 1C BB 01 10 */ mulli r5, r27, 0x110 -/* 80353548 3C 80 80 45 */ lis r4, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 8035354C 38 04 CB C0 */ addi r0, r4, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80353550 7F E0 2A 14 */ add r31, r0, r5 -/* 80353554 80 1F 00 00 */ lwz r0, 0(r31) -/* 80353558 3B C3 00 00 */ addi r30, r3, 0 -/* 8035355C 2C 00 00 00 */ cmpwi r0, 0 -/* 80353560 40 82 00 0C */ bne lbl_8035356C -/* 80353564 3B A0 FF FD */ li r29, -3 -/* 80353568 48 00 01 C0 */ b lbl_80353728 -lbl_8035356C: -/* 8035356C 28 1C 00 00 */ cmplwi r28, 0 -/* 80353570 41 82 00 08 */ beq lbl_80353578 -/* 80353574 93 9F 00 C8 */ stw r28, 0xc8(r31) -lbl_80353578: -/* 80353578 28 1D 00 00 */ cmplwi r29, 0 -/* 8035357C 41 82 00 08 */ beq lbl_80353584 -/* 80353580 93 BF 00 CC */ stw r29, 0xcc(r31) -lbl_80353584: -/* 80353584 3C 60 80 35 */ lis r3, UnlockedCallback@ha /* 0x80353414@ha */ -/* 80353588 38 03 34 14 */ addi r0, r3, UnlockedCallback@l /* 0x80353414@l */ -/* 8035358C 3C 60 80 35 */ lis r3, __CARDUnlockedHandler@ha /* 0x80352D00@ha */ -/* 80353590 90 1F 00 DC */ stw r0, 0xdc(r31) -/* 80353594 38 A3 2D 00 */ addi r5, r3, __CARDUnlockedHandler@l /* 0x80352D00@l */ -/* 80353598 38 7B 00 00 */ addi r3, r27, 0 -/* 8035359C 38 80 00 00 */ li r4, 0 -/* 803535A0 4B FF 0A 89 */ bl EXILock -/* 803535A4 2C 03 00 00 */ cmpwi r3, 0 -/* 803535A8 40 82 00 0C */ bne lbl_803535B4 -/* 803535AC 3B A0 FF FF */ li r29, -1 -/* 803535B0 48 00 01 78 */ b lbl_80353728 -lbl_803535B4: -/* 803535B4 3B A0 00 00 */ li r29, 0 -/* 803535B8 93 BF 00 DC */ stw r29, 0xdc(r31) -/* 803535BC 38 7B 00 00 */ addi r3, r27, 0 -/* 803535C0 38 80 00 00 */ li r4, 0 -/* 803535C4 38 A0 00 04 */ li r5, 4 -/* 803535C8 4B FF 02 A1 */ bl EXISelect -/* 803535CC 2C 03 00 00 */ cmpwi r3, 0 -/* 803535D0 40 82 00 14 */ bne lbl_803535E4 -/* 803535D4 7F 63 DB 78 */ mr r3, r27 -/* 803535D8 4B FF 0B 45 */ bl EXIUnlock -/* 803535DC 3B A0 FF FD */ li r29, -3 -/* 803535E0 48 00 01 48 */ b lbl_80353728 -lbl_803535E4: -/* 803535E4 38 7F 00 E0 */ addi r3, r31, 0xe0 -/* 803535E8 4B FE 76 55 */ bl OSCancelAlarm -/* 803535EC 88 1F 00 94 */ lbz r0, 0x94(r31) -/* 803535F0 2C 00 00 F3 */ cmpwi r0, 0xf3 -/* 803535F4 41 82 01 30 */ beq lbl_80353724 -/* 803535F8 40 80 00 14 */ bge lbl_8035360C -/* 803535FC 2C 00 00 F1 */ cmpwi r0, 0xf1 -/* 80353600 41 82 00 C0 */ beq lbl_803536C0 -/* 80353604 40 80 00 14 */ bge lbl_80353618 -/* 80353608 48 00 01 1C */ b lbl_80353724 -lbl_8035360C: -/* 8035360C 2C 00 00 F5 */ cmpwi r0, 0xf5 -/* 80353610 40 80 01 14 */ bge lbl_80353724 -/* 80353614 48 00 00 3C */ b lbl_80353650 -lbl_80353618: -/* 80353618 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 8035361C 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 80353620 3C 80 10 62 */ lis r4, 0x1062 /* 0x10624DD3@ha */ -/* 80353624 3C 60 80 35 */ lis r3, TimeoutHandler@ha /* 0x803530D0@ha */ -/* 80353628 54 00 F0 BE */ srwi r0, r0, 2 -/* 8035362C 38 84 4D D3 */ addi r4, r4, 0x4DD3 /* 0x10624DD3@l */ -/* 80353630 7C 04 00 16 */ mulhwu r0, r4, r0 -/* 80353634 54 00 D1 BE */ srwi r0, r0, 6 -/* 80353638 1C C0 00 64 */ mulli r6, r0, 0x64 -/* 8035363C 38 E3 30 D0 */ addi r7, r3, TimeoutHandler@l /* 0x803530D0@l */ -/* 80353640 38 7F 00 E0 */ addi r3, r31, 0xe0 -/* 80353644 38 A0 00 00 */ li r5, 0 -/* 80353648 4B FE 75 11 */ bl OSSetAlarm -/* 8035364C 48 00 00 D8 */ b lbl_80353724 -lbl_80353650: -/* 80353650 A0 1F 00 0A */ lhz r0, 0xa(r31) -/* 80353654 28 00 00 80 */ cmplwi r0, 0x80 -/* 80353658 40 81 00 68 */ ble lbl_803536C0 -/* 8035365C 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 80353660 A0 9F 00 10 */ lhz r4, 0x10(r31) -/* 80353664 80 63 00 F8 */ lwz r3, 0x00F8(r3) /* 0x800000F8@l */ -/* 80353668 38 00 00 02 */ li r0, 2 -/* 8035366C 7C 89 36 70 */ srawi r9, r4, 6 -/* 80353670 54 63 F0 BE */ srwi r3, r3, 2 -/* 80353674 7D 1D 01 D6 */ mullw r8, r29, r0 -/* 80353678 7C C3 00 16 */ mulhwu r6, r3, r0 -/* 8035367C 7D 08 32 14 */ add r8, r8, r6 -/* 80353680 7C A3 01 D6 */ mullw r5, r3, r0 -/* 80353684 7D 29 01 94 */ addze r9, r9 -/* 80353688 7D 20 FE 70 */ srawi r0, r9, 0x1f -/* 8035368C 7C C3 E9 D6 */ mullw r6, r3, r29 -/* 80353690 7C 80 29 D6 */ mullw r4, r0, r5 -/* 80353694 7C 09 28 16 */ mulhwu r0, r9, r5 -/* 80353698 3C 60 80 35 */ lis r3, TimeoutHandler@ha /* 0x803530D0@ha */ -/* 8035369C 38 E3 30 D0 */ addi r7, r3, TimeoutHandler@l /* 0x803530D0@l */ -/* 803536A0 7C 68 32 14 */ add r3, r8, r6 -/* 803536A4 7C 84 02 14 */ add r4, r4, r0 -/* 803536A8 7C 09 19 D6 */ mullw r0, r9, r3 -/* 803536AC 7C C9 29 D6 */ mullw r6, r9, r5 -/* 803536B0 38 7F 00 E0 */ addi r3, r31, 0xe0 -/* 803536B4 7C A4 02 14 */ add r5, r4, r0 -/* 803536B8 4B FE 74 A1 */ bl OSSetAlarm -/* 803536BC 48 00 00 68 */ b lbl_80353724 -lbl_803536C0: -/* 803536C0 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 803536C4 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 803536C8 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 803536CC 3C 60 80 35 */ lis r3, TimeoutHandler@ha /* 0x803530D0@ha */ -/* 803536D0 7C 89 6E 70 */ srawi r9, r4, 0xd -/* 803536D4 54 07 F0 BE */ srwi r7, r0, 2 -/* 803536D8 38 00 00 02 */ li r0, 2 -/* 803536DC 38 80 00 00 */ li r4, 0 -/* 803536E0 7D 04 01 D6 */ mullw r8, r4, r0 -/* 803536E4 7C C7 00 16 */ mulhwu r6, r7, r0 -/* 803536E8 7D 08 32 14 */ add r8, r8, r6 -/* 803536EC 7C A7 01 D6 */ mullw r5, r7, r0 -/* 803536F0 7D 29 01 94 */ addze r9, r9 -/* 803536F4 7C C7 21 D6 */ mullw r6, r7, r4 -/* 803536F8 7D 20 FE 70 */ srawi r0, r9, 0x1f -/* 803536FC 7C 80 29 D6 */ mullw r4, r0, r5 -/* 80353700 7C 09 28 16 */ mulhwu r0, r9, r5 -/* 80353704 38 E3 30 D0 */ addi r7, r3, TimeoutHandler@l /* 0x803530D0@l */ -/* 80353708 7C 68 32 14 */ add r3, r8, r6 -/* 8035370C 7C 84 02 14 */ add r4, r4, r0 -/* 80353710 7C 09 19 D6 */ mullw r0, r9, r3 -/* 80353714 7C C9 29 D6 */ mullw r6, r9, r5 -/* 80353718 38 7F 00 E0 */ addi r3, r31, 0xe0 -/* 8035371C 7C A4 02 14 */ add r5, r4, r0 -/* 80353720 4B FE 74 39 */ bl OSSetAlarm -lbl_80353724: -/* 80353724 3B A0 00 00 */ li r29, 0 -lbl_80353728: -/* 80353728 7F C3 F3 78 */ mr r3, r30 -/* 8035372C 4B FE 9F F1 */ bl OSRestoreInterrupts -/* 80353730 7F A3 EB 78 */ mr r3, r29 -/* 80353734 BB 61 00 1C */ lmw r27, 0x1c(r1) -/* 80353738 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8035373C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80353740 7C 08 03 A6 */ mtlr r0 -/* 80353744 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDBios/__CARDWritePage.s b/asm/dolphin/card/CARDBios/__CARDWritePage.s deleted file mode 100644 index 8eee8dec70..0000000000 --- a/asm/dolphin/card/CARDBios/__CARDWritePage.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_8035387C: -/* 8035387C 7C 08 02 A6 */ mflr r0 -/* 80353880 90 01 00 04 */ stw r0, 4(r1) -/* 80353884 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80353888 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8035388C 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80353890 3B C3 00 00 */ addi r30, r3, 0 -/* 80353894 1C BE 01 10 */ mulli r5, r30, 0x110 -/* 80353898 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 8035389C 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 803538A0 7F E0 2A 14 */ add r31, r0, r5 -/* 803538A4 38 00 00 F2 */ li r0, 0xf2 -/* 803538A8 98 1F 00 94 */ stb r0, 0x94(r31) -/* 803538AC A0 1F 00 0A */ lhz r0, 0xa(r31) -/* 803538B0 28 00 00 80 */ cmplwi r0, 0x80 -/* 803538B4 40 81 00 18 */ ble lbl_803538CC -/* 803538B8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 803538BC 54 00 7E 7E */ rlwinm r0, r0, 0xf, 0x19, 0x1f -/* 803538C0 60 00 00 80 */ ori r0, r0, 0x80 -/* 803538C4 98 1F 00 95 */ stb r0, 0x95(r31) -/* 803538C8 48 00 00 10 */ b lbl_803538D8 -lbl_803538CC: -/* 803538CC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 803538D0 54 00 7E 7E */ rlwinm r0, r0, 0xf, 0x19, 0x1f -/* 803538D4 98 1F 00 95 */ stb r0, 0x95(r31) -lbl_803538D8: -/* 803538D8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 803538DC 38 E0 00 05 */ li r7, 5 -/* 803538E0 38 C0 00 01 */ li r6, 1 -/* 803538E4 54 00 BE 3E */ rlwinm r0, r0, 0x17, 0x18, 0x1f -/* 803538E8 98 1F 00 96 */ stb r0, 0x96(r31) -/* 803538EC 38 00 00 03 */ li r0, 3 -/* 803538F0 38 7E 00 00 */ addi r3, r30, 0 -/* 803538F4 81 1F 00 B0 */ lwz r8, 0xb0(r31) -/* 803538F8 38 A4 00 00 */ addi r5, r4, 0 -/* 803538FC 38 80 00 00 */ li r4, 0 -/* 80353900 55 08 CF BE */ rlwinm r8, r8, 0x19, 0x1e, 0x1f -/* 80353904 99 1F 00 97 */ stb r8, 0x97(r31) -/* 80353908 81 1F 00 B0 */ lwz r8, 0xb0(r31) -/* 8035390C 55 08 06 7E */ clrlwi r8, r8, 0x19 -/* 80353910 99 1F 00 98 */ stb r8, 0x98(r31) -/* 80353914 90 FF 00 A0 */ stw r7, 0xa0(r31) -/* 80353918 90 DF 00 A4 */ stw r6, 0xa4(r31) -/* 8035391C 90 1F 00 A8 */ stw r0, 0xa8(r31) -/* 80353920 4B FF FC 05 */ bl __CARDStart -/* 80353924 2C 03 FF FF */ cmpwi r3, -1 -/* 80353928 40 82 00 0C */ bne lbl_80353934 -/* 8035392C 38 60 00 00 */ li r3, 0 -/* 80353930 48 00 00 70 */ b lbl_803539A0 -lbl_80353934: -/* 80353934 2C 03 00 00 */ cmpwi r3, 0 -/* 80353938 41 80 00 68 */ blt lbl_803539A0 -/* 8035393C 80 BF 00 A0 */ lwz r5, 0xa0(r31) -/* 80353940 38 7E 00 00 */ addi r3, r30, 0 -/* 80353944 38 9F 00 94 */ addi r4, r31, 0x94 -/* 80353948 38 C0 00 01 */ li r6, 1 -/* 8035394C 4B FE F6 11 */ bl EXIImmEx -/* 80353950 2C 03 00 00 */ cmpwi r3, 0 -/* 80353954 41 82 00 28 */ beq lbl_8035397C -/* 80353958 3C 60 80 35 */ lis r3, __CARDTxHandler@ha /* 0x80352C58@ha */ -/* 8035395C 80 9F 00 B4 */ lwz r4, 0xb4(r31) -/* 80353960 38 E3 2C 58 */ addi r7, r3, __CARDTxHandler@l /* 0x80352C58@l */ -/* 80353964 A0 BF 00 0A */ lhz r5, 0xa(r31) -/* 80353968 80 DF 00 A4 */ lwz r6, 0xa4(r31) -/* 8035396C 7F C3 F3 78 */ mr r3, r30 -/* 80353970 4B FE F6 8D */ bl EXIDma -/* 80353974 2C 03 00 00 */ cmpwi r3, 0 -/* 80353978 40 82 00 24 */ bne lbl_8035399C -lbl_8035397C: -/* 8035397C 38 00 00 00 */ li r0, 0 -/* 80353980 90 1F 00 CC */ stw r0, 0xcc(r31) -/* 80353984 7F C3 F3 78 */ mr r3, r30 -/* 80353988 4B FF 00 0D */ bl EXIDeselect -/* 8035398C 7F C3 F3 78 */ mr r3, r30 -/* 80353990 4B FF 07 8D */ bl EXIUnlock -/* 80353994 38 60 FF FD */ li r3, -3 -/* 80353998 48 00 00 08 */ b lbl_803539A0 -lbl_8035399C: -/* 8035399C 38 60 00 00 */ li r3, 0 -lbl_803539A0: -/* 803539A0 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 803539A4 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 803539A8 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 803539AC 38 21 00 18 */ addi r1, r1, 0x18 -/* 803539B0 7C 08 03 A6 */ mtlr r0 -/* 803539B4 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDBlock/EraseCallback.s b/asm/dolphin/card/CARDBlock/EraseCallback.s deleted file mode 100644 index 52823a17b4..0000000000 --- a/asm/dolphin/card/CARDBlock/EraseCallback.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_803554F0: -/* 803554F0 7C 08 02 A6 */ mflr r0 -/* 803554F4 90 01 00 04 */ stw r0, 4(r1) -/* 803554F8 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 803554FC 93 E1 00 24 */ stw r31, 0x24(r1) -/* 80355500 3B E3 00 00 */ addi r31, r3, 0 -/* 80355504 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80355508 93 C1 00 20 */ stw r30, 0x20(r1) -/* 8035550C 1C BF 01 10 */ mulli r5, r31, 0x110 -/* 80355510 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 80355514 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80355518 7C 9D 23 79 */ or. r29, r4, r4 -/* 8035551C 7F C0 2A 14 */ add r30, r0, r5 -/* 80355520 41 80 00 3C */ blt lbl_8035555C -/* 80355524 80 BE 00 88 */ lwz r5, 0x88(r30) -/* 80355528 3C 60 80 35 */ lis r3, WriteCallback@ha /* 0x8035541C@ha */ -/* 8035552C 80 1E 00 80 */ lwz r0, 0x80(r30) -/* 80355530 38 E3 54 1C */ addi r7, r3, WriteCallback@l /* 0x8035541C@l */ -/* 80355534 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80355538 7C 00 28 50 */ subf r0, r0, r5 -/* 8035553C 54 00 9B 7E */ srwi r0, r0, 0xd -/* 80355540 7C 83 01 D6 */ mullw r4, r3, r0 -/* 80355544 38 C5 00 00 */ addi r6, r5, 0 -/* 80355548 38 7F 00 00 */ addi r3, r31, 0 -/* 8035554C 38 A0 20 00 */ li r5, 0x2000 -/* 80355550 4B FF FE 5D */ bl __CARDWrite -/* 80355554 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80355558 40 80 00 44 */ bge lbl_8035559C -lbl_8035555C: -/* 8035555C 80 1E 00 D0 */ lwz r0, 0xd0(r30) -/* 80355560 28 00 00 00 */ cmplwi r0, 0 -/* 80355564 40 82 00 10 */ bne lbl_80355574 -/* 80355568 38 7E 00 00 */ addi r3, r30, 0 -/* 8035556C 38 9D 00 00 */ addi r4, r29, 0 -/* 80355570 4B FF E6 FD */ bl __CARDPutControlBlock -lbl_80355574: -/* 80355574 80 1E 00 D8 */ lwz r0, 0xd8(r30) -/* 80355578 28 00 00 00 */ cmplwi r0, 0 -/* 8035557C 7C 0C 03 78 */ mr r12, r0 -/* 80355580 41 82 00 1C */ beq lbl_8035559C -/* 80355584 38 00 00 00 */ li r0, 0 -/* 80355588 7D 88 03 A6 */ mtlr r12 -/* 8035558C 90 1E 00 D8 */ stw r0, 0xd8(r30) -/* 80355590 38 7F 00 00 */ addi r3, r31, 0 -/* 80355594 38 9D 00 00 */ addi r4, r29, 0 -/* 80355598 4E 80 00 21 */ blrl -lbl_8035559C: -/* 8035559C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 803555A0 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 803555A4 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 803555A8 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 803555AC 38 21 00 28 */ addi r1, r1, 0x28 -/* 803555B0 7C 08 03 A6 */ mtlr r0 -/* 803555B4 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDBlock/__CARDAllocBlock.s b/asm/dolphin/card/CARDBlock/__CARDAllocBlock.s deleted file mode 100644 index 64482bbaf1..0000000000 --- a/asm/dolphin/card/CARDBlock/__CARDAllocBlock.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_803555B8: -/* 803555B8 7C 08 02 A6 */ mflr r0 -/* 803555BC 1C E3 01 10 */ mulli r7, r3, 0x110 -/* 803555C0 90 01 00 04 */ stw r0, 4(r1) -/* 803555C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803555C8 3C C0 80 45 */ lis r6, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 803555CC 38 06 CB C0 */ addi r0, r6, __CARDBlock@l /* 0x8044CBC0@l */ -/* 803555D0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803555D4 7D 20 3A 14 */ add r9, r0, r7 -/* 803555D8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803555DC 80 09 00 00 */ lwz r0, 0(r9) -/* 803555E0 2C 00 00 00 */ cmpwi r0, 0 -/* 803555E4 40 82 00 0C */ bne lbl_803555F0 -/* 803555E8 38 60 FF FD */ li r3, -3 -/* 803555EC 48 00 00 CC */ b lbl_803556B8 -lbl_803555F0: -/* 803555F0 81 09 00 88 */ lwz r8, 0x88(r9) -/* 803555F4 A0 08 00 06 */ lhz r0, 6(r8) -/* 803555F8 7C 00 20 40 */ cmplw r0, r4 -/* 803555FC 40 80 00 0C */ bge lbl_80355608 -/* 80355600 38 60 FF F7 */ li r3, -9 -/* 80355604 48 00 00 B4 */ b lbl_803556B8 -lbl_80355608: -/* 80355608 7C 04 00 50 */ subf r0, r4, r0 -/* 8035560C B0 08 00 06 */ sth r0, 6(r8) -/* 80355610 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80355614 39 86 FF FF */ addi r12, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80355618 A1 68 00 08 */ lhz r11, 8(r8) -/* 8035561C 38 0C 00 00 */ addi r0, r12, 0 -/* 80355620 3B C0 00 00 */ li r30, 0 -/* 80355624 48 00 00 7C */ b lbl_803556A0 -lbl_80355628: -/* 80355628 A1 49 00 10 */ lhz r10, 0x10(r9) -/* 8035562C 3B DE 00 01 */ addi r30, r30, 1 -/* 80355630 57 C6 04 3E */ clrlwi r6, r30, 0x10 -/* 80355634 38 EA FF FB */ addi r7, r10, -5 -/* 80355638 7C 07 30 00 */ cmpw r7, r6 -/* 8035563C 40 80 00 0C */ bge lbl_80355648 -/* 80355640 38 60 FF FA */ li r3, -6 -/* 80355644 48 00 00 74 */ b lbl_803556B8 -lbl_80355648: -/* 80355648 39 6B 00 01 */ addi r11, r11, 1 -/* 8035564C 55 66 04 3E */ clrlwi r6, r11, 0x10 -/* 80355650 28 06 00 05 */ cmplwi r6, 5 -/* 80355654 41 80 00 0C */ blt lbl_80355660 -/* 80355658 7C 06 50 40 */ cmplw r6, r10 -/* 8035565C 41 80 00 08 */ blt lbl_80355664 -lbl_80355660: -/* 80355660 39 60 00 05 */ li r11, 5 -lbl_80355664: -/* 80355664 55 66 0B FC */ rlwinm r6, r11, 1, 0xf, 0x1e -/* 80355668 7C E8 32 14 */ add r7, r8, r6 -/* 8035566C A0 C7 00 00 */ lhz r6, 0(r7) -/* 80355670 28 06 00 00 */ cmplwi r6, 0 -/* 80355674 40 82 00 2C */ bne lbl_803556A0 -/* 80355678 55 86 04 3E */ clrlwi r6, r12, 0x10 -/* 8035567C 28 06 FF FF */ cmplwi r6, 0xffff -/* 80355680 40 82 00 0C */ bne lbl_8035568C -/* 80355684 7D 6C 5B 78 */ mr r12, r11 -/* 80355688 48 00 00 0C */ b lbl_80355694 -lbl_8035568C: -/* 8035568C 57 E6 0B FC */ rlwinm r6, r31, 1, 0xf, 0x1e -/* 80355690 7D 68 33 2E */ sthx r11, r8, r6 -lbl_80355694: -/* 80355694 B0 07 00 00 */ sth r0, 0(r7) -/* 80355698 3B EB 00 00 */ addi r31, r11, 0 -/* 8035569C 38 84 FF FF */ addi r4, r4, -1 -lbl_803556A0: -/* 803556A0 28 04 00 00 */ cmplwi r4, 0 -/* 803556A4 40 82 FF 84 */ bne lbl_80355628 -/* 803556A8 B1 68 00 08 */ sth r11, 8(r8) -/* 803556AC 7D 04 43 78 */ mr r4, r8 -/* 803556B0 B1 89 00 BE */ sth r12, 0xbe(r9) -/* 803556B4 48 00 00 1D */ bl __CARDUpdateFatBlock -lbl_803556B8: -/* 803556B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803556BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 803556C0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 803556C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 803556C8 7C 08 03 A6 */ mtlr r0 -/* 803556CC 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDBlock/__CARDUpdateFatBlock.s b/asm/dolphin/card/CARDBlock/__CARDUpdateFatBlock.s deleted file mode 100644 index 12d03f0e8a..0000000000 --- a/asm/dolphin/card/CARDBlock/__CARDUpdateFatBlock.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_803556D0: -/* 803556D0 7C 08 02 A6 */ mflr r0 -/* 803556D4 90 01 00 04 */ stw r0, 4(r1) -/* 803556D8 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 803556DC 93 E1 00 24 */ stw r31, 0x24(r1) -/* 803556E0 93 C1 00 20 */ stw r30, 0x20(r1) -/* 803556E4 3B C5 00 00 */ addi r30, r5, 0 -/* 803556E8 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 803556EC 3B A4 00 00 */ addi r29, r4, 0 -/* 803556F0 38 BD 00 00 */ addi r5, r29, 0 -/* 803556F4 93 81 00 18 */ stw r28, 0x18(r1) -/* 803556F8 3B 83 00 00 */ addi r28, r3, 0 -/* 803556FC 38 DD 00 02 */ addi r6, r29, 2 -/* 80355700 A0 64 00 04 */ lhz r3, 4(r4) -/* 80355704 1C 9C 01 10 */ mulli r4, r28, 0x110 -/* 80355708 38 03 00 01 */ addi r0, r3, 1 -/* 8035570C 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80355710 B0 1D 00 04 */ sth r0, 4(r29) -/* 80355714 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80355718 7F E0 22 14 */ add r31, r0, r4 -/* 8035571C 38 7D 00 04 */ addi r3, r29, 4 -/* 80355720 38 80 1F FC */ li r4, 0x1ffc -/* 80355724 48 00 02 BD */ bl __CARDCheckSum -/* 80355728 38 7D 00 00 */ addi r3, r29, 0 -/* 8035572C 38 80 20 00 */ li r4, 0x2000 -/* 80355730 4B FE 5E AD */ bl DCStoreRange -/* 80355734 93 DF 00 D8 */ stw r30, 0xd8(r31) -/* 80355738 3C 60 80 35 */ lis r3, EraseCallback@ha /* 0x803554F0@ha */ -/* 8035573C 38 A3 54 F0 */ addi r5, r3, EraseCallback@l /* 0x803554F0@l */ -/* 80355740 80 1F 00 80 */ lwz r0, 0x80(r31) -/* 80355744 7F 83 E3 78 */ mr r3, r28 -/* 80355748 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 8035574C 7C 00 E8 50 */ subf r0, r0, r29 -/* 80355750 54 00 9B 7E */ srwi r0, r0, 0xd -/* 80355754 7C 84 01 D6 */ mullw r4, r4, r0 -/* 80355758 4B FF E2 61 */ bl __CARDEraseSector -/* 8035575C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80355760 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 80355764 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 80355768 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 8035576C 83 81 00 18 */ lwz r28, 0x18(r1) -/* 80355770 38 21 00 28 */ addi r1, r1, 0x28 -/* 80355774 7C 08 03 A6 */ mtlr r0 -/* 80355778 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDCheck/CARDCheckExAsync.s b/asm/dolphin/card/CARDCheck/CARDCheckExAsync.s deleted file mode 100644 index 5f521af028..0000000000 --- a/asm/dolphin/card/CARDCheck/CARDCheckExAsync.s +++ /dev/null @@ -1,391 +0,0 @@ -lbl_80356364: -/* 80356364 7C 08 02 A6 */ mflr r0 -/* 80356368 90 01 00 04 */ stw r0, 4(r1) -/* 8035636C 94 21 FF A8 */ stwu r1, -0x58(r1) -/* 80356370 BF 21 00 3C */ stmw r25, 0x3c(r1) -/* 80356374 7C 9A 23 79 */ or. r26, r4, r4 -/* 80356378 3B 23 00 00 */ addi r25, r3, 0 -/* 8035637C 3B 65 00 00 */ addi r27, r5, 0 -/* 80356380 3B C0 00 00 */ li r30, 0 -/* 80356384 3B A0 00 00 */ li r29, 0 -/* 80356388 3B 80 00 00 */ li r28, 0 -/* 8035638C 41 82 00 0C */ beq lbl_80356398 -/* 80356390 38 00 00 00 */ li r0, 0 -/* 80356394 90 1A 00 00 */ stw r0, 0(r26) -lbl_80356398: -/* 80356398 38 79 00 00 */ addi r3, r25, 0 -/* 8035639C 38 81 00 30 */ addi r4, r1, 0x30 -/* 803563A0 4B FF D8 15 */ bl __CARDGetControlBlock -/* 803563A4 2C 03 00 00 */ cmpwi r3, 0 -/* 803563A8 40 80 00 08 */ bge lbl_803563B0 -/* 803563AC 48 00 05 34 */ b lbl_803568E0 -lbl_803563B0: -/* 803563B0 80 61 00 30 */ lwz r3, 0x30(r1) -/* 803563B4 4B FF F7 DD */ bl VerifyID -/* 803563B8 7C 64 1B 79 */ or. r4, r3, r3 -/* 803563BC 40 80 00 10 */ bge lbl_803563CC -/* 803563C0 80 61 00 30 */ lwz r3, 0x30(r1) -/* 803563C4 4B FF D8 A9 */ bl __CARDPutControlBlock -/* 803563C8 48 00 05 18 */ b lbl_803568E0 -lbl_803563CC: -/* 803563CC 80 61 00 30 */ lwz r3, 0x30(r1) -/* 803563D0 38 81 00 18 */ addi r4, r1, 0x18 -/* 803563D4 4B FF FA 41 */ bl VerifyDir -/* 803563D8 7C 7F 1B 78 */ mr r31, r3 -/* 803563DC 80 61 00 30 */ lwz r3, 0x30(r1) -/* 803563E0 38 81 00 1C */ addi r4, r1, 0x1c -/* 803563E4 4B FF FC 71 */ bl VerifyFAT -/* 803563E8 7C BF 1A 14 */ add r5, r31, r3 -/* 803563EC 2C 05 00 01 */ cmpwi r5, 1 -/* 803563F0 40 81 00 14 */ ble lbl_80356404 -/* 803563F4 80 61 00 30 */ lwz r3, 0x30(r1) -/* 803563F8 38 80 FF FA */ li r4, -6 -/* 803563FC 4B FF D8 71 */ bl __CARDPutControlBlock -/* 80356400 48 00 04 E0 */ b lbl_803568E0 -lbl_80356404: -/* 80356404 80 C1 00 30 */ lwz r6, 0x30(r1) -/* 80356408 80 86 00 80 */ lwz r4, 0x80(r6) -/* 8035640C 38 64 20 00 */ addi r3, r4, 0x2000 -/* 80356410 38 04 60 00 */ addi r0, r4, 0x6000 -/* 80356414 90 61 00 28 */ stw r3, 0x28(r1) -/* 80356418 3C 64 00 01 */ addis r3, r4, 1 -/* 8035641C 38 84 40 00 */ addi r4, r4, 0x4000 -/* 80356420 90 01 00 20 */ stw r0, 0x20(r1) -/* 80356424 38 03 80 00 */ addi r0, r3, -32768 -/* 80356428 90 81 00 2C */ stw r4, 0x2c(r1) -/* 8035642C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80356430 41 82 00 0C */ beq lbl_8035643C -/* 80356434 40 80 00 8C */ bge lbl_803564C0 -/* 80356438 48 00 00 88 */ b lbl_803564C0 -lbl_8035643C: -/* 8035643C 38 66 00 84 */ addi r3, r6, 0x84 -/* 80356440 80 06 00 84 */ lwz r0, 0x84(r6) -/* 80356444 28 00 00 00 */ cmplwi r0, 0 -/* 80356448 40 82 00 40 */ bne lbl_80356488 -/* 8035644C 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80356450 38 81 00 28 */ addi r4, r1, 0x28 -/* 80356454 38 A0 20 00 */ li r5, 0x2000 -/* 80356458 54 00 10 3A */ slwi r0, r0, 2 -/* 8035645C 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80356460 90 03 00 00 */ stw r0, 0(r3) -/* 80356464 80 61 00 18 */ lwz r3, 0x18(r1) -/* 80356468 68 60 00 01 */ xori r0, r3, 1 -/* 8035646C 54 63 10 3A */ slwi r3, r3, 2 -/* 80356470 54 00 10 3A */ slwi r0, r0, 2 -/* 80356474 7C 64 18 2E */ lwzx r3, r4, r3 -/* 80356478 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8035647C 4B CA D0 C5 */ bl memcpy -/* 80356480 3B A0 00 01 */ li r29, 1 -/* 80356484 48 00 00 3C */ b lbl_803564C0 -lbl_80356488: -/* 80356488 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8035648C 38 81 00 20 */ addi r4, r1, 0x20 -/* 80356490 38 A0 20 00 */ li r5, 0x2000 -/* 80356494 54 00 10 3A */ slwi r0, r0, 2 -/* 80356498 7C 04 00 2E */ lwzx r0, r4, r0 -/* 8035649C 90 06 00 88 */ stw r0, 0x88(r6) -/* 803564A0 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 803564A4 68 60 00 01 */ xori r0, r3, 1 -/* 803564A8 54 63 10 3A */ slwi r3, r3, 2 -/* 803564AC 54 00 10 3A */ slwi r0, r0, 2 -/* 803564B0 7C 64 18 2E */ lwzx r3, r4, r3 -/* 803564B4 7C 84 00 2E */ lwzx r4, r4, r0 -/* 803564B8 4B CA D0 89 */ bl memcpy -/* 803564BC 3B C0 00 01 */ li r30, 1 -lbl_803564C0: -/* 803564C0 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 803564C4 38 61 00 20 */ addi r3, r1, 0x20 -/* 803564C8 38 80 00 00 */ li r4, 0 -/* 803564CC 68 00 00 01 */ xori r0, r0, 1 -/* 803564D0 54 00 10 3A */ slwi r0, r0, 2 -/* 803564D4 7F E3 00 2E */ lwzx r31, r3, r0 -/* 803564D8 38 A0 20 00 */ li r5, 0x2000 -/* 803564DC 38 7F 00 00 */ addi r3, r31, 0 -/* 803564E0 4B CA CF 79 */ bl memset -/* 803564E4 38 00 00 7F */ li r0, 0x7f -/* 803564E8 80 A1 00 30 */ lwz r5, 0x30(r1) -/* 803564EC 7C 09 03 A6 */ mtctr r0 -/* 803564F0 38 C0 00 00 */ li r6, 0 -lbl_803564F4: -/* 803564F4 80 05 00 84 */ lwz r0, 0x84(r5) -/* 803564F8 7C E0 32 14 */ add r7, r0, r6 -/* 803564FC 88 07 00 00 */ lbz r0, 0(r7) -/* 80356500 28 00 00 FF */ cmplwi r0, 0xff -/* 80356504 41 82 00 A8 */ beq lbl_803565AC -/* 80356508 A0 87 00 36 */ lhz r4, 0x36(r7) -/* 8035650C 39 00 00 00 */ li r8, 0 -/* 80356510 48 00 00 54 */ b lbl_80356564 -lbl_80356514: -/* 80356514 54 83 04 3E */ clrlwi r3, r4, 0x10 -/* 80356518 28 03 00 05 */ cmplwi r3, 5 -/* 8035651C 41 80 00 2C */ blt lbl_80356548 -/* 80356520 A0 05 00 10 */ lhz r0, 0x10(r5) -/* 80356524 7C 03 00 40 */ cmplw r3, r0 -/* 80356528 40 80 00 20 */ bge lbl_80356548 -/* 8035652C 54 64 08 3C */ slwi r4, r3, 1 -/* 80356530 7C 7F 22 2E */ lhzx r3, r31, r4 -/* 80356534 38 63 00 01 */ addi r3, r3, 1 -/* 80356538 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8035653C 7C 7F 23 2E */ sthx r3, r31, r4 -/* 80356540 28 00 00 01 */ cmplwi r0, 1 -/* 80356544 40 81 00 14 */ ble lbl_80356558 -lbl_80356548: -/* 80356548 80 61 00 30 */ lwz r3, 0x30(r1) -/* 8035654C 38 80 FF FA */ li r4, -6 -/* 80356550 4B FF D7 1D */ bl __CARDPutControlBlock -/* 80356554 48 00 03 8C */ b lbl_803568E0 -lbl_80356558: -/* 80356558 80 65 00 88 */ lwz r3, 0x88(r5) -/* 8035655C 39 08 00 01 */ addi r8, r8, 1 -/* 80356560 7C 83 22 2E */ lhzx r4, r3, r4 -lbl_80356564: -/* 80356564 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 80356568 28 00 FF FF */ cmplwi r0, 0xffff -/* 8035656C 41 82 00 14 */ beq lbl_80356580 -/* 80356570 A0 07 00 38 */ lhz r0, 0x38(r7) -/* 80356574 55 03 04 3E */ clrlwi r3, r8, 0x10 -/* 80356578 7C 03 00 40 */ cmplw r3, r0 -/* 8035657C 41 80 FF 98 */ blt lbl_80356514 -lbl_80356580: -/* 80356580 A0 07 00 38 */ lhz r0, 0x38(r7) -/* 80356584 55 03 04 3E */ clrlwi r3, r8, 0x10 -/* 80356588 7C 03 00 40 */ cmplw r3, r0 -/* 8035658C 40 82 00 10 */ bne lbl_8035659C -/* 80356590 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 80356594 28 00 FF FF */ cmplwi r0, 0xffff -/* 80356598 41 82 00 14 */ beq lbl_803565AC -lbl_8035659C: -/* 8035659C 80 61 00 30 */ lwz r3, 0x30(r1) -/* 803565A0 38 80 FF FA */ li r4, -6 -/* 803565A4 4B FF D6 C9 */ bl __CARDPutControlBlock -/* 803565A8 48 00 03 38 */ b lbl_803568E0 -lbl_803565AC: -/* 803565AC 38 C6 00 40 */ addi r6, r6, 0x40 -/* 803565B0 42 00 FF 44 */ bdnz lbl_803564F4 -/* 803565B4 80 61 00 30 */ lwz r3, 0x30(r1) -/* 803565B8 38 DF 00 0A */ addi r6, r31, 0xa -/* 803565BC 39 20 00 00 */ li r9, 0 -/* 803565C0 39 00 00 05 */ li r8, 5 -/* 803565C4 38 A0 00 0A */ li r5, 0xa -/* 803565C8 48 00 00 68 */ b lbl_80356630 -lbl_803565CC: -/* 803565CC 80 83 00 88 */ lwz r4, 0x88(r3) -/* 803565D0 A0 06 00 00 */ lhz r0, 0(r6) -/* 803565D4 7C 84 2A 14 */ add r4, r4, r5 -/* 803565D8 28 00 00 00 */ cmplwi r0, 0 -/* 803565DC A0 04 00 00 */ lhz r0, 0(r4) -/* 803565E0 40 82 00 20 */ bne lbl_80356600 -/* 803565E4 28 00 00 00 */ cmplwi r0, 0 -/* 803565E8 41 82 00 10 */ beq lbl_803565F8 -/* 803565EC 38 00 00 00 */ li r0, 0 -/* 803565F0 B0 04 00 00 */ sth r0, 0(r4) -/* 803565F4 3B 80 00 01 */ li r28, 1 -lbl_803565F8: -/* 803565F8 39 29 00 01 */ addi r9, r9, 1 -/* 803565FC 48 00 00 28 */ b lbl_80356624 -lbl_80356600: -/* 80356600 28 00 00 05 */ cmplwi r0, 5 -/* 80356604 41 80 00 0C */ blt lbl_80356610 -/* 80356608 7C 00 38 40 */ cmplw r0, r7 -/* 8035660C 41 80 00 18 */ blt lbl_80356624 -lbl_80356610: -/* 80356610 28 00 FF FF */ cmplwi r0, 0xffff -/* 80356614 41 82 00 10 */ beq lbl_80356624 -/* 80356618 38 80 FF FA */ li r4, -6 -/* 8035661C 4B FF D6 51 */ bl __CARDPutControlBlock -/* 80356620 48 00 02 C0 */ b lbl_803568E0 -lbl_80356624: -/* 80356624 38 A5 00 02 */ addi r5, r5, 2 -/* 80356628 38 C6 00 02 */ addi r6, r6, 2 -/* 8035662C 39 08 00 01 */ addi r8, r8, 1 -lbl_80356630: -/* 80356630 A0 E3 00 10 */ lhz r7, 0x10(r3) -/* 80356634 55 00 04 3E */ clrlwi r0, r8, 0x10 -/* 80356638 7C 00 38 40 */ cmplw r0, r7 -/* 8035663C 41 80 FF 90 */ blt lbl_803565CC -/* 80356640 80 63 00 88 */ lwz r3, 0x88(r3) -/* 80356644 55 24 04 3E */ clrlwi r4, r9, 0x10 -/* 80356648 A4 03 00 06 */ lhzu r0, 6(r3) -/* 8035664C 7C 04 00 40 */ cmplw r4, r0 -/* 80356650 41 82 00 0C */ beq lbl_8035665C -/* 80356654 B1 23 00 00 */ sth r9, 0(r3) -/* 80356658 3B 80 00 01 */ li r28, 1 -lbl_8035665C: -/* 8035665C 2C 1C 00 00 */ cmpwi r28, 0 -/* 80356660 41 82 01 C8 */ beq lbl_80356828 -/* 80356664 80 61 00 30 */ lwz r3, 0x30(r1) -/* 80356668 38 80 1F FC */ li r4, 0x1ffc -/* 8035666C 7C 84 0E 70 */ srawi r4, r4, 1 -/* 80356670 80 C3 00 88 */ lwz r6, 0x88(r3) -/* 80356674 38 00 00 00 */ li r0, 0 -/* 80356678 7C 84 01 95 */ addze. r4, r4 -/* 8035667C B0 06 00 02 */ sth r0, 2(r6) -/* 80356680 38 E6 00 02 */ addi r7, r6, 2 -/* 80356684 38 A6 00 04 */ addi r5, r6, 4 -/* 80356688 B0 06 00 00 */ sth r0, 0(r6) -/* 8035668C 38 64 00 00 */ addi r3, r4, 0 -/* 80356690 40 81 01 70 */ ble lbl_80356800 -/* 80356694 54 60 E8 FF */ rlwinm. r0, r3, 0x1d, 3, 0x1f -/* 80356698 7C 09 03 A6 */ mtctr r0 -/* 8035669C 41 82 01 34 */ beq lbl_803567D0 -lbl_803566A0: -/* 803566A0 A0 86 00 00 */ lhz r4, 0(r6) -/* 803566A4 A0 05 00 00 */ lhz r0, 0(r5) -/* 803566A8 7C 04 02 14 */ add r0, r4, r0 -/* 803566AC B0 06 00 00 */ sth r0, 0(r6) -/* 803566B0 A0 05 00 00 */ lhz r0, 0(r5) -/* 803566B4 A0 87 00 00 */ lhz r4, 0(r7) -/* 803566B8 7C 00 00 F8 */ nor r0, r0, r0 -/* 803566BC 7C 04 02 14 */ add r0, r4, r0 -/* 803566C0 B0 07 00 00 */ sth r0, 0(r7) -/* 803566C4 A0 86 00 00 */ lhz r4, 0(r6) -/* 803566C8 A0 05 00 02 */ lhz r0, 2(r5) -/* 803566CC 7C 04 02 14 */ add r0, r4, r0 -/* 803566D0 B0 06 00 00 */ sth r0, 0(r6) -/* 803566D4 A0 05 00 02 */ lhz r0, 2(r5) -/* 803566D8 A0 87 00 00 */ lhz r4, 0(r7) -/* 803566DC 7C 00 00 F8 */ nor r0, r0, r0 -/* 803566E0 7C 04 02 14 */ add r0, r4, r0 -/* 803566E4 B0 07 00 00 */ sth r0, 0(r7) -/* 803566E8 A0 86 00 00 */ lhz r4, 0(r6) -/* 803566EC A0 05 00 04 */ lhz r0, 4(r5) -/* 803566F0 7C 04 02 14 */ add r0, r4, r0 -/* 803566F4 B0 06 00 00 */ sth r0, 0(r6) -/* 803566F8 A0 05 00 04 */ lhz r0, 4(r5) -/* 803566FC A0 87 00 00 */ lhz r4, 0(r7) -/* 80356700 7C 00 00 F8 */ nor r0, r0, r0 -/* 80356704 7C 04 02 14 */ add r0, r4, r0 -/* 80356708 B0 07 00 00 */ sth r0, 0(r7) -/* 8035670C A0 86 00 00 */ lhz r4, 0(r6) -/* 80356710 A0 05 00 06 */ lhz r0, 6(r5) -/* 80356714 7C 04 02 14 */ add r0, r4, r0 -/* 80356718 B0 06 00 00 */ sth r0, 0(r6) -/* 8035671C A0 05 00 06 */ lhz r0, 6(r5) -/* 80356720 A0 87 00 00 */ lhz r4, 0(r7) -/* 80356724 7C 00 00 F8 */ nor r0, r0, r0 -/* 80356728 7C 04 02 14 */ add r0, r4, r0 -/* 8035672C B0 07 00 00 */ sth r0, 0(r7) -/* 80356730 A0 86 00 00 */ lhz r4, 0(r6) -/* 80356734 A0 05 00 08 */ lhz r0, 8(r5) -/* 80356738 7C 04 02 14 */ add r0, r4, r0 -/* 8035673C B0 06 00 00 */ sth r0, 0(r6) -/* 80356740 A0 05 00 08 */ lhz r0, 8(r5) -/* 80356744 A0 87 00 00 */ lhz r4, 0(r7) -/* 80356748 7C 00 00 F8 */ nor r0, r0, r0 -/* 8035674C 7C 04 02 14 */ add r0, r4, r0 -/* 80356750 B0 07 00 00 */ sth r0, 0(r7) -/* 80356754 A0 86 00 00 */ lhz r4, 0(r6) -/* 80356758 A0 05 00 0A */ lhz r0, 0xa(r5) -/* 8035675C 7C 04 02 14 */ add r0, r4, r0 -/* 80356760 B0 06 00 00 */ sth r0, 0(r6) -/* 80356764 A0 05 00 0A */ lhz r0, 0xa(r5) -/* 80356768 A0 87 00 00 */ lhz r4, 0(r7) -/* 8035676C 7C 00 00 F8 */ nor r0, r0, r0 -/* 80356770 7C 04 02 14 */ add r0, r4, r0 -/* 80356774 B0 07 00 00 */ sth r0, 0(r7) -/* 80356778 A0 86 00 00 */ lhz r4, 0(r6) -/* 8035677C A0 05 00 0C */ lhz r0, 0xc(r5) -/* 80356780 7C 04 02 14 */ add r0, r4, r0 -/* 80356784 B0 06 00 00 */ sth r0, 0(r6) -/* 80356788 A0 05 00 0C */ lhz r0, 0xc(r5) -/* 8035678C A0 87 00 00 */ lhz r4, 0(r7) -/* 80356790 7C 00 00 F8 */ nor r0, r0, r0 -/* 80356794 7C 04 02 14 */ add r0, r4, r0 -/* 80356798 B0 07 00 00 */ sth r0, 0(r7) -/* 8035679C A0 86 00 00 */ lhz r4, 0(r6) -/* 803567A0 A0 05 00 0E */ lhz r0, 0xe(r5) -/* 803567A4 7C 04 02 14 */ add r0, r4, r0 -/* 803567A8 B0 06 00 00 */ sth r0, 0(r6) -/* 803567AC A0 05 00 0E */ lhz r0, 0xe(r5) -/* 803567B0 38 A5 00 10 */ addi r5, r5, 0x10 -/* 803567B4 A0 87 00 00 */ lhz r4, 0(r7) -/* 803567B8 7C 00 00 F8 */ nor r0, r0, r0 -/* 803567BC 7C 04 02 14 */ add r0, r4, r0 -/* 803567C0 B0 07 00 00 */ sth r0, 0(r7) -/* 803567C4 42 00 FE DC */ bdnz lbl_803566A0 -/* 803567C8 70 63 00 07 */ andi. r3, r3, 7 -/* 803567CC 41 82 00 34 */ beq lbl_80356800 -lbl_803567D0: -/* 803567D0 7C 69 03 A6 */ mtctr r3 -lbl_803567D4: -/* 803567D4 A0 86 00 00 */ lhz r4, 0(r6) -/* 803567D8 A0 05 00 00 */ lhz r0, 0(r5) -/* 803567DC 7C 04 02 14 */ add r0, r4, r0 -/* 803567E0 B0 06 00 00 */ sth r0, 0(r6) -/* 803567E4 A0 05 00 00 */ lhz r0, 0(r5) -/* 803567E8 38 A5 00 02 */ addi r5, r5, 2 -/* 803567EC A0 87 00 00 */ lhz r4, 0(r7) -/* 803567F0 7C 00 00 F8 */ nor r0, r0, r0 -/* 803567F4 7C 04 02 14 */ add r0, r4, r0 -/* 803567F8 B0 07 00 00 */ sth r0, 0(r7) -/* 803567FC 42 00 FF D8 */ bdnz lbl_803567D4 -lbl_80356800: -/* 80356800 A0 06 00 00 */ lhz r0, 0(r6) -/* 80356804 28 00 FF FF */ cmplwi r0, 0xffff -/* 80356808 40 82 00 0C */ bne lbl_80356814 -/* 8035680C 38 00 00 00 */ li r0, 0 -/* 80356810 B0 06 00 00 */ sth r0, 0(r6) -lbl_80356814: -/* 80356814 A0 07 00 00 */ lhz r0, 0(r7) -/* 80356818 28 00 FF FF */ cmplwi r0, 0xffff -/* 8035681C 40 82 00 0C */ bne lbl_80356828 -/* 80356820 38 00 00 00 */ li r0, 0 -/* 80356824 B0 07 00 00 */ sth r0, 0(r7) -lbl_80356828: -/* 80356828 80 C1 00 1C */ lwz r6, 0x1c(r1) -/* 8035682C 38 81 00 20 */ addi r4, r1, 0x20 -/* 80356830 38 A0 20 00 */ li r5, 0x2000 -/* 80356834 68 C0 00 01 */ xori r0, r6, 1 -/* 80356838 54 03 10 3A */ slwi r3, r0, 2 -/* 8035683C 54 C0 10 3A */ slwi r0, r6, 2 -/* 80356840 7C 64 18 2E */ lwzx r3, r4, r3 -/* 80356844 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80356848 4B CA CC F9 */ bl memcpy -/* 8035684C 2C 1D 00 00 */ cmpwi r29, 0 -/* 80356850 41 82 00 24 */ beq lbl_80356874 -/* 80356854 28 1A 00 00 */ cmplwi r26, 0 -/* 80356858 41 82 00 0C */ beq lbl_80356864 -/* 8035685C 38 00 20 00 */ li r0, 0x2000 -/* 80356860 90 1A 00 00 */ stw r0, 0(r26) -lbl_80356864: -/* 80356864 38 79 00 00 */ addi r3, r25, 0 -/* 80356868 38 9B 00 00 */ addi r4, r27, 0 -/* 8035686C 4B FF F0 B1 */ bl __CARDUpdateDir -/* 80356870 48 00 00 70 */ b lbl_803568E0 -lbl_80356874: -/* 80356874 7F C0 E3 79 */ or. r0, r30, r28 -/* 80356878 41 82 00 2C */ beq lbl_803568A4 -/* 8035687C 28 1A 00 00 */ cmplwi r26, 0 -/* 80356880 41 82 00 0C */ beq lbl_8035688C -/* 80356884 38 00 20 00 */ li r0, 0x2000 -/* 80356888 90 1A 00 00 */ stw r0, 0(r26) -lbl_8035688C: -/* 8035688C 80 81 00 30 */ lwz r4, 0x30(r1) -/* 80356890 38 79 00 00 */ addi r3, r25, 0 -/* 80356894 38 BB 00 00 */ addi r5, r27, 0 -/* 80356898 80 84 00 88 */ lwz r4, 0x88(r4) -/* 8035689C 4B FF EE 35 */ bl __CARDUpdateFatBlock -/* 803568A0 48 00 00 40 */ b lbl_803568E0 -lbl_803568A4: -/* 803568A4 80 61 00 30 */ lwz r3, 0x30(r1) -/* 803568A8 38 80 00 00 */ li r4, 0 -/* 803568AC 4B FF D3 C1 */ bl __CARDPutControlBlock -/* 803568B0 28 1B 00 00 */ cmplwi r27, 0 -/* 803568B4 41 82 00 28 */ beq lbl_803568DC -/* 803568B8 4B FE 6E 3D */ bl OSDisableInterrupts -/* 803568BC 39 9B 00 00 */ addi r12, r27, 0 -/* 803568C0 7D 88 03 A6 */ mtlr r12 -/* 803568C4 3B 43 00 00 */ addi r26, r3, 0 -/* 803568C8 38 79 00 00 */ addi r3, r25, 0 -/* 803568CC 38 80 00 00 */ li r4, 0 -/* 803568D0 4E 80 00 21 */ blrl -/* 803568D4 7F 43 D3 78 */ mr r3, r26 -/* 803568D8 4B FE 6E 45 */ bl OSRestoreInterrupts -lbl_803568DC: -/* 803568DC 38 60 00 00 */ li r3, 0 -lbl_803568E0: -/* 803568E0 BB 21 00 3C */ lmw r25, 0x3c(r1) -/* 803568E4 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 803568E8 38 21 00 58 */ addi r1, r1, 0x58 -/* 803568EC 7C 08 03 A6 */ mtlr r0 -/* 803568F0 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDCheck/VerifyDir.s b/asm/dolphin/card/CARDCheck/VerifyDir.s deleted file mode 100644 index 844d07eab9..0000000000 --- a/asm/dolphin/card/CARDCheck/VerifyDir.s +++ /dev/null @@ -1,161 +0,0 @@ -lbl_80355E14: -/* 80355E14 7C 08 02 A6 */ mflr r0 -/* 80355E18 90 01 00 04 */ stw r0, 4(r1) -/* 80355E1C 94 21 FF C8 */ stwu r1, -0x38(r1) -/* 80355E20 93 E1 00 34 */ stw r31, 0x34(r1) -/* 80355E24 38 E1 00 1C */ addi r7, r1, 0x1c -/* 80355E28 39 01 00 14 */ addi r8, r1, 0x14 -/* 80355E2C 93 C1 00 30 */ stw r30, 0x30(r1) -/* 80355E30 3B E0 00 00 */ li r31, 0 -/* 80355E34 3B C0 00 00 */ li r30, 0 -/* 80355E38 93 A1 00 2C */ stw r29, 0x2c(r1) -/* 80355E3C 3B A4 00 00 */ addi r29, r4, 0 -/* 80355E40 38 80 00 00 */ li r4, 0 -lbl_80355E44: -/* 80355E44 38 04 00 01 */ addi r0, r4, 1 -/* 80355E48 80 A3 00 80 */ lwz r5, 0x80(r3) -/* 80355E4C 54 00 68 24 */ slwi r0, r0, 0xd -/* 80355E50 7C 05 02 14 */ add r0, r5, r0 -/* 80355E54 90 07 00 00 */ stw r0, 0(r7) -/* 80355E58 38 C0 1F FC */ li r6, 0x1ffc -/* 80355E5C 7C C6 0E 70 */ srawi r6, r6, 1 -/* 80355E60 80 A7 00 00 */ lwz r5, 0(r7) -/* 80355E64 7C C6 01 95 */ addze. r6, r6 -/* 80355E68 39 60 00 00 */ li r11, 0 -/* 80355E6C 38 05 1F C0 */ addi r0, r5, 0x1fc0 -/* 80355E70 90 08 00 00 */ stw r0, 0(r8) -/* 80355E74 39 40 00 00 */ li r10, 0 -/* 80355E78 80 A7 00 00 */ lwz r5, 0(r7) -/* 80355E7C 40 81 00 BC */ ble lbl_80355F38 -/* 80355E80 54 C0 E8 FF */ rlwinm. r0, r6, 0x1d, 3, 0x1f -/* 80355E84 7C 09 03 A6 */ mtctr r0 -/* 80355E88 41 82 00 94 */ beq lbl_80355F1C -lbl_80355E8C: -/* 80355E8C A1 25 00 00 */ lhz r9, 0(r5) -/* 80355E90 7D 20 48 F8 */ nor r0, r9, r9 -/* 80355E94 7D 4A 4A 14 */ add r10, r10, r9 -/* 80355E98 A1 25 00 02 */ lhz r9, 2(r5) -/* 80355E9C 7D 6B 02 14 */ add r11, r11, r0 -/* 80355EA0 7D 20 48 F8 */ nor r0, r9, r9 -/* 80355EA4 7D 4A 4A 14 */ add r10, r10, r9 -/* 80355EA8 A1 25 00 04 */ lhz r9, 4(r5) -/* 80355EAC 7D 6B 02 14 */ add r11, r11, r0 -/* 80355EB0 7D 20 48 F8 */ nor r0, r9, r9 -/* 80355EB4 7D 4A 4A 14 */ add r10, r10, r9 -/* 80355EB8 A1 25 00 06 */ lhz r9, 6(r5) -/* 80355EBC 7D 6B 02 14 */ add r11, r11, r0 -/* 80355EC0 7D 20 48 F8 */ nor r0, r9, r9 -/* 80355EC4 7D 4A 4A 14 */ add r10, r10, r9 -/* 80355EC8 A1 25 00 08 */ lhz r9, 8(r5) -/* 80355ECC 7D 6B 02 14 */ add r11, r11, r0 -/* 80355ED0 7D 20 48 F8 */ nor r0, r9, r9 -/* 80355ED4 7D 4A 4A 14 */ add r10, r10, r9 -/* 80355ED8 A1 25 00 0A */ lhz r9, 0xa(r5) -/* 80355EDC 7D 6B 02 14 */ add r11, r11, r0 -/* 80355EE0 7D 20 48 F8 */ nor r0, r9, r9 -/* 80355EE4 7D 4A 4A 14 */ add r10, r10, r9 -/* 80355EE8 A1 25 00 0C */ lhz r9, 0xc(r5) -/* 80355EEC 7D 6B 02 14 */ add r11, r11, r0 -/* 80355EF0 7D 20 48 F8 */ nor r0, r9, r9 -/* 80355EF4 7D 4A 4A 14 */ add r10, r10, r9 -/* 80355EF8 A1 25 00 0E */ lhz r9, 0xe(r5) -/* 80355EFC 7D 6B 02 14 */ add r11, r11, r0 -/* 80355F00 7D 20 48 F8 */ nor r0, r9, r9 -/* 80355F04 7D 4A 4A 14 */ add r10, r10, r9 -/* 80355F08 7D 6B 02 14 */ add r11, r11, r0 -/* 80355F0C 38 A5 00 10 */ addi r5, r5, 0x10 -/* 80355F10 42 00 FF 7C */ bdnz lbl_80355E8C -/* 80355F14 70 C6 00 07 */ andi. r6, r6, 7 -/* 80355F18 41 82 00 20 */ beq lbl_80355F38 -lbl_80355F1C: -/* 80355F1C 7C C9 03 A6 */ mtctr r6 -lbl_80355F20: -/* 80355F20 A1 25 00 00 */ lhz r9, 0(r5) -/* 80355F24 38 A5 00 02 */ addi r5, r5, 2 -/* 80355F28 7D 20 48 F8 */ nor r0, r9, r9 -/* 80355F2C 7D 4A 4A 14 */ add r10, r10, r9 -/* 80355F30 7D 6B 02 14 */ add r11, r11, r0 -/* 80355F34 42 00 FF EC */ bdnz lbl_80355F20 -lbl_80355F38: -/* 80355F38 55 40 04 3E */ clrlwi r0, r10, 0x10 -/* 80355F3C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80355F40 40 82 00 08 */ bne lbl_80355F48 -/* 80355F44 39 40 00 00 */ li r10, 0 -lbl_80355F48: -/* 80355F48 55 60 04 3E */ clrlwi r0, r11, 0x10 -/* 80355F4C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80355F50 40 82 00 08 */ bne lbl_80355F58 -/* 80355F54 39 60 00 00 */ li r11, 0 -lbl_80355F58: -/* 80355F58 80 C8 00 00 */ lwz r6, 0(r8) -/* 80355F5C 55 45 04 3E */ clrlwi r5, r10, 0x10 -/* 80355F60 A0 06 00 3C */ lhz r0, 0x3c(r6) -/* 80355F64 7C 05 00 40 */ cmplw r5, r0 -/* 80355F68 40 82 00 14 */ bne lbl_80355F7C -/* 80355F6C A0 06 00 3E */ lhz r0, 0x3e(r6) -/* 80355F70 55 65 04 3E */ clrlwi r5, r11, 0x10 -/* 80355F74 7C 05 00 40 */ cmplw r5, r0 -/* 80355F78 41 82 00 14 */ beq lbl_80355F8C -lbl_80355F7C: -/* 80355F7C 38 00 00 00 */ li r0, 0 -/* 80355F80 90 03 00 84 */ stw r0, 0x84(r3) -/* 80355F84 3B C4 00 00 */ addi r30, r4, 0 -/* 80355F88 3B FF 00 01 */ addi r31, r31, 1 -lbl_80355F8C: -/* 80355F8C 38 84 00 01 */ addi r4, r4, 1 -/* 80355F90 2C 04 00 02 */ cmpwi r4, 2 -/* 80355F94 38 E7 00 04 */ addi r7, r7, 4 -/* 80355F98 39 08 00 04 */ addi r8, r8, 4 -/* 80355F9C 41 80 FE A8 */ blt lbl_80355E44 -/* 80355FA0 2C 1F 00 00 */ cmpwi r31, 0 -/* 80355FA4 40 82 00 84 */ bne lbl_80356028 -/* 80355FA8 80 83 00 84 */ lwz r4, 0x84(r3) -/* 80355FAC 28 04 00 00 */ cmplwi r4, 0 -/* 80355FB0 40 82 00 5C */ bne lbl_8035600C -/* 80355FB4 80 A1 00 18 */ lwz r5, 0x18(r1) -/* 80355FB8 80 81 00 14 */ lwz r4, 0x14(r1) -/* 80355FBC A8 A5 00 3A */ lha r5, 0x3a(r5) -/* 80355FC0 A8 04 00 3A */ lha r0, 0x3a(r4) -/* 80355FC4 7C 05 00 51 */ subf. r0, r5, r0 -/* 80355FC8 40 80 00 0C */ bge lbl_80355FD4 -/* 80355FCC 3B C0 00 00 */ li r30, 0 -/* 80355FD0 48 00 00 08 */ b lbl_80355FD8 -lbl_80355FD4: -/* 80355FD4 3B C0 00 01 */ li r30, 1 -lbl_80355FD8: -/* 80355FD8 57 C0 10 3A */ slwi r0, r30, 2 -/* 80355FDC 38 C1 00 1C */ addi r6, r1, 0x1c -/* 80355FE0 7C C6 02 14 */ add r6, r6, r0 -/* 80355FE4 80 86 00 00 */ lwz r4, 0(r6) -/* 80355FE8 6B C0 00 01 */ xori r0, r30, 1 -/* 80355FEC 54 00 10 3A */ slwi r0, r0, 2 -/* 80355FF0 90 83 00 84 */ stw r4, 0x84(r3) -/* 80355FF4 38 81 00 1C */ addi r4, r1, 0x1c -/* 80355FF8 38 A0 20 00 */ li r5, 0x2000 -/* 80355FFC 80 66 00 00 */ lwz r3, 0(r6) -/* 80356000 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80356004 4B CA D5 3D */ bl memcpy -/* 80356008 48 00 00 20 */ b lbl_80356028 -lbl_8035600C: -/* 8035600C 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80356010 7C 04 00 40 */ cmplw r4, r0 -/* 80356014 40 82 00 0C */ bne lbl_80356020 -/* 80356018 38 00 00 00 */ li r0, 0 -/* 8035601C 48 00 00 08 */ b lbl_80356024 -lbl_80356020: -/* 80356020 38 00 00 01 */ li r0, 1 -lbl_80356024: -/* 80356024 7C 1E 03 78 */ mr r30, r0 -lbl_80356028: -/* 80356028 28 1D 00 00 */ cmplwi r29, 0 -/* 8035602C 41 82 00 08 */ beq lbl_80356034 -/* 80356030 93 DD 00 00 */ stw r30, 0(r29) -lbl_80356034: -/* 80356034 7F E3 FB 78 */ mr r3, r31 -/* 80356038 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 8035603C 83 E1 00 34 */ lwz r31, 0x34(r1) -/* 80356040 83 C1 00 30 */ lwz r30, 0x30(r1) -/* 80356044 83 A1 00 2C */ lwz r29, 0x2c(r1) -/* 80356048 38 21 00 38 */ addi r1, r1, 0x38 -/* 8035604C 7C 08 03 A6 */ mtlr r0 -/* 80356050 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDCheck/VerifyFAT.s b/asm/dolphin/card/CARDCheck/VerifyFAT.s deleted file mode 100644 index fc93a2c5cb..0000000000 --- a/asm/dolphin/card/CARDCheck/VerifyFAT.s +++ /dev/null @@ -1,182 +0,0 @@ -lbl_80356054: -/* 80356054 7C 08 02 A6 */ mflr r0 -/* 80356058 38 A0 00 00 */ li r5, 0 -/* 8035605C 90 01 00 04 */ stw r0, 4(r1) -/* 80356060 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 80356064 93 E1 00 24 */ stw r31, 0x24(r1) -/* 80356068 3B E0 00 00 */ li r31, 0 -/* 8035606C 93 C1 00 20 */ stw r30, 0x20(r1) -/* 80356070 3B C0 00 00 */ li r30, 0 -/* 80356074 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 80356078 3B A4 00 00 */ addi r29, r4, 0 -/* 8035607C 38 81 00 10 */ addi r4, r1, 0x10 -lbl_80356080: -/* 80356080 39 00 1F FC */ li r8, 0x1ffc -/* 80356084 80 C3 00 80 */ lwz r6, 0x80(r3) -/* 80356088 38 05 00 03 */ addi r0, r5, 3 -/* 8035608C 7D 08 0E 70 */ srawi r8, r8, 1 -/* 80356090 54 00 68 24 */ slwi r0, r0, 0xd -/* 80356094 7C E6 02 14 */ add r7, r6, r0 -/* 80356098 7D 08 01 95 */ addze. r8, r8 -/* 8035609C 90 E4 00 00 */ stw r7, 0(r4) -/* 803560A0 38 C7 00 04 */ addi r6, r7, 4 -/* 803560A4 39 60 00 00 */ li r11, 0 -/* 803560A8 39 40 00 00 */ li r10, 0 -/* 803560AC 40 81 00 BC */ ble lbl_80356168 -/* 803560B0 55 00 E8 FF */ rlwinm. r0, r8, 0x1d, 3, 0x1f -/* 803560B4 7C 09 03 A6 */ mtctr r0 -/* 803560B8 41 82 00 94 */ beq lbl_8035614C -lbl_803560BC: -/* 803560BC A1 26 00 00 */ lhz r9, 0(r6) -/* 803560C0 7D 20 48 F8 */ nor r0, r9, r9 -/* 803560C4 7D 4A 4A 14 */ add r10, r10, r9 -/* 803560C8 A1 26 00 02 */ lhz r9, 2(r6) -/* 803560CC 7D 6B 02 14 */ add r11, r11, r0 -/* 803560D0 7D 20 48 F8 */ nor r0, r9, r9 -/* 803560D4 7D 4A 4A 14 */ add r10, r10, r9 -/* 803560D8 A1 26 00 04 */ lhz r9, 4(r6) -/* 803560DC 7D 6B 02 14 */ add r11, r11, r0 -/* 803560E0 7D 20 48 F8 */ nor r0, r9, r9 -/* 803560E4 7D 4A 4A 14 */ add r10, r10, r9 -/* 803560E8 A1 26 00 06 */ lhz r9, 6(r6) -/* 803560EC 7D 6B 02 14 */ add r11, r11, r0 -/* 803560F0 7D 20 48 F8 */ nor r0, r9, r9 -/* 803560F4 7D 4A 4A 14 */ add r10, r10, r9 -/* 803560F8 A1 26 00 08 */ lhz r9, 8(r6) -/* 803560FC 7D 6B 02 14 */ add r11, r11, r0 -/* 80356100 7D 20 48 F8 */ nor r0, r9, r9 -/* 80356104 7D 4A 4A 14 */ add r10, r10, r9 -/* 80356108 A1 26 00 0A */ lhz r9, 0xa(r6) -/* 8035610C 7D 6B 02 14 */ add r11, r11, r0 -/* 80356110 7D 20 48 F8 */ nor r0, r9, r9 -/* 80356114 7D 4A 4A 14 */ add r10, r10, r9 -/* 80356118 A1 26 00 0C */ lhz r9, 0xc(r6) -/* 8035611C 7D 6B 02 14 */ add r11, r11, r0 -/* 80356120 7D 20 48 F8 */ nor r0, r9, r9 -/* 80356124 7D 4A 4A 14 */ add r10, r10, r9 -/* 80356128 A1 26 00 0E */ lhz r9, 0xe(r6) -/* 8035612C 7D 6B 02 14 */ add r11, r11, r0 -/* 80356130 7D 20 48 F8 */ nor r0, r9, r9 -/* 80356134 7D 4A 4A 14 */ add r10, r10, r9 -/* 80356138 7D 6B 02 14 */ add r11, r11, r0 -/* 8035613C 38 C6 00 10 */ addi r6, r6, 0x10 -/* 80356140 42 00 FF 7C */ bdnz lbl_803560BC -/* 80356144 71 08 00 07 */ andi. r8, r8, 7 -/* 80356148 41 82 00 20 */ beq lbl_80356168 -lbl_8035614C: -/* 8035614C 7D 09 03 A6 */ mtctr r8 -lbl_80356150: -/* 80356150 A1 26 00 00 */ lhz r9, 0(r6) -/* 80356154 38 C6 00 02 */ addi r6, r6, 2 -/* 80356158 7D 20 48 F8 */ nor r0, r9, r9 -/* 8035615C 7D 4A 4A 14 */ add r10, r10, r9 -/* 80356160 7D 6B 02 14 */ add r11, r11, r0 -/* 80356164 42 00 FF EC */ bdnz lbl_80356150 -lbl_80356168: -/* 80356168 55 40 04 3E */ clrlwi r0, r10, 0x10 -/* 8035616C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80356170 40 82 00 08 */ bne lbl_80356178 -/* 80356174 39 40 00 00 */ li r10, 0 -lbl_80356178: -/* 80356178 55 60 04 3E */ clrlwi r0, r11, 0x10 -/* 8035617C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80356180 40 82 00 08 */ bne lbl_80356188 -/* 80356184 39 60 00 00 */ li r11, 0 -lbl_80356188: -/* 80356188 A0 C7 00 00 */ lhz r6, 0(r7) -/* 8035618C 55 40 04 3E */ clrlwi r0, r10, 0x10 -/* 80356190 7C 06 00 40 */ cmplw r6, r0 -/* 80356194 40 82 00 14 */ bne lbl_803561A8 -/* 80356198 A0 C7 00 02 */ lhz r6, 2(r7) -/* 8035619C 55 60 04 3E */ clrlwi r0, r11, 0x10 -/* 803561A0 7C 06 00 40 */ cmplw r6, r0 -/* 803561A4 41 82 00 18 */ beq lbl_803561BC -lbl_803561A8: -/* 803561A8 38 00 00 00 */ li r0, 0 -/* 803561AC 90 03 00 88 */ stw r0, 0x88(r3) -/* 803561B0 3B C5 00 00 */ addi r30, r5, 0 -/* 803561B4 3B FF 00 01 */ addi r31, r31, 1 -/* 803561B8 48 00 00 5C */ b lbl_80356214 -lbl_803561BC: -/* 803561BC A1 03 00 10 */ lhz r8, 0x10(r3) -/* 803561C0 38 C7 00 0A */ addi r6, r7, 0xa -/* 803561C4 39 40 00 00 */ li r10, 0 -/* 803561C8 39 20 00 05 */ li r9, 5 -/* 803561CC 48 00 00 1C */ b lbl_803561E8 -lbl_803561D0: -/* 803561D0 A0 06 00 00 */ lhz r0, 0(r6) -/* 803561D4 28 00 00 00 */ cmplwi r0, 0 -/* 803561D8 40 82 00 08 */ bne lbl_803561E0 -/* 803561DC 39 4A 00 01 */ addi r10, r10, 1 -lbl_803561E0: -/* 803561E0 38 C6 00 02 */ addi r6, r6, 2 -/* 803561E4 39 29 00 01 */ addi r9, r9, 1 -lbl_803561E8: -/* 803561E8 55 20 04 3E */ clrlwi r0, r9, 0x10 -/* 803561EC 7C 00 40 40 */ cmplw r0, r8 -/* 803561F0 41 80 FF E0 */ blt lbl_803561D0 -/* 803561F4 A0 07 00 06 */ lhz r0, 6(r7) -/* 803561F8 55 46 04 3E */ clrlwi r6, r10, 0x10 -/* 803561FC 7C 06 00 40 */ cmplw r6, r0 -/* 80356200 41 82 00 14 */ beq lbl_80356214 -/* 80356204 38 00 00 00 */ li r0, 0 -/* 80356208 90 03 00 88 */ stw r0, 0x88(r3) -/* 8035620C 3B C5 00 00 */ addi r30, r5, 0 -/* 80356210 3B FF 00 01 */ addi r31, r31, 1 -lbl_80356214: -/* 80356214 38 A5 00 01 */ addi r5, r5, 1 -/* 80356218 2C 05 00 02 */ cmpwi r5, 2 -/* 8035621C 38 84 00 04 */ addi r4, r4, 4 -/* 80356220 41 80 FE 60 */ blt lbl_80356080 -/* 80356224 2C 1F 00 00 */ cmpwi r31, 0 -/* 80356228 40 82 00 84 */ bne lbl_803562AC -/* 8035622C 80 83 00 88 */ lwz r4, 0x88(r3) -/* 80356230 28 04 00 00 */ cmplwi r4, 0 -/* 80356234 40 82 00 5C */ bne lbl_80356290 -/* 80356238 80 A1 00 14 */ lwz r5, 0x14(r1) -/* 8035623C 80 81 00 10 */ lwz r4, 0x10(r1) -/* 80356240 A8 A5 00 04 */ lha r5, 4(r5) -/* 80356244 A8 04 00 04 */ lha r0, 4(r4) -/* 80356248 7C 05 00 51 */ subf. r0, r5, r0 -/* 8035624C 40 80 00 0C */ bge lbl_80356258 -/* 80356250 3B C0 00 00 */ li r30, 0 -/* 80356254 48 00 00 08 */ b lbl_8035625C -lbl_80356258: -/* 80356258 3B C0 00 01 */ li r30, 1 -lbl_8035625C: -/* 8035625C 57 C0 10 3A */ slwi r0, r30, 2 -/* 80356260 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80356264 7C C6 02 14 */ add r6, r6, r0 -/* 80356268 80 86 00 00 */ lwz r4, 0(r6) -/* 8035626C 6B C0 00 01 */ xori r0, r30, 1 -/* 80356270 54 00 10 3A */ slwi r0, r0, 2 -/* 80356274 90 83 00 88 */ stw r4, 0x88(r3) -/* 80356278 38 81 00 10 */ addi r4, r1, 0x10 -/* 8035627C 38 A0 20 00 */ li r5, 0x2000 -/* 80356280 80 66 00 00 */ lwz r3, 0(r6) -/* 80356284 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80356288 4B CA D2 B9 */ bl memcpy -/* 8035628C 48 00 00 20 */ b lbl_803562AC -lbl_80356290: -/* 80356290 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80356294 7C 04 00 40 */ cmplw r4, r0 -/* 80356298 40 82 00 0C */ bne lbl_803562A4 -/* 8035629C 38 00 00 00 */ li r0, 0 -/* 803562A0 48 00 00 08 */ b lbl_803562A8 -lbl_803562A4: -/* 803562A4 38 00 00 01 */ li r0, 1 -lbl_803562A8: -/* 803562A8 7C 1E 03 78 */ mr r30, r0 -lbl_803562AC: -/* 803562AC 28 1D 00 00 */ cmplwi r29, 0 -/* 803562B0 41 82 00 08 */ beq lbl_803562B8 -/* 803562B4 93 DD 00 00 */ stw r30, 0(r29) -lbl_803562B8: -/* 803562B8 7F E3 FB 78 */ mr r3, r31 -/* 803562BC 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 803562C0 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 803562C4 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 803562C8 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 803562CC 38 21 00 28 */ addi r1, r1, 0x28 -/* 803562D0 7C 08 03 A6 */ mtlr r0 -/* 803562D4 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDCheck/VerifyID.s b/asm/dolphin/card/CARDCheck/VerifyID.s deleted file mode 100644 index d83d40f558..0000000000 --- a/asm/dolphin/card/CARDCheck/VerifyID.s +++ /dev/null @@ -1,176 +0,0 @@ -lbl_80355B90: -/* 80355B90 7C 08 02 A6 */ mflr r0 -/* 80355B94 90 01 00 04 */ stw r0, 4(r1) -/* 80355B98 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80355B9C BF 21 00 14 */ stmw r25, 0x14(r1) -/* 80355BA0 7C 7A 1B 78 */ mr r26, r3 -/* 80355BA4 80 63 00 80 */ lwz r3, 0x80(r3) -/* 80355BA8 A0 03 00 20 */ lhz r0, 0x20(r3) -/* 80355BAC 3B 63 00 00 */ addi r27, r3, 0 -/* 80355BB0 28 00 00 00 */ cmplwi r0, 0 -/* 80355BB4 40 82 00 14 */ bne lbl_80355BC8 -/* 80355BB8 A0 7B 00 22 */ lhz r3, 0x22(r27) -/* 80355BBC A0 1A 00 08 */ lhz r0, 8(r26) -/* 80355BC0 7C 03 00 40 */ cmplw r3, r0 -/* 80355BC4 41 82 00 0C */ beq lbl_80355BD0 -lbl_80355BC8: -/* 80355BC8 38 60 FF FA */ li r3, -6 -/* 80355BCC 48 00 02 34 */ b lbl_80355E00 -lbl_80355BD0: -/* 80355BD0 38 00 01 FC */ li r0, 0x1fc -/* 80355BD4 7C 00 0E 70 */ srawi r0, r0, 1 -/* 80355BD8 7C 00 01 95 */ addze. r0, r0 -/* 80355BDC 38 9B 00 00 */ addi r4, r27, 0 -/* 80355BE0 38 E0 00 00 */ li r7, 0 -/* 80355BE4 7C 03 03 78 */ mr r3, r0 -/* 80355BE8 38 C0 00 00 */ li r6, 0 -/* 80355BEC 40 81 00 BC */ ble lbl_80355CA8 -/* 80355BF0 54 60 E8 FF */ rlwinm. r0, r3, 0x1d, 3, 0x1f -/* 80355BF4 7C 09 03 A6 */ mtctr r0 -/* 80355BF8 41 82 00 94 */ beq lbl_80355C8C -lbl_80355BFC: -/* 80355BFC A0 A4 00 00 */ lhz r5, 0(r4) -/* 80355C00 7C A0 28 F8 */ nor r0, r5, r5 -/* 80355C04 7C C6 2A 14 */ add r6, r6, r5 -/* 80355C08 A0 A4 00 02 */ lhz r5, 2(r4) -/* 80355C0C 7C E7 02 14 */ add r7, r7, r0 -/* 80355C10 7C A0 28 F8 */ nor r0, r5, r5 -/* 80355C14 7C C6 2A 14 */ add r6, r6, r5 -/* 80355C18 A0 A4 00 04 */ lhz r5, 4(r4) -/* 80355C1C 7C E7 02 14 */ add r7, r7, r0 -/* 80355C20 7C A0 28 F8 */ nor r0, r5, r5 -/* 80355C24 7C C6 2A 14 */ add r6, r6, r5 -/* 80355C28 A0 A4 00 06 */ lhz r5, 6(r4) -/* 80355C2C 7C E7 02 14 */ add r7, r7, r0 -/* 80355C30 7C A0 28 F8 */ nor r0, r5, r5 -/* 80355C34 7C C6 2A 14 */ add r6, r6, r5 -/* 80355C38 A0 A4 00 08 */ lhz r5, 8(r4) -/* 80355C3C 7C E7 02 14 */ add r7, r7, r0 -/* 80355C40 7C A0 28 F8 */ nor r0, r5, r5 -/* 80355C44 7C C6 2A 14 */ add r6, r6, r5 -/* 80355C48 A0 A4 00 0A */ lhz r5, 0xa(r4) -/* 80355C4C 7C E7 02 14 */ add r7, r7, r0 -/* 80355C50 7C A0 28 F8 */ nor r0, r5, r5 -/* 80355C54 7C C6 2A 14 */ add r6, r6, r5 -/* 80355C58 A0 A4 00 0C */ lhz r5, 0xc(r4) -/* 80355C5C 7C E7 02 14 */ add r7, r7, r0 -/* 80355C60 7C A0 28 F8 */ nor r0, r5, r5 -/* 80355C64 7C C6 2A 14 */ add r6, r6, r5 -/* 80355C68 A0 A4 00 0E */ lhz r5, 0xe(r4) -/* 80355C6C 7C E7 02 14 */ add r7, r7, r0 -/* 80355C70 7C A0 28 F8 */ nor r0, r5, r5 -/* 80355C74 7C C6 2A 14 */ add r6, r6, r5 -/* 80355C78 7C E7 02 14 */ add r7, r7, r0 -/* 80355C7C 38 84 00 10 */ addi r4, r4, 0x10 -/* 80355C80 42 00 FF 7C */ bdnz lbl_80355BFC -/* 80355C84 70 63 00 07 */ andi. r3, r3, 7 -/* 80355C88 41 82 00 20 */ beq lbl_80355CA8 -lbl_80355C8C: -/* 80355C8C 7C 69 03 A6 */ mtctr r3 -lbl_80355C90: -/* 80355C90 A0 A4 00 00 */ lhz r5, 0(r4) -/* 80355C94 38 84 00 02 */ addi r4, r4, 2 -/* 80355C98 7C A0 28 F8 */ nor r0, r5, r5 -/* 80355C9C 7C C6 2A 14 */ add r6, r6, r5 -/* 80355CA0 7C E7 02 14 */ add r7, r7, r0 -/* 80355CA4 42 00 FF EC */ bdnz lbl_80355C90 -lbl_80355CA8: -/* 80355CA8 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 80355CAC 28 00 FF FF */ cmplwi r0, 0xffff -/* 80355CB0 40 82 00 08 */ bne lbl_80355CB8 -/* 80355CB4 38 C0 00 00 */ li r6, 0 -lbl_80355CB8: -/* 80355CB8 54 E0 04 3E */ clrlwi r0, r7, 0x10 -/* 80355CBC 28 00 FF FF */ cmplwi r0, 0xffff -/* 80355CC0 40 82 00 08 */ bne lbl_80355CC8 -/* 80355CC4 38 E0 00 00 */ li r7, 0 -lbl_80355CC8: -/* 80355CC8 A0 7B 01 FC */ lhz r3, 0x1fc(r27) -/* 80355CCC 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 80355CD0 7C 03 00 40 */ cmplw r3, r0 -/* 80355CD4 40 82 00 14 */ bne lbl_80355CE8 -/* 80355CD8 A0 7B 01 FE */ lhz r3, 0x1fe(r27) -/* 80355CDC 54 E0 04 3E */ clrlwi r0, r7, 0x10 -/* 80355CE0 7C 03 00 40 */ cmplw r3, r0 -/* 80355CE4 41 82 00 0C */ beq lbl_80355CF0 -lbl_80355CE8: -/* 80355CE8 38 60 FF FA */ li r3, -6 -/* 80355CEC 48 00 01 14 */ b lbl_80355E00 -lbl_80355CF0: -/* 80355CF0 83 FB 00 0C */ lwz r31, 0xc(r27) -/* 80355CF4 83 9B 00 10 */ lwz r28, 0x10(r27) -/* 80355CF8 4B FE A4 A9 */ bl __OSLockSramEx -/* 80355CFC 3C 80 80 45 */ lis r4, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80355D00 38 04 CB C0 */ addi r0, r4, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80355D04 3C 80 78 78 */ lis r4, 0x7878 /* 0x78787879@ha */ -/* 80355D08 7C 00 D0 50 */ subf r0, r0, r26 -/* 80355D0C 38 84 78 79 */ addi r4, r4, 0x7879 /* 0x78787879@l */ -/* 80355D10 7C 04 00 96 */ mulhw r0, r4, r0 -/* 80355D14 7C 00 3E 70 */ srawi r0, r0, 7 -/* 80355D18 54 04 0F FE */ srwi r4, r0, 0x1f -/* 80355D1C 7C 00 22 14 */ add r0, r0, r4 -/* 80355D20 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80355D24 3C 80 41 C6 */ lis r4, 0x41C6 /* 0x41C64E6D@ha */ -/* 80355D28 3B 3B 00 00 */ addi r25, r27, 0 -/* 80355D2C 7F A3 02 14 */ add r29, r3, r0 -/* 80355D30 3B C4 4E 6D */ addi r30, r4, 0x4E6D /* 0x41C64E6D@l */ -/* 80355D34 3B 40 00 00 */ li r26, 0 -lbl_80355D38: -/* 80355D38 7C BF F1 D6 */ mullw r5, r31, r30 -/* 80355D3C 7C 7C F0 16 */ mulhwu r3, r28, r30 -/* 80355D40 3B E0 00 00 */ li r31, 0 -/* 80355D44 7C A5 1A 14 */ add r5, r5, r3 -/* 80355D48 7C 7C F9 D6 */ mullw r3, r28, r31 -/* 80355D4C 7C 1C F1 D6 */ mullw r0, r28, r30 -/* 80355D50 3B 80 30 39 */ li r28, 0x3039 -/* 80355D54 7C 80 E0 14 */ addc r4, r0, r28 -/* 80355D58 7C 05 1A 14 */ add r0, r5, r3 -/* 80355D5C 7C 60 F9 14 */ adde r3, r0, r31 -/* 80355D60 38 A0 00 10 */ li r5, 0x10 -/* 80355D64 48 00 C9 31 */ bl __shr2i -/* 80355D68 88 1D 00 00 */ lbz r0, 0(r29) -/* 80355D6C 88 D9 00 00 */ lbz r6, 0(r25) -/* 80355D70 7C 04 00 14 */ addc r0, r4, r0 -/* 80355D74 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80355D78 7C 06 00 40 */ cmplw r6, r0 -/* 80355D7C 41 82 00 14 */ beq lbl_80355D90 -/* 80355D80 38 60 00 00 */ li r3, 0 -/* 80355D84 4B FE A7 D9 */ bl __OSUnlockSramEx -/* 80355D88 38 60 FF FA */ li r3, -6 -/* 80355D8C 48 00 00 74 */ b lbl_80355E00 -lbl_80355D90: -/* 80355D90 7C A3 F1 D6 */ mullw r5, r3, r30 -/* 80355D94 7C 64 F0 16 */ mulhwu r3, r4, r30 -/* 80355D98 7C A5 1A 14 */ add r5, r5, r3 -/* 80355D9C 7C 64 F9 D6 */ mullw r3, r4, r31 -/* 80355DA0 7C 04 F1 D6 */ mullw r0, r4, r30 -/* 80355DA4 7C 80 E0 14 */ addc r4, r0, r28 -/* 80355DA8 7C 05 1A 14 */ add r0, r5, r3 -/* 80355DAC 7C 60 F9 14 */ adde r3, r0, r31 -/* 80355DB0 38 A0 00 10 */ li r5, 0x10 -/* 80355DB4 48 00 C8 E1 */ bl __shr2i -/* 80355DB8 3B 5A 00 01 */ addi r26, r26, 1 -/* 80355DBC 2C 1A 00 0C */ cmpwi r26, 0xc -/* 80355DC0 38 00 7F FF */ li r0, 0x7fff -/* 80355DC4 7C 9C 00 38 */ and r28, r4, r0 -/* 80355DC8 7C 7F F8 38 */ and r31, r3, r31 -/* 80355DCC 3B BD 00 01 */ addi r29, r29, 1 -/* 80355DD0 3B 39 00 01 */ addi r25, r25, 1 -/* 80355DD4 41 80 FF 64 */ blt lbl_80355D38 -/* 80355DD8 38 60 00 00 */ li r3, 0 -/* 80355DDC 4B FE A7 81 */ bl __OSUnlockSramEx -/* 80355DE0 4B FF DD 95 */ bl __CARDGetFontEncode -/* 80355DE4 A0 1B 00 24 */ lhz r0, 0x24(r27) -/* 80355DE8 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 80355DEC 7C 00 18 40 */ cmplw r0, r3 -/* 80355DF0 41 82 00 0C */ beq lbl_80355DFC -/* 80355DF4 38 60 FF F3 */ li r3, -13 -/* 80355DF8 48 00 00 08 */ b lbl_80355E00 -lbl_80355DFC: -/* 80355DFC 38 60 00 00 */ li r3, 0 -lbl_80355E00: -/* 80355E00 BB 21 00 14 */ lmw r25, 0x14(r1) -/* 80355E04 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80355E08 38 21 00 30 */ addi r1, r1, 0x30 -/* 80355E0C 7C 08 03 A6 */ mtlr r0 -/* 80355E10 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDDir/EraseCallback.s b/asm/dolphin/card/CARDDir/EraseCallback.s deleted file mode 100644 index 9bfe6fc35b..0000000000 --- a/asm/dolphin/card/CARDDir/EraseCallback.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80355854: -/* 80355854 7C 08 02 A6 */ mflr r0 -/* 80355858 90 01 00 04 */ stw r0, 4(r1) -/* 8035585C 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 80355860 93 E1 00 24 */ stw r31, 0x24(r1) -/* 80355864 3B E3 00 00 */ addi r31, r3, 0 -/* 80355868 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 8035586C 93 C1 00 20 */ stw r30, 0x20(r1) -/* 80355870 1C BF 01 10 */ mulli r5, r31, 0x110 -/* 80355874 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 80355878 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 8035587C 7C 9D 23 79 */ or. r29, r4, r4 -/* 80355880 7F C0 2A 14 */ add r30, r0, r5 -/* 80355884 41 80 00 3C */ blt lbl_803558C0 -/* 80355888 80 BE 00 84 */ lwz r5, 0x84(r30) -/* 8035588C 3C 60 80 35 */ lis r3, WriteCallback@ha /* 0x80355784@ha */ -/* 80355890 80 1E 00 80 */ lwz r0, 0x80(r30) -/* 80355894 38 E3 57 84 */ addi r7, r3, WriteCallback@l /* 0x80355784@l */ -/* 80355898 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8035589C 7C 00 28 50 */ subf r0, r0, r5 -/* 803558A0 54 00 9B 7E */ srwi r0, r0, 0xd -/* 803558A4 7C 83 01 D6 */ mullw r4, r3, r0 -/* 803558A8 38 C5 00 00 */ addi r6, r5, 0 -/* 803558AC 38 7F 00 00 */ addi r3, r31, 0 -/* 803558B0 38 A0 20 00 */ li r5, 0x2000 -/* 803558B4 4B FF FA F9 */ bl __CARDWrite -/* 803558B8 7C 7D 1B 79 */ or. r29, r3, r3 -/* 803558BC 40 80 00 44 */ bge lbl_80355900 -lbl_803558C0: -/* 803558C0 80 1E 00 D0 */ lwz r0, 0xd0(r30) -/* 803558C4 28 00 00 00 */ cmplwi r0, 0 -/* 803558C8 40 82 00 10 */ bne lbl_803558D8 -/* 803558CC 38 7E 00 00 */ addi r3, r30, 0 -/* 803558D0 38 9D 00 00 */ addi r4, r29, 0 -/* 803558D4 4B FF E3 99 */ bl __CARDPutControlBlock -lbl_803558D8: -/* 803558D8 80 1E 00 D8 */ lwz r0, 0xd8(r30) -/* 803558DC 28 00 00 00 */ cmplwi r0, 0 -/* 803558E0 7C 0C 03 78 */ mr r12, r0 -/* 803558E4 41 82 00 1C */ beq lbl_80355900 -/* 803558E8 38 00 00 00 */ li r0, 0 -/* 803558EC 7D 88 03 A6 */ mtlr r12 -/* 803558F0 90 1E 00 D8 */ stw r0, 0xd8(r30) -/* 803558F4 38 7F 00 00 */ addi r3, r31, 0 -/* 803558F8 38 9D 00 00 */ addi r4, r29, 0 -/* 803558FC 4E 80 00 21 */ blrl -lbl_80355900: -/* 80355900 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80355904 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 80355908 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 8035590C 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 80355910 38 21 00 28 */ addi r1, r1, 0x28 -/* 80355914 7C 08 03 A6 */ mtlr r0 -/* 80355918 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDDir/__CARDUpdateDir.s b/asm/dolphin/card/CARDDir/__CARDUpdateDir.s deleted file mode 100644 index 6443e8a40a..0000000000 --- a/asm/dolphin/card/CARDDir/__CARDUpdateDir.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8035591C: -/* 8035591C 7C 08 02 A6 */ mflr r0 -/* 80355920 90 01 00 04 */ stw r0, 4(r1) -/* 80355924 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 80355928 93 E1 00 24 */ stw r31, 0x24(r1) -/* 8035592C 93 C1 00 20 */ stw r30, 0x20(r1) -/* 80355930 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 80355934 3B A4 00 00 */ addi r29, r4, 0 -/* 80355938 93 81 00 18 */ stw r28, 0x18(r1) -/* 8035593C 3B 83 00 00 */ addi r28, r3, 0 -/* 80355940 1C BC 01 10 */ mulli r5, r28, 0x110 -/* 80355944 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80355948 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 8035594C 7F C0 2A 14 */ add r30, r0, r5 -/* 80355950 80 1E 00 00 */ lwz r0, 0(r30) -/* 80355954 2C 00 00 00 */ cmpwi r0, 0 -/* 80355958 40 82 00 0C */ bne lbl_80355964 -/* 8035595C 38 60 FF FD */ li r3, -3 -/* 80355960 48 00 00 60 */ b lbl_803559C0 -lbl_80355964: -/* 80355964 83 FE 00 84 */ lwz r31, 0x84(r30) -/* 80355968 38 80 1F FC */ li r4, 0x1ffc -/* 8035596C A8 BF 1F FA */ lha r5, 0x1ffa(r31) -/* 80355970 38 DF 1F C0 */ addi r6, r31, 0x1fc0 -/* 80355974 38 7F 00 00 */ addi r3, r31, 0 -/* 80355978 38 05 00 01 */ addi r0, r5, 1 -/* 8035597C B0 1F 1F FA */ sth r0, 0x1ffa(r31) -/* 80355980 38 A6 00 3C */ addi r5, r6, 0x3c -/* 80355984 38 C6 00 3E */ addi r6, r6, 0x3e -/* 80355988 48 00 00 59 */ bl __CARDCheckSum -/* 8035598C 38 7F 00 00 */ addi r3, r31, 0 -/* 80355990 38 80 20 00 */ li r4, 0x2000 -/* 80355994 4B FE 5C 49 */ bl DCStoreRange -/* 80355998 93 BE 00 D8 */ stw r29, 0xd8(r30) -/* 8035599C 3C 60 80 35 */ lis r3, EraseCallback@ha /* 0x80355854@ha */ -/* 803559A0 38 A3 58 54 */ addi r5, r3, EraseCallback@l /* 0x80355854@l */ -/* 803559A4 80 1E 00 80 */ lwz r0, 0x80(r30) -/* 803559A8 7F 83 E3 78 */ mr r3, r28 -/* 803559AC 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 803559B0 7C 00 F8 50 */ subf r0, r0, r31 -/* 803559B4 54 00 9B 7E */ srwi r0, r0, 0xd -/* 803559B8 7C 84 01 D6 */ mullw r4, r4, r0 -/* 803559BC 4B FF DF FD */ bl __CARDEraseSector -lbl_803559C0: -/* 803559C0 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 803559C4 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 803559C8 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 803559CC 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 803559D0 83 81 00 18 */ lwz r28, 0x18(r1) -/* 803559D4 38 21 00 28 */ addi r1, r1, 0x28 -/* 803559D8 7C 08 03 A6 */ mtlr r0 -/* 803559DC 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDFormat/__CARDFormatRegionAsync.s b/asm/dolphin/card/CARDFormat/__CARDFormatRegionAsync.s deleted file mode 100644 index 5ed8cbb428..0000000000 --- a/asm/dolphin/card/CARDFormat/__CARDFormatRegionAsync.s +++ /dev/null @@ -1,422 +0,0 @@ -lbl_803575C8: -/* 803575C8 7C 08 02 A6 */ mflr r0 -/* 803575CC 90 01 00 04 */ stw r0, 4(r1) -/* 803575D0 94 21 FF A8 */ stwu r1, -0x58(r1) -/* 803575D4 BE 41 00 20 */ stmw r18, 0x20(r1) -/* 803575D8 3A 84 00 00 */ addi r20, r4, 0 -/* 803575DC 3A C3 00 00 */ addi r22, r3, 0 -/* 803575E0 3A 65 00 00 */ addi r19, r5, 0 -/* 803575E4 38 81 00 18 */ addi r4, r1, 0x18 -/* 803575E8 4B FF C5 CD */ bl __CARDGetControlBlock -/* 803575EC 2C 03 00 00 */ cmpwi r3, 0 -/* 803575F0 40 80 00 08 */ bge lbl_803575F8 -/* 803575F4 48 00 06 18 */ b lbl_80357C0C -lbl_803575F8: -/* 803575F8 80 61 00 18 */ lwz r3, 0x18(r1) -/* 803575FC 38 80 00 FF */ li r4, 0xff -/* 80357600 38 A0 20 00 */ li r5, 0x2000 -/* 80357604 83 63 00 80 */ lwz r27, 0x80(r3) -/* 80357608 7F 63 DB 78 */ mr r3, r27 -/* 8035760C 4B CA BE 4D */ bl memset -/* 80357610 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC00206E@ha */ -/* 80357614 A2 43 20 6E */ lhz r18, 0x206E(r3) /* 0xCC00206E@l */ -/* 80357618 B2 9B 00 24 */ sth r20, 0x24(r27) -/* 8035761C 4B FE 8B 29 */ bl __OSLockSram -/* 80357620 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80357624 90 1B 00 14 */ stw r0, 0x14(r27) -/* 80357628 88 03 00 12 */ lbz r0, 0x12(r3) -/* 8035762C 38 60 00 00 */ li r3, 0 -/* 80357630 90 1B 00 18 */ stw r0, 0x18(r27) -/* 80357634 4B FE 8F 05 */ bl __OSUnlockSram -/* 80357638 4B FE B0 C5 */ bl OSGetTime -/* 8035763C 3A A4 00 00 */ addi r21, r4, 0 -/* 80357640 3A 83 00 00 */ addi r20, r3, 0 -/* 80357644 3B 55 00 00 */ addi r26, r21, 0 -/* 80357648 3B D4 00 00 */ addi r30, r20, 0 -/* 8035764C 4B FE 8B 55 */ bl __OSLockSramEx -/* 80357650 1C 16 00 0C */ mulli r0, r22, 0xc -/* 80357654 7F 23 02 14 */ add r25, r3, r0 -/* 80357658 3C 60 41 C6 */ lis r3, 0x41C6 /* 0x41C64E6D@ha */ -/* 8035765C 3B 19 00 00 */ addi r24, r25, 0 -/* 80357660 3B E3 4E 6D */ addi r31, r3, 0x4E6D /* 0x41C64E6D@l */ -/* 80357664 3B 80 00 00 */ li r28, 0 -/* 80357668 3A E0 00 04 */ li r23, 4 -/* 8035766C 48 00 03 74 */ b lbl_803579E0 -lbl_80357670: -/* 80357670 7C BE F9 D6 */ mullw r5, r30, r31 -/* 80357674 7C 7A F8 16 */ mulhwu r3, r26, r31 -/* 80357678 3B C0 00 00 */ li r30, 0 -/* 8035767C 7C A5 1A 14 */ add r5, r5, r3 -/* 80357680 7C 7A F1 D6 */ mullw r3, r26, r30 -/* 80357684 7C 1A F9 D6 */ mullw r0, r26, r31 -/* 80357688 3B A0 30 39 */ li r29, 0x3039 -/* 8035768C 7C 80 E8 14 */ addc r4, r0, r29 -/* 80357690 7C 05 1A 14 */ add r0, r5, r3 -/* 80357694 7C 60 F1 14 */ adde r3, r0, r30 -/* 80357698 38 A0 00 10 */ li r5, 0x10 -/* 8035769C 48 00 AF F9 */ bl __shr2i -/* 803576A0 7C C3 F9 D6 */ mullw r6, r3, r31 -/* 803576A4 88 18 00 00 */ lbz r0, 0(r24) -/* 803576A8 7C A4 F8 16 */ mulhwu r5, r4, r31 -/* 803576AC 7C C6 2A 14 */ add r6, r6, r5 -/* 803576B0 7D 04 00 14 */ addc r8, r4, r0 -/* 803576B4 7F 87 07 34 */ extsh r7, r28 -/* 803576B8 7C A4 F1 D6 */ mullw r5, r4, r30 -/* 803576BC 7D 1B 39 AE */ stbx r8, r27, r7 -/* 803576C0 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 803576C4 7C 80 E8 14 */ addc r4, r0, r29 -/* 803576C8 7C 06 2A 14 */ add r0, r6, r5 -/* 803576CC 7C 60 F1 14 */ adde r3, r0, r30 -/* 803576D0 38 A0 00 10 */ li r5, 0x10 -/* 803576D4 48 00 AF C1 */ bl __shr2i -/* 803576D8 3B 40 7F FF */ li r26, 0x7fff -/* 803576DC 7C 60 F0 38 */ and r0, r3, r30 -/* 803576E0 7C 84 D0 38 */ and r4, r4, r26 -/* 803576E4 7C A0 F9 D6 */ mullw r5, r0, r31 -/* 803576E8 7C 64 F8 16 */ mulhwu r3, r4, r31 -/* 803576EC 7C A5 1A 14 */ add r5, r5, r3 -/* 803576F0 7C 64 F1 D6 */ mullw r3, r4, r30 -/* 803576F4 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 803576F8 7C 80 E8 14 */ addc r4, r0, r29 -/* 803576FC 7C 05 1A 14 */ add r0, r5, r3 -/* 80357700 7C 60 F1 14 */ adde r3, r0, r30 -/* 80357704 38 A0 00 10 */ li r5, 0x10 -/* 80357708 48 00 AF 8D */ bl __shr2i -/* 8035770C 7C C3 F9 D6 */ mullw r6, r3, r31 -/* 80357710 7C A4 F8 16 */ mulhwu r5, r4, r31 -/* 80357714 39 3C 00 01 */ addi r9, r28, 1 -/* 80357718 7D 29 07 34 */ extsh r9, r9 -/* 8035771C 7C 19 48 AE */ lbzx r0, r25, r9 -/* 80357720 7C C6 2A 14 */ add r6, r6, r5 -/* 80357724 7C A4 F1 D6 */ mullw r5, r4, r30 -/* 80357728 7C E4 00 14 */ addc r7, r4, r0 -/* 8035772C 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 80357730 7C FB 49 AE */ stbx r7, r27, r9 -/* 80357734 7C 80 E8 14 */ addc r4, r0, r29 -/* 80357738 7C 06 2A 14 */ add r0, r6, r5 -/* 8035773C 7C 60 F1 14 */ adde r3, r0, r30 -/* 80357740 38 A0 00 10 */ li r5, 0x10 -/* 80357744 48 00 AF 51 */ bl __shr2i -/* 80357748 7C 60 F0 38 */ and r0, r3, r30 -/* 8035774C 7C 84 D0 38 */ and r4, r4, r26 -/* 80357750 7C A0 F9 D6 */ mullw r5, r0, r31 -/* 80357754 7C 64 F8 16 */ mulhwu r3, r4, r31 -/* 80357758 7C A5 1A 14 */ add r5, r5, r3 -/* 8035775C 7C 64 F1 D6 */ mullw r3, r4, r30 -/* 80357760 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 80357764 7C 80 E8 14 */ addc r4, r0, r29 -/* 80357768 7C 05 1A 14 */ add r0, r5, r3 -/* 8035776C 7C 60 F1 14 */ adde r3, r0, r30 -/* 80357770 38 A0 00 10 */ li r5, 0x10 -/* 80357774 48 00 AF 21 */ bl __shr2i -/* 80357778 7C C3 F9 D6 */ mullw r6, r3, r31 -/* 8035777C 7C A4 F8 16 */ mulhwu r5, r4, r31 -/* 80357780 39 3C 00 02 */ addi r9, r28, 2 -/* 80357784 7D 29 07 34 */ extsh r9, r9 -/* 80357788 7C 19 48 AE */ lbzx r0, r25, r9 -/* 8035778C 7C C6 2A 14 */ add r6, r6, r5 -/* 80357790 7C A4 F1 D6 */ mullw r5, r4, r30 -/* 80357794 7C E4 00 14 */ addc r7, r4, r0 -/* 80357798 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 8035779C 7C FB 49 AE */ stbx r7, r27, r9 -/* 803577A0 7C 80 E8 14 */ addc r4, r0, r29 -/* 803577A4 7C 06 2A 14 */ add r0, r6, r5 -/* 803577A8 7C 60 F1 14 */ adde r3, r0, r30 -/* 803577AC 38 A0 00 10 */ li r5, 0x10 -/* 803577B0 48 00 AE E5 */ bl __shr2i -/* 803577B4 7C 60 F0 38 */ and r0, r3, r30 -/* 803577B8 7C 84 D0 38 */ and r4, r4, r26 -/* 803577BC 7C A0 F9 D6 */ mullw r5, r0, r31 -/* 803577C0 7C 64 F8 16 */ mulhwu r3, r4, r31 -/* 803577C4 7C A5 1A 14 */ add r5, r5, r3 -/* 803577C8 7C 64 F1 D6 */ mullw r3, r4, r30 -/* 803577CC 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 803577D0 7C 80 E8 14 */ addc r4, r0, r29 -/* 803577D4 7C 05 1A 14 */ add r0, r5, r3 -/* 803577D8 7C 60 F1 14 */ adde r3, r0, r30 -/* 803577DC 38 A0 00 10 */ li r5, 0x10 -/* 803577E0 48 00 AE B5 */ bl __shr2i -/* 803577E4 7C C3 F9 D6 */ mullw r6, r3, r31 -/* 803577E8 7C A4 F8 16 */ mulhwu r5, r4, r31 -/* 803577EC 39 3C 00 03 */ addi r9, r28, 3 -/* 803577F0 7D 29 07 34 */ extsh r9, r9 -/* 803577F4 7C 19 48 AE */ lbzx r0, r25, r9 -/* 803577F8 7C C6 2A 14 */ add r6, r6, r5 -/* 803577FC 7C A4 F1 D6 */ mullw r5, r4, r30 -/* 80357800 7C E4 00 14 */ addc r7, r4, r0 -/* 80357804 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 80357808 7C FB 49 AE */ stbx r7, r27, r9 -/* 8035780C 7C 80 E8 14 */ addc r4, r0, r29 -/* 80357810 7C 06 2A 14 */ add r0, r6, r5 -/* 80357814 7C 60 F1 14 */ adde r3, r0, r30 -/* 80357818 38 A0 00 10 */ li r5, 0x10 -/* 8035781C 48 00 AE 79 */ bl __shr2i -/* 80357820 7C 60 F0 38 */ and r0, r3, r30 -/* 80357824 7C 84 D0 38 */ and r4, r4, r26 -/* 80357828 7C A0 F9 D6 */ mullw r5, r0, r31 -/* 8035782C 7C 64 F8 16 */ mulhwu r3, r4, r31 -/* 80357830 7C A5 1A 14 */ add r5, r5, r3 -/* 80357834 7C 64 F1 D6 */ mullw r3, r4, r30 -/* 80357838 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 8035783C 7C 80 E8 14 */ addc r4, r0, r29 -/* 80357840 7C 05 1A 14 */ add r0, r5, r3 -/* 80357844 7C 60 F1 14 */ adde r3, r0, r30 -/* 80357848 38 A0 00 10 */ li r5, 0x10 -/* 8035784C 48 00 AE 49 */ bl __shr2i -/* 80357850 7C C3 F9 D6 */ mullw r6, r3, r31 -/* 80357854 7C A4 F8 16 */ mulhwu r5, r4, r31 -/* 80357858 39 3C 00 04 */ addi r9, r28, 4 -/* 8035785C 7D 29 07 34 */ extsh r9, r9 -/* 80357860 7C 19 48 AE */ lbzx r0, r25, r9 -/* 80357864 7C C6 2A 14 */ add r6, r6, r5 -/* 80357868 7C A4 F1 D6 */ mullw r5, r4, r30 -/* 8035786C 7C E4 00 14 */ addc r7, r4, r0 -/* 80357870 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 80357874 7C FB 49 AE */ stbx r7, r27, r9 -/* 80357878 7C 80 E8 14 */ addc r4, r0, r29 -/* 8035787C 7C 06 2A 14 */ add r0, r6, r5 -/* 80357880 7C 60 F1 14 */ adde r3, r0, r30 -/* 80357884 38 A0 00 10 */ li r5, 0x10 -/* 80357888 48 00 AE 0D */ bl __shr2i -/* 8035788C 7C 60 F0 38 */ and r0, r3, r30 -/* 80357890 7C 84 D0 38 */ and r4, r4, r26 -/* 80357894 7C A0 F9 D6 */ mullw r5, r0, r31 -/* 80357898 7C 64 F8 16 */ mulhwu r3, r4, r31 -/* 8035789C 7C A5 1A 14 */ add r5, r5, r3 -/* 803578A0 7C 64 F1 D6 */ mullw r3, r4, r30 -/* 803578A4 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 803578A8 7C 80 E8 14 */ addc r4, r0, r29 -/* 803578AC 7C 05 1A 14 */ add r0, r5, r3 -/* 803578B0 7C 60 F1 14 */ adde r3, r0, r30 -/* 803578B4 38 A0 00 10 */ li r5, 0x10 -/* 803578B8 48 00 AD DD */ bl __shr2i -/* 803578BC 7C C3 F9 D6 */ mullw r6, r3, r31 -/* 803578C0 7C A4 F8 16 */ mulhwu r5, r4, r31 -/* 803578C4 39 3C 00 05 */ addi r9, r28, 5 -/* 803578C8 7D 29 07 34 */ extsh r9, r9 -/* 803578CC 7C 19 48 AE */ lbzx r0, r25, r9 -/* 803578D0 7C C6 2A 14 */ add r6, r6, r5 -/* 803578D4 7C A4 F1 D6 */ mullw r5, r4, r30 -/* 803578D8 7C E4 00 14 */ addc r7, r4, r0 -/* 803578DC 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 803578E0 7C FB 49 AE */ stbx r7, r27, r9 -/* 803578E4 7C 80 E8 14 */ addc r4, r0, r29 -/* 803578E8 7C 06 2A 14 */ add r0, r6, r5 -/* 803578EC 7C 60 F1 14 */ adde r3, r0, r30 -/* 803578F0 38 A0 00 10 */ li r5, 0x10 -/* 803578F4 48 00 AD A1 */ bl __shr2i -/* 803578F8 7C 60 F0 38 */ and r0, r3, r30 -/* 803578FC 7C 84 D0 38 */ and r4, r4, r26 -/* 80357900 7C A0 F9 D6 */ mullw r5, r0, r31 -/* 80357904 7C 64 F8 16 */ mulhwu r3, r4, r31 -/* 80357908 7C A5 1A 14 */ add r5, r5, r3 -/* 8035790C 7C 64 F1 D6 */ mullw r3, r4, r30 -/* 80357910 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 80357914 7C 80 E8 14 */ addc r4, r0, r29 -/* 80357918 7C 05 1A 14 */ add r0, r5, r3 -/* 8035791C 7C 60 F1 14 */ adde r3, r0, r30 -/* 80357920 38 A0 00 10 */ li r5, 0x10 -/* 80357924 48 00 AD 71 */ bl __shr2i -/* 80357928 7C C3 F9 D6 */ mullw r6, r3, r31 -/* 8035792C 7C A4 F8 16 */ mulhwu r5, r4, r31 -/* 80357930 39 3C 00 06 */ addi r9, r28, 6 -/* 80357934 7D 29 07 34 */ extsh r9, r9 -/* 80357938 7C 19 48 AE */ lbzx r0, r25, r9 -/* 8035793C 7C C6 2A 14 */ add r6, r6, r5 -/* 80357940 7C A4 F1 D6 */ mullw r5, r4, r30 -/* 80357944 7C E4 00 14 */ addc r7, r4, r0 -/* 80357948 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 8035794C 7C FB 49 AE */ stbx r7, r27, r9 -/* 80357950 7C 80 E8 14 */ addc r4, r0, r29 -/* 80357954 7C 06 2A 14 */ add r0, r6, r5 -/* 80357958 7C 60 F1 14 */ adde r3, r0, r30 -/* 8035795C 38 A0 00 10 */ li r5, 0x10 -/* 80357960 48 00 AD 35 */ bl __shr2i -/* 80357964 7C 60 F0 38 */ and r0, r3, r30 -/* 80357968 7C 84 D0 38 */ and r4, r4, r26 -/* 8035796C 7C A0 F9 D6 */ mullw r5, r0, r31 -/* 80357970 7C 64 F8 16 */ mulhwu r3, r4, r31 -/* 80357974 7C A5 1A 14 */ add r5, r5, r3 -/* 80357978 7C 64 F1 D6 */ mullw r3, r4, r30 -/* 8035797C 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 80357980 7C 80 E8 14 */ addc r4, r0, r29 -/* 80357984 7C 05 1A 14 */ add r0, r5, r3 -/* 80357988 7C 60 F1 14 */ adde r3, r0, r30 -/* 8035798C 38 A0 00 10 */ li r5, 0x10 -/* 80357990 48 00 AD 05 */ bl __shr2i -/* 80357994 7C C3 F9 D6 */ mullw r6, r3, r31 -/* 80357998 7C A4 F8 16 */ mulhwu r5, r4, r31 -/* 8035799C 39 3C 00 07 */ addi r9, r28, 7 -/* 803579A0 7D 29 07 34 */ extsh r9, r9 -/* 803579A4 7C 19 48 AE */ lbzx r0, r25, r9 -/* 803579A8 7C C6 2A 14 */ add r6, r6, r5 -/* 803579AC 7C A4 F1 D6 */ mullw r5, r4, r30 -/* 803579B0 7C E4 00 14 */ addc r7, r4, r0 -/* 803579B4 7C 04 F9 D6 */ mullw r0, r4, r31 -/* 803579B8 7C FB 49 AE */ stbx r7, r27, r9 -/* 803579BC 7C 80 E8 14 */ addc r4, r0, r29 -/* 803579C0 7C 06 2A 14 */ add r0, r6, r5 -/* 803579C4 7C 60 F1 14 */ adde r3, r0, r30 -/* 803579C8 38 A0 00 10 */ li r5, 0x10 -/* 803579CC 48 00 AC C9 */ bl __shr2i -/* 803579D0 7C 9A D0 38 */ and r26, r4, r26 -/* 803579D4 7C 7E F0 38 */ and r30, r3, r30 -/* 803579D8 3B 18 00 08 */ addi r24, r24, 8 -/* 803579DC 3B 9C 00 08 */ addi r28, r28, 8 -lbl_803579E0: -/* 803579E0 7F 80 07 34 */ extsh r0, r28 -/* 803579E4 7C 00 B8 00 */ cmpw r0, r23 -/* 803579E8 41 80 FC 88 */ blt lbl_80357670 -/* 803579EC 48 00 02 18 */ b lbl_80357C04 -lbl_803579F0: -/* 803579F0 3C 60 41 C6 */ lis r3, 0x41C6 /* 0x41C64E6D@ha */ -/* 803579F4 3B 23 4E 6D */ addi r25, r3, 0x4E6D /* 0x41C64E6D@l */ -/* 803579F8 48 00 00 80 */ b lbl_80357A78 -lbl_803579FC: -/* 803579FC 7C BE C9 D6 */ mullw r5, r30, r25 -/* 80357A00 7C 7A C8 16 */ mulhwu r3, r26, r25 -/* 80357A04 3B 00 00 00 */ li r24, 0 -/* 80357A08 7C A5 1A 14 */ add r5, r5, r3 -/* 80357A0C 7C 7A C1 D6 */ mullw r3, r26, r24 -/* 80357A10 7C 1A C9 D6 */ mullw r0, r26, r25 -/* 80357A14 3A E0 30 39 */ li r23, 0x3039 -/* 80357A18 7C 80 B8 14 */ addc r4, r0, r23 -/* 80357A1C 7C 05 1A 14 */ add r0, r5, r3 -/* 80357A20 7C 60 C1 14 */ adde r3, r0, r24 -/* 80357A24 38 A0 00 10 */ li r5, 0x10 -/* 80357A28 48 00 AC 6D */ bl __shr2i -/* 80357A2C 7C C3 C9 D6 */ mullw r6, r3, r25 -/* 80357A30 88 1D 00 00 */ lbz r0, 0(r29) -/* 80357A34 7C A4 C8 16 */ mulhwu r5, r4, r25 -/* 80357A38 7C C6 2A 14 */ add r6, r6, r5 -/* 80357A3C 7D 04 00 14 */ addc r8, r4, r0 -/* 80357A40 7F 87 07 34 */ extsh r7, r28 -/* 80357A44 7C A4 C1 D6 */ mullw r5, r4, r24 -/* 80357A48 7D 1B 39 AE */ stbx r8, r27, r7 -/* 80357A4C 7C 04 C9 D6 */ mullw r0, r4, r25 -/* 80357A50 7C 80 B8 14 */ addc r4, r0, r23 -/* 80357A54 7C 06 2A 14 */ add r0, r6, r5 -/* 80357A58 7C 60 C1 14 */ adde r3, r0, r24 -/* 80357A5C 38 A0 00 10 */ li r5, 0x10 -/* 80357A60 48 00 AC 35 */ bl __shr2i -/* 80357A64 38 00 7F FF */ li r0, 0x7fff -/* 80357A68 7C 9A 00 38 */ and r26, r4, r0 -/* 80357A6C 7C 7E C0 38 */ and r30, r3, r24 -/* 80357A70 3B BD 00 01 */ addi r29, r29, 1 -/* 80357A74 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80357A78: -/* 80357A78 7F 80 07 34 */ extsh r0, r28 -/* 80357A7C 2C 00 00 0C */ cmpwi r0, 0xc -/* 80357A80 41 80 FF 7C */ blt lbl_803579FC -/* 80357A84 38 60 00 00 */ li r3, 0 -/* 80357A88 4B FE 8A D5 */ bl __OSUnlockSramEx -/* 80357A8C 92 5B 00 1C */ stw r18, 0x1c(r27) -/* 80357A90 3A 40 00 00 */ li r18, 0 -/* 80357A94 38 7B 00 00 */ addi r3, r27, 0 -/* 80357A98 92 BB 00 10 */ stw r21, 0x10(r27) -/* 80357A9C 38 BB 01 FC */ addi r5, r27, 0x1fc -/* 80357AA0 38 DB 01 FE */ addi r6, r27, 0x1fe -/* 80357AA4 92 9B 00 0C */ stw r20, 0xc(r27) -/* 80357AA8 38 80 01 FC */ li r4, 0x1fc -/* 80357AAC B2 5B 00 20 */ sth r18, 0x20(r27) -/* 80357AB0 80 E1 00 18 */ lwz r7, 0x18(r1) -/* 80357AB4 A0 07 00 08 */ lhz r0, 8(r7) -/* 80357AB8 B0 1B 00 22 */ sth r0, 0x22(r27) -/* 80357ABC 4B FF DF 25 */ bl __CARDCheckSum -/* 80357AC0 48 00 00 4C */ b lbl_80357B0C -lbl_80357AC4: -/* 80357AC4 80 81 00 18 */ lwz r4, 0x18(r1) -/* 80357AC8 7E 43 07 34 */ extsh r3, r18 -/* 80357ACC 38 03 00 01 */ addi r0, r3, 1 -/* 80357AD0 80 64 00 80 */ lwz r3, 0x80(r4) -/* 80357AD4 54 00 68 24 */ slwi r0, r0, 0xd -/* 80357AD8 38 80 00 FF */ li r4, 0xff -/* 80357ADC 7E 83 02 14 */ add r20, r3, r0 -/* 80357AE0 38 74 00 00 */ addi r3, r20, 0 -/* 80357AE4 38 A0 20 00 */ li r5, 0x2000 -/* 80357AE8 4B CA B9 71 */ bl memset -/* 80357AEC 38 94 1F C0 */ addi r4, r20, 0x1fc0 -/* 80357AF0 B2 54 1F FA */ sth r18, 0x1ffa(r20) -/* 80357AF4 38 74 00 00 */ addi r3, r20, 0 -/* 80357AF8 38 A4 00 3C */ addi r5, r4, 0x3c -/* 80357AFC 38 C4 00 3E */ addi r6, r4, 0x3e -/* 80357B00 38 80 1F FC */ li r4, 0x1ffc -/* 80357B04 4B FF DE DD */ bl __CARDCheckSum -/* 80357B08 3A 52 00 01 */ addi r18, r18, 1 -lbl_80357B0C: -/* 80357B0C 7E 40 07 34 */ extsh r0, r18 -/* 80357B10 2C 00 00 02 */ cmpwi r0, 2 -/* 80357B14 41 80 FF B0 */ blt lbl_80357AC4 -/* 80357B18 3A 40 00 00 */ li r18, 0 -/* 80357B1C 48 00 00 60 */ b lbl_80357B7C -lbl_80357B20: -/* 80357B20 80 81 00 18 */ lwz r4, 0x18(r1) -/* 80357B24 7E 43 07 34 */ extsh r3, r18 -/* 80357B28 38 03 00 03 */ addi r0, r3, 3 -/* 80357B2C 80 64 00 80 */ lwz r3, 0x80(r4) -/* 80357B30 54 00 68 24 */ slwi r0, r0, 0xd -/* 80357B34 38 80 00 00 */ li r4, 0 -/* 80357B38 7E 83 02 14 */ add r20, r3, r0 -/* 80357B3C 38 74 00 00 */ addi r3, r20, 0 -/* 80357B40 38 A0 20 00 */ li r5, 0x2000 -/* 80357B44 4B CA B9 15 */ bl memset -/* 80357B48 B2 54 00 04 */ sth r18, 4(r20) -/* 80357B4C 38 00 00 04 */ li r0, 4 -/* 80357B50 38 B4 00 00 */ addi r5, r20, 0 -/* 80357B54 80 81 00 18 */ lwz r4, 0x18(r1) -/* 80357B58 38 74 00 04 */ addi r3, r20, 4 -/* 80357B5C 38 D4 00 02 */ addi r6, r20, 2 -/* 80357B60 A0 E4 00 10 */ lhz r7, 0x10(r4) -/* 80357B64 38 80 1F FC */ li r4, 0x1ffc -/* 80357B68 38 E7 FF FB */ addi r7, r7, -5 -/* 80357B6C B0 F4 00 06 */ sth r7, 6(r20) -/* 80357B70 B0 14 00 08 */ sth r0, 8(r20) -/* 80357B74 4B FF DE 6D */ bl __CARDCheckSum -/* 80357B78 3A 52 00 01 */ addi r18, r18, 1 -lbl_80357B7C: -/* 80357B7C 7E 40 07 34 */ extsh r0, r18 -/* 80357B80 2C 00 00 02 */ cmpwi r0, 2 -/* 80357B84 41 80 FF 9C */ blt lbl_80357B20 -/* 80357B88 28 13 00 00 */ cmplwi r19, 0 -/* 80357B8C 41 82 00 0C */ beq lbl_80357B98 -/* 80357B90 7E 60 9B 78 */ mr r0, r19 -/* 80357B94 48 00 00 0C */ b lbl_80357BA0 -lbl_80357B98: -/* 80357B98 3C 60 80 35 */ lis r3, __CARDDefaultApiCallback@ha /* 0x80352A30@ha */ -/* 80357B9C 38 03 2A 30 */ addi r0, r3, __CARDDefaultApiCallback@l /* 0x80352A30@l */ -lbl_80357BA0: -/* 80357BA0 80 A1 00 18 */ lwz r5, 0x18(r1) -/* 80357BA4 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000A000@ha */ -/* 80357BA8 38 83 A0 00 */ addi r4, r3, 0xA000 /* 0x0000A000@l */ -/* 80357BAC 90 05 00 D0 */ stw r0, 0xd0(r5) -/* 80357BB0 80 61 00 18 */ lwz r3, 0x18(r1) -/* 80357BB4 80 63 00 80 */ lwz r3, 0x80(r3) -/* 80357BB8 4B FE 3A 25 */ bl DCStoreRange -/* 80357BBC 80 81 00 18 */ lwz r4, 0x18(r1) -/* 80357BC0 38 00 00 00 */ li r0, 0 -/* 80357BC4 3C 60 80 35 */ lis r3, FormatCallback@ha /* 0x80357484@ha */ -/* 80357BC8 90 04 00 28 */ stw r0, 0x28(r4) -/* 80357BCC 38 A3 74 84 */ addi r5, r3, FormatCallback@l /* 0x80357484@l */ -/* 80357BD0 38 76 00 00 */ addi r3, r22, 0 -/* 80357BD4 80 C1 00 18 */ lwz r6, 0x18(r1) -/* 80357BD8 80 86 00 0C */ lwz r4, 0xc(r6) -/* 80357BDC 80 06 00 28 */ lwz r0, 0x28(r6) -/* 80357BE0 7C 84 01 D6 */ mullw r4, r4, r0 -/* 80357BE4 4B FF BD D5 */ bl __CARDEraseSector -/* 80357BE8 7C 72 1B 79 */ or. r18, r3, r3 -/* 80357BEC 40 80 00 10 */ bge lbl_80357BFC -/* 80357BF0 80 61 00 18 */ lwz r3, 0x18(r1) -/* 80357BF4 7E 44 93 78 */ mr r4, r18 -/* 80357BF8 4B FF C0 75 */ bl __CARDPutControlBlock -lbl_80357BFC: -/* 80357BFC 7E 43 93 78 */ mr r3, r18 -/* 80357C00 48 00 00 0C */ b lbl_80357C0C -lbl_80357C04: -/* 80357C04 7F B9 02 14 */ add r29, r25, r0 -/* 80357C08 4B FF FD E8 */ b lbl_803579F0 -lbl_80357C0C: -/* 80357C0C BA 41 00 20 */ lmw r18, 0x20(r1) -/* 80357C10 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 80357C14 38 21 00 58 */ addi r1, r1, 0x58 -/* 80357C18 7C 08 03 A6 */ mtlr r0 -/* 80357C1C 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDMount/CARDUnmount.s b/asm/dolphin/card/CARDMount/CARDUnmount.s deleted file mode 100644 index 2caacfa119..0000000000 --- a/asm/dolphin/card/CARDMount/CARDUnmount.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_803573D8: -/* 803573D8 7C 08 02 A6 */ mflr r0 -/* 803573DC 90 01 00 04 */ stw r0, 4(r1) -/* 803573E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803573E4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803573E8 38 81 00 0C */ addi r4, r1, 0xc -/* 803573EC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803573F0 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803573F4 3B A3 00 00 */ addi r29, r3, 0 -/* 803573F8 4B FF C7 BD */ bl __CARDGetControlBlock -/* 803573FC 2C 03 00 00 */ cmpwi r3, 0 -/* 80357400 40 80 00 08 */ bge lbl_80357408 -/* 80357404 48 00 00 64 */ b lbl_80357468 -lbl_80357408: -/* 80357408 1C 9D 01 10 */ mulli r4, r29, 0x110 -/* 8035740C 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80357410 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80357414 7F C0 22 14 */ add r30, r0, r4 -/* 80357418 4B FE 62 DD */ bl OSDisableInterrupts -/* 8035741C 80 1E 00 00 */ lwz r0, 0(r30) -/* 80357420 3B E3 00 00 */ addi r31, r3, 0 -/* 80357424 2C 00 00 00 */ cmpwi r0, 0 -/* 80357428 41 82 00 34 */ beq lbl_8035745C -/* 8035742C 38 7D 00 00 */ addi r3, r29, 0 -/* 80357430 38 80 00 00 */ li r4, 0 -/* 80357434 4B FE BF 49 */ bl EXISetExiCallback -/* 80357438 7F A3 EB 78 */ mr r3, r29 -/* 8035743C 4B FE C3 71 */ bl EXIDetach -/* 80357440 38 7E 00 E0 */ addi r3, r30, 0xe0 -/* 80357444 4B FE 37 F9 */ bl OSCancelAlarm -/* 80357448 38 60 00 00 */ li r3, 0 -/* 8035744C 90 7E 00 00 */ stw r3, 0(r30) -/* 80357450 38 00 FF FD */ li r0, -3 -/* 80357454 90 1E 00 04 */ stw r0, 4(r30) -/* 80357458 90 7E 00 24 */ stw r3, 0x24(r30) -lbl_8035745C: -/* 8035745C 7F E3 FB 78 */ mr r3, r31 -/* 80357460 4B FE 62 BD */ bl OSRestoreInterrupts -/* 80357464 38 60 00 00 */ li r3, 0 -lbl_80357468: -/* 80357468 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8035746C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80357470 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80357474 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80357478 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035747C 7C 08 03 A6 */ mtlr r0 -/* 80357480 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDMount/DoMount.s b/asm/dolphin/card/CARDMount/DoMount.s deleted file mode 100644 index 8076d24992..0000000000 --- a/asm/dolphin/card/CARDMount/DoMount.s +++ /dev/null @@ -1,300 +0,0 @@ -lbl_80356BC8: -/* 80356BC8 7C 08 02 A6 */ mflr r0 -/* 80356BCC 90 01 00 04 */ stw r0, 4(r1) -/* 80356BD0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80356BD4 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80356BD8 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80356BDC 93 A1 00 24 */ stw r29, 0x24(r1) -/* 80356BE0 3B A3 00 00 */ addi r29, r3, 0 -/* 80356BE4 1C 9D 01 10 */ mulli r4, r29, 0x110 -/* 80356BE8 93 81 00 20 */ stw r28, 0x20(r1) -/* 80356BEC 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80356BF0 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80356BF4 7C 60 22 14 */ add r3, r0, r4 -/* 80356BF8 80 03 00 24 */ lwz r0, 0x24(r3) -/* 80356BFC 3B E3 00 00 */ addi r31, r3, 0 -/* 80356C00 2C 00 00 00 */ cmpwi r0, 0 -/* 80356C04 40 82 02 F0 */ bne lbl_80356EF4 -/* 80356C08 38 7D 00 00 */ addi r3, r29, 0 -/* 80356C0C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 80356C10 38 80 00 00 */ li r4, 0 -/* 80356C14 4B FE D6 25 */ bl EXIGetID -/* 80356C18 2C 03 00 00 */ cmpwi r3, 0 -/* 80356C1C 40 82 00 0C */ bne lbl_80356C28 -/* 80356C20 3B C0 FF FD */ li r30, -3 -/* 80356C24 48 00 00 20 */ b lbl_80356C44 -lbl_80356C28: -/* 80356C28 80 61 00 18 */ lwz r3, 0x18(r1) -/* 80356C2C 4B FF FD 1D */ bl IsCard -/* 80356C30 2C 03 00 00 */ cmpwi r3, 0 -/* 80356C34 41 82 00 0C */ beq lbl_80356C40 -/* 80356C38 3B C0 00 00 */ li r30, 0 -/* 80356C3C 48 00 00 08 */ b lbl_80356C44 -lbl_80356C40: -/* 80356C40 3B C0 FF FE */ li r30, -2 -lbl_80356C44: -/* 80356C44 2C 1E 00 00 */ cmpwi r30, 0 -/* 80356C48 41 80 03 88 */ blt lbl_80356FD0 -/* 80356C4C 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80356C50 3C 80 80 3D */ lis r4, SectorSizeTable@ha /* 0x803D2000@ha */ -/* 80356C54 38 A4 20 00 */ addi r5, r4, SectorSizeTable@l /* 0x803D2000@l */ -/* 80356C58 90 1F 01 08 */ stw r0, 0x108(r31) -/* 80356C5C 3C 60 80 3D */ lis r3, LatencyTable@ha /* 0x803D2020@ha */ -/* 80356C60 38 03 20 20 */ addi r0, r3, LatencyTable@l /* 0x803D2020@l */ -/* 80356C64 80 C1 00 18 */ lwz r6, 0x18(r1) -/* 80356C68 38 7D 00 00 */ addi r3, r29, 0 -/* 80356C6C 38 9F 00 12 */ addi r4, r31, 0x12 -/* 80356C70 54 C6 06 3A */ rlwinm r6, r6, 0, 0x18, 0x1d -/* 80356C74 B0 DF 00 08 */ sth r6, 8(r31) -/* 80356C78 80 C1 00 18 */ lwz r6, 0x18(r1) -/* 80356C7C 54 C6 BE FA */ rlwinm r6, r6, 0x17, 0x1b, 0x1d -/* 80356C80 7C A5 32 14 */ add r5, r5, r6 -/* 80356C84 80 A5 00 00 */ lwz r5, 0(r5) -/* 80356C88 90 BF 00 0C */ stw r5, 0xc(r31) -/* 80356C8C A0 DF 00 08 */ lhz r6, 8(r31) -/* 80356C90 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 80356C94 54 C6 A0 16 */ slwi r6, r6, 0x14 -/* 80356C98 7C C6 1E 70 */ srawi r6, r6, 3 -/* 80356C9C 7C C6 01 94 */ addze r6, r6 -/* 80356CA0 7C A6 2B D6 */ divw r5, r6, r5 -/* 80356CA4 B0 BF 00 10 */ sth r5, 0x10(r31) -/* 80356CA8 80 A1 00 18 */ lwz r5, 0x18(r1) -/* 80356CAC 54 A5 D6 FA */ rlwinm r5, r5, 0x1a, 0x1b, 0x1d -/* 80356CB0 7C A0 2A 14 */ add r5, r0, r5 -/* 80356CB4 80 05 00 00 */ lwz r0, 0(r5) -/* 80356CB8 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80356CBC 4B FF C2 79 */ bl __CARDReadVendorID -/* 80356CC0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80356CC4 41 80 03 0C */ blt lbl_80356FD0 -/* 80356CC8 4B FF D2 41 */ bl CARDGetFastMode -/* 80356CCC 2C 03 00 00 */ cmpwi r3, 0 -/* 80356CD0 41 82 00 20 */ beq lbl_80356CF0 -/* 80356CD4 A0 1F 00 12 */ lhz r0, 0x12(r31) -/* 80356CD8 7C 00 46 70 */ srawi r0, r0, 8 -/* 80356CDC 2C 00 00 EC */ cmpwi r0, 0xec -/* 80356CE0 40 82 00 10 */ bne lbl_80356CF0 -/* 80356CE4 38 00 02 00 */ li r0, 0x200 -/* 80356CE8 B0 1F 00 0A */ sth r0, 0xa(r31) -/* 80356CEC 48 00 00 0C */ b lbl_80356CF8 -lbl_80356CF0: -/* 80356CF0 38 00 00 80 */ li r0, 0x80 -/* 80356CF4 B0 1F 00 0A */ sth r0, 0xa(r31) -lbl_80356CF8: -/* 80356CF8 7F A3 EB 78 */ mr r3, r29 -/* 80356CFC 4B FF C3 29 */ bl __CARDClearStatus -/* 80356D00 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80356D04 41 80 02 CC */ blt lbl_80356FD0 -/* 80356D08 38 7D 00 00 */ addi r3, r29, 0 -/* 80356D0C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80356D10 4B FF C1 35 */ bl __CARDReadStatus -/* 80356D14 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80356D18 41 80 02 B8 */ blt lbl_80356FD0 -/* 80356D1C 7F A3 EB 78 */ mr r3, r29 -/* 80356D20 4B FE C8 4D */ bl EXIProbe -/* 80356D24 2C 03 00 00 */ cmpwi r3, 0 -/* 80356D28 40 82 00 0C */ bne lbl_80356D34 -/* 80356D2C 3B C0 FF FD */ li r30, -3 -/* 80356D30 48 00 02 A0 */ b lbl_80356FD0 -lbl_80356D34: -/* 80356D34 88 01 00 14 */ lbz r0, 0x14(r1) -/* 80356D38 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 80356D3C 40 82 01 14 */ bne lbl_80356E50 -/* 80356D40 38 7D 00 00 */ addi r3, r29, 0 -/* 80356D44 38 9F 00 18 */ addi r4, r31, 0x18 -/* 80356D48 4B FF D5 51 */ bl __CARDUnlock -/* 80356D4C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80356D50 41 80 02 80 */ blt lbl_80356FD0 -/* 80356D54 4B FE 94 4D */ bl __OSLockSramEx -/* 80356D58 1C 1D 00 0C */ mulli r0, r29, 0xc -/* 80356D5C 7C 83 02 14 */ add r4, r3, r0 -/* 80356D60 88 1F 00 18 */ lbz r0, 0x18(r31) -/* 80356D64 38 BF 00 18 */ addi r5, r31, 0x18 -/* 80356D68 98 04 00 00 */ stb r0, 0(r4) -/* 80356D6C 39 05 00 02 */ addi r8, r5, 2 -/* 80356D70 39 25 00 03 */ addi r9, r5, 3 -/* 80356D74 88 FF 00 18 */ lbz r7, 0x18(r31) -/* 80356D78 39 45 00 04 */ addi r10, r5, 4 -/* 80356D7C 88 1F 00 19 */ lbz r0, 0x19(r31) -/* 80356D80 39 65 00 05 */ addi r11, r5, 5 -/* 80356D84 39 85 00 06 */ addi r12, r5, 6 -/* 80356D88 98 04 00 01 */ stb r0, 1(r4) -/* 80356D8C 3B 85 00 07 */ addi r28, r5, 7 -/* 80356D90 38 A0 00 08 */ li r5, 8 -/* 80356D94 88 1F 00 19 */ lbz r0, 0x19(r31) -/* 80356D98 88 C8 00 00 */ lbz r6, 0(r8) -/* 80356D9C 7C 07 02 14 */ add r0, r7, r0 -/* 80356DA0 98 C4 00 02 */ stb r6, 2(r4) -/* 80356DA4 88 E8 00 00 */ lbz r7, 0(r8) -/* 80356DA8 88 C9 00 00 */ lbz r6, 0(r9) -/* 80356DAC 7C 00 3A 14 */ add r0, r0, r7 -/* 80356DB0 98 C4 00 03 */ stb r6, 3(r4) -/* 80356DB4 88 E9 00 00 */ lbz r7, 0(r9) -/* 80356DB8 88 CA 00 00 */ lbz r6, 0(r10) -/* 80356DBC 7C 00 3A 14 */ add r0, r0, r7 -/* 80356DC0 98 C4 00 04 */ stb r6, 4(r4) -/* 80356DC4 88 EA 00 00 */ lbz r7, 0(r10) -/* 80356DC8 88 CB 00 00 */ lbz r6, 0(r11) -/* 80356DCC 7C 00 3A 14 */ add r0, r0, r7 -/* 80356DD0 98 C4 00 05 */ stb r6, 5(r4) -/* 80356DD4 88 EB 00 00 */ lbz r7, 0(r11) -/* 80356DD8 88 CC 00 00 */ lbz r6, 0(r12) -/* 80356DDC 7C 00 3A 14 */ add r0, r0, r7 -/* 80356DE0 98 C4 00 06 */ stb r6, 6(r4) -/* 80356DE4 88 EC 00 00 */ lbz r7, 0(r12) -/* 80356DE8 88 DC 00 00 */ lbz r6, 0(r28) -/* 80356DEC 7C 00 3A 14 */ add r0, r0, r7 -/* 80356DF0 98 C4 00 07 */ stb r6, 7(r4) -/* 80356DF4 88 DC 00 00 */ lbz r6, 0(r28) -/* 80356DF8 7C 00 32 14 */ add r0, r0, r6 -/* 80356DFC 48 00 01 F0 */ b lbl_80356FEC -lbl_80356E00: -/* 80356E00 20 85 00 0C */ subfic r4, r5, 0xc -/* 80356E04 2C 05 00 0C */ cmpwi r5, 0xc -/* 80356E08 7C 89 03 A6 */ mtctr r4 -/* 80356E0C 40 80 00 28 */ bge lbl_80356E34 -lbl_80356E10: -/* 80356E10 38 E5 00 18 */ addi r7, r5, 0x18 -/* 80356E14 7C FF 3A 14 */ add r7, r31, r7 -/* 80356E18 88 87 00 00 */ lbz r4, 0(r7) -/* 80356E1C 38 A5 00 01 */ addi r5, r5, 1 -/* 80356E20 98 86 00 00 */ stb r4, 0(r6) -/* 80356E24 38 C6 00 01 */ addi r6, r6, 1 -/* 80356E28 88 87 00 00 */ lbz r4, 0(r7) -/* 80356E2C 7C 00 22 14 */ add r0, r0, r4 -/* 80356E30 42 00 FF E0 */ bdnz lbl_80356E10 -lbl_80356E34: -/* 80356E34 7C 63 EA 14 */ add r3, r3, r29 -/* 80356E38 7C 00 00 F8 */ nor r0, r0, r0 -/* 80356E3C 98 03 00 26 */ stb r0, 0x26(r3) -/* 80356E40 38 60 00 01 */ li r3, 1 -/* 80356E44 4B FE 97 19 */ bl __OSUnlockSramEx -/* 80356E48 7F C3 F3 78 */ mr r3, r30 -/* 80356E4C 48 00 01 B0 */ b lbl_80356FFC -lbl_80356E50: -/* 80356E50 38 00 00 01 */ li r0, 1 -/* 80356E54 90 1F 00 24 */ stw r0, 0x24(r31) -/* 80356E58 4B FE 93 49 */ bl __OSLockSramEx -/* 80356E5C 1C 1D 00 0C */ mulli r0, r29, 0xc -/* 80356E60 3B C3 00 00 */ addi r30, r3, 0 -/* 80356E64 7C BE 02 14 */ add r5, r30, r0 -/* 80356E68 88 85 00 00 */ lbz r4, 0(r5) -/* 80356E6C 38 C0 00 08 */ li r6, 8 -/* 80356E70 88 05 00 01 */ lbz r0, 1(r5) -/* 80356E74 88 65 00 02 */ lbz r3, 2(r5) -/* 80356E78 7F 84 02 14 */ add r28, r4, r0 -/* 80356E7C 88 05 00 03 */ lbz r0, 3(r5) -/* 80356E80 7F 9C 1A 14 */ add r28, r28, r3 -/* 80356E84 88 65 00 04 */ lbz r3, 4(r5) -/* 80356E88 7F 9C 02 14 */ add r28, r28, r0 -/* 80356E8C 88 05 00 05 */ lbz r0, 5(r5) -/* 80356E90 7F 9C 1A 14 */ add r28, r28, r3 -/* 80356E94 88 65 00 06 */ lbz r3, 6(r5) -/* 80356E98 7F 9C 02 14 */ add r28, r28, r0 -/* 80356E9C 88 05 00 07 */ lbz r0, 7(r5) -/* 80356EA0 7F 9C 1A 14 */ add r28, r28, r3 -/* 80356EA4 7F 9C 02 14 */ add r28, r28, r0 -/* 80356EA8 48 00 01 4C */ b lbl_80356FF4 -lbl_80356EAC: -/* 80356EAC 20 06 00 0C */ subfic r0, r6, 0xc -/* 80356EB0 2C 06 00 0C */ cmpwi r6, 0xc -/* 80356EB4 7C 09 03 A6 */ mtctr r0 -/* 80356EB8 40 80 00 14 */ bge lbl_80356ECC -lbl_80356EBC: -/* 80356EBC 88 03 00 00 */ lbz r0, 0(r3) -/* 80356EC0 38 63 00 01 */ addi r3, r3, 1 -/* 80356EC4 7F 9C 02 14 */ add r28, r28, r0 -/* 80356EC8 42 00 FF F4 */ bdnz lbl_80356EBC -lbl_80356ECC: -/* 80356ECC 38 60 00 00 */ li r3, 0 -/* 80356ED0 4B FE 96 8D */ bl __OSUnlockSramEx -/* 80356ED4 7C 7E EA 14 */ add r3, r30, r29 -/* 80356ED8 7F 80 E0 F8 */ nor r0, r28, r28 -/* 80356EDC 88 63 00 26 */ lbz r3, 0x26(r3) -/* 80356EE0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80356EE4 7C 03 00 40 */ cmplw r3, r0 -/* 80356EE8 41 82 00 0C */ beq lbl_80356EF4 -/* 80356EEC 3B C0 FF FB */ li r30, -5 -/* 80356EF0 48 00 00 E0 */ b lbl_80356FD0 -lbl_80356EF4: -/* 80356EF4 80 1F 00 24 */ lwz r0, 0x24(r31) -/* 80356EF8 2C 00 00 01 */ cmpwi r0, 1 -/* 80356EFC 40 82 00 88 */ bne lbl_80356F84 -/* 80356F00 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 80356F04 3C 03 80 00 */ addis r0, r3, 0x8000 -/* 80356F08 28 00 00 04 */ cmplwi r0, 4 -/* 80356F0C 40 82 00 34 */ bne lbl_80356F40 -/* 80356F10 4B FE 92 91 */ bl __OSLockSramEx -/* 80356F14 1C 1D 00 0C */ mulli r0, r29, 0xc -/* 80356F18 7F 83 02 2E */ lhzx r28, r3, r0 -/* 80356F1C 38 60 00 00 */ li r3, 0 -/* 80356F20 4B FE 96 3D */ bl __OSUnlockSramEx -/* 80356F24 A0 0D 84 F0 */ lhz r0, __CARDVendorID+0x0(r13) -/* 80356F28 28 00 FF FF */ cmplwi r0, 0xffff -/* 80356F2C 41 82 00 0C */ beq lbl_80356F38 -/* 80356F30 7C 1C 00 40 */ cmplw r28, r0 -/* 80356F34 41 82 00 0C */ beq lbl_80356F40 -lbl_80356F38: -/* 80356F38 3B C0 FF FE */ li r30, -2 -/* 80356F3C 48 00 00 94 */ b lbl_80356FD0 -lbl_80356F40: -/* 80356F40 38 00 00 02 */ li r0, 2 -/* 80356F44 90 1F 00 24 */ stw r0, 0x24(r31) -/* 80356F48 38 7D 00 00 */ addi r3, r29, 0 -/* 80356F4C 38 80 00 01 */ li r4, 1 -/* 80356F50 4B FF BE 35 */ bl __CARDEnableInterrupt -/* 80356F54 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80356F58 41 80 00 78 */ blt lbl_80356FD0 -/* 80356F5C 3C 60 80 35 */ lis r3, __CARDExiHandler@ha /* 0x80352B40@ha */ -/* 80356F60 38 83 2B 40 */ addi r4, r3, __CARDExiHandler@l /* 0x80352B40@l */ -/* 80356F64 38 7D 00 00 */ addi r3, r29, 0 -/* 80356F68 4B FE C4 15 */ bl EXISetExiCallback -/* 80356F6C 7F A3 EB 78 */ mr r3, r29 -/* 80356F70 4B FE D1 AD */ bl EXIUnlock -/* 80356F74 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000A000@ha */ -/* 80356F78 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 80356F7C 38 84 A0 00 */ addi r4, r4, 0xA000 /* 0x0000A000@l */ -/* 80356F80 4B FE 46 01 */ bl DCInvalidateRange -lbl_80356F84: -/* 80356F84 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 80356F88 3C 60 80 35 */ lis r3, __CARDMountCallback@ha /* 0x8035701C@ha */ -/* 80356F8C 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 80356F90 38 E3 70 1C */ addi r7, r3, __CARDMountCallback@l /* 0x8035701C@l */ -/* 80356F94 38 64 FF FE */ addi r3, r4, -2 -/* 80356F98 7C 80 19 D6 */ mullw r4, r0, r3 -/* 80356F9C 80 BF 00 80 */ lwz r5, 0x80(r31) -/* 80356FA0 54 60 68 24 */ slwi r0, r3, 0xd -/* 80356FA4 7C C5 02 14 */ add r6, r5, r0 -/* 80356FA8 38 7D 00 00 */ addi r3, r29, 0 -/* 80356FAC 38 A0 20 00 */ li r5, 0x2000 -/* 80356FB0 4B FF E2 B1 */ bl __CARDRead -/* 80356FB4 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80356FB8 40 80 00 10 */ bge lbl_80356FC8 -/* 80356FBC 38 7F 00 00 */ addi r3, r31, 0 -/* 80356FC0 38 9C 00 00 */ addi r4, r28, 0 -/* 80356FC4 4B FF CC A9 */ bl __CARDPutControlBlock -lbl_80356FC8: -/* 80356FC8 7F 83 E3 78 */ mr r3, r28 -/* 80356FCC 48 00 00 30 */ b lbl_80356FFC -lbl_80356FD0: -/* 80356FD0 7F A3 EB 78 */ mr r3, r29 -/* 80356FD4 4B FE D1 49 */ bl EXIUnlock -/* 80356FD8 38 7D 00 00 */ addi r3, r29, 0 -/* 80356FDC 38 9E 00 00 */ addi r4, r30, 0 -/* 80356FE0 48 00 03 5D */ bl DoUnmount -/* 80356FE4 7F C3 F3 78 */ mr r3, r30 -/* 80356FE8 48 00 00 14 */ b lbl_80356FFC -lbl_80356FEC: -/* 80356FEC 38 C4 00 08 */ addi r6, r4, 8 -/* 80356FF0 4B FF FE 10 */ b lbl_80356E00 -lbl_80356FF4: -/* 80356FF4 38 65 00 08 */ addi r3, r5, 8 -/* 80356FF8 4B FF FE B4 */ b lbl_80356EAC -lbl_80356FFC: -/* 80356FFC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80357000 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80357004 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80357008 83 A1 00 24 */ lwz r29, 0x24(r1) -/* 8035700C 83 81 00 20 */ lwz r28, 0x20(r1) -/* 80357010 38 21 00 30 */ addi r1, r1, 0x30 -/* 80357014 7C 08 03 A6 */ mtlr r0 -/* 80357018 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDOpen/CARDOpen.s b/asm/dolphin/card/CARDOpen/CARDOpen.s deleted file mode 100644 index 9c8a7fd9c5..0000000000 --- a/asm/dolphin/card/CARDOpen/CARDOpen.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_80357F98: -/* 80357F98 7C 08 02 A6 */ mflr r0 -/* 80357F9C 90 01 00 04 */ stw r0, 4(r1) -/* 80357FA0 38 00 FF FF */ li r0, -1 -/* 80357FA4 94 21 FF C8 */ stwu r1, -0x38(r1) -/* 80357FA8 BF 21 00 1C */ stmw r25, 0x1c(r1) -/* 80357FAC 3B 24 00 00 */ addi r25, r4, 0 -/* 80357FB0 3B C5 00 00 */ addi r30, r5, 0 -/* 80357FB4 3B A3 00 00 */ addi r29, r3, 0 -/* 80357FB8 38 81 00 14 */ addi r4, r1, 0x14 -/* 80357FBC 90 05 00 00 */ stw r0, 0(r5) -/* 80357FC0 4B FF BB F5 */ bl __CARDGetControlBlock -/* 80357FC4 2C 03 00 00 */ cmpwi r3, 0 -/* 80357FC8 40 80 00 08 */ bge lbl_80357FD0 -/* 80357FCC 48 00 00 D4 */ b lbl_803580A0 -lbl_80357FD0: -/* 80357FD0 83 41 00 14 */ lwz r26, 0x14(r1) -/* 80357FD4 80 1A 00 00 */ lwz r0, 0(r26) -/* 80357FD8 2C 00 00 00 */ cmpwi r0, 0 -/* 80357FDC 40 82 00 0C */ bne lbl_80357FE8 -/* 80357FE0 3B 40 FF FD */ li r26, -3 -/* 80357FE4 48 00 00 5C */ b lbl_80358040 -lbl_80357FE8: -/* 80357FE8 7F 43 D3 78 */ mr r3, r26 -/* 80357FEC 4B FF D7 91 */ bl __CARDGetDirBlock -/* 80357FF0 3B 63 00 00 */ addi r27, r3, 0 -/* 80357FF4 3B 80 00 00 */ li r28, 0 -lbl_80357FF8: -/* 80357FF8 38 7A 00 00 */ addi r3, r26, 0 -/* 80357FFC 38 9B 00 00 */ addi r4, r27, 0 -/* 80358000 4B FF FC DD */ bl __CARDAccess -/* 80358004 2C 03 00 00 */ cmpwi r3, 0 -/* 80358008 41 80 00 24 */ blt lbl_8035802C -/* 8035800C 38 7B 00 00 */ addi r3, r27, 0 -/* 80358010 38 99 00 00 */ addi r4, r25, 0 -/* 80358014 4B FF FC 61 */ bl __CARDCompareFileName -/* 80358018 2C 03 00 00 */ cmpwi r3, 0 -/* 8035801C 41 82 00 10 */ beq lbl_8035802C -/* 80358020 3B FC 00 00 */ addi r31, r28, 0 -/* 80358024 3B 40 00 00 */ li r26, 0 -/* 80358028 48 00 00 18 */ b lbl_80358040 -lbl_8035802C: -/* 8035802C 3B 9C 00 01 */ addi r28, r28, 1 -/* 80358030 2C 1C 00 7F */ cmpwi r28, 0x7f -/* 80358034 3B 7B 00 40 */ addi r27, r27, 0x40 -/* 80358038 41 80 FF C0 */ blt lbl_80357FF8 -/* 8035803C 3B 40 FF FC */ li r26, -4 -lbl_80358040: -/* 80358040 2C 1A 00 00 */ cmpwi r26, 0 -/* 80358044 41 80 00 50 */ blt lbl_80358094 -/* 80358048 80 61 00 14 */ lwz r3, 0x14(r1) -/* 8035804C 4B FF D7 31 */ bl __CARDGetDirBlock -/* 80358050 57 E0 30 32 */ slwi r0, r31, 6 -/* 80358054 7C A3 02 14 */ add r5, r3, r0 -/* 80358058 A0 85 00 36 */ lhz r4, 0x36(r5) -/* 8035805C 28 04 00 05 */ cmplwi r4, 5 -/* 80358060 41 80 00 14 */ blt lbl_80358074 -/* 80358064 80 61 00 14 */ lwz r3, 0x14(r1) -/* 80358068 A0 03 00 10 */ lhz r0, 0x10(r3) -/* 8035806C 7C 04 00 40 */ cmplw r4, r0 -/* 80358070 41 80 00 0C */ blt lbl_8035807C -lbl_80358074: -/* 80358074 3B 40 FF FA */ li r26, -6 -/* 80358078 48 00 00 1C */ b lbl_80358094 -lbl_8035807C: -/* 8035807C 93 BE 00 00 */ stw r29, 0(r30) -/* 80358080 38 00 00 00 */ li r0, 0 -/* 80358084 93 FE 00 04 */ stw r31, 4(r30) -/* 80358088 90 1E 00 08 */ stw r0, 8(r30) -/* 8035808C A0 05 00 36 */ lhz r0, 0x36(r5) -/* 80358090 B0 1E 00 10 */ sth r0, 0x10(r30) -lbl_80358094: -/* 80358094 80 61 00 14 */ lwz r3, 0x14(r1) -/* 80358098 7F 44 D3 78 */ mr r4, r26 -/* 8035809C 4B FF BB D1 */ bl __CARDPutControlBlock -lbl_803580A0: -/* 803580A0 BB 21 00 1C */ lmw r25, 0x1c(r1) -/* 803580A4 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 803580A8 38 21 00 38 */ addi r1, r1, 0x38 -/* 803580AC 7C 08 03 A6 */ mtlr r0 -/* 803580B0 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDOpen/__CARDAccess.s b/asm/dolphin/card/CARDOpen/__CARDAccess.s deleted file mode 100644 index c750724d3e..0000000000 --- a/asm/dolphin/card/CARDOpen/__CARDAccess.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80357CDC: -/* 80357CDC 7C 08 02 A6 */ mflr r0 -/* 80357CE0 90 01 00 04 */ stw r0, 4(r1) -/* 80357CE4 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80357CE8 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80357CEC 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80357CF0 7C 9E 23 78 */ mr r30, r4 -/* 80357CF4 88 04 00 00 */ lbz r0, 0(r4) -/* 80357CF8 83 E3 01 0C */ lwz r31, 0x10c(r3) -/* 80357CFC 28 00 00 FF */ cmplwi r0, 0xff -/* 80357D00 40 82 00 0C */ bne lbl_80357D0C -/* 80357D04 38 60 FF FC */ li r3, -4 -/* 80357D08 48 00 00 50 */ b lbl_80357D58 -lbl_80357D0C: -/* 80357D0C 3C 60 80 45 */ lis r3, __CARDDiskNone@ha /* 0x8044CDE0@ha */ -/* 80357D10 38 03 CD E0 */ addi r0, r3, __CARDDiskNone@l /* 0x8044CDE0@l */ -/* 80357D14 7C 1F 00 40 */ cmplw r31, r0 -/* 80357D18 41 82 00 34 */ beq lbl_80357D4C -/* 80357D1C 38 7E 00 00 */ addi r3, r30, 0 -/* 80357D20 38 9F 00 00 */ addi r4, r31, 0 -/* 80357D24 38 A0 00 04 */ li r5, 4 -/* 80357D28 48 00 E3 65 */ bl memcmp -/* 80357D2C 2C 03 00 00 */ cmpwi r3, 0 -/* 80357D30 40 82 00 24 */ bne lbl_80357D54 -/* 80357D34 38 7E 00 04 */ addi r3, r30, 4 -/* 80357D38 38 9F 00 04 */ addi r4, r31, 4 -/* 80357D3C 38 A0 00 02 */ li r5, 2 -/* 80357D40 48 00 E3 4D */ bl memcmp -/* 80357D44 2C 03 00 00 */ cmpwi r3, 0 -/* 80357D48 40 82 00 0C */ bne lbl_80357D54 -lbl_80357D4C: -/* 80357D4C 38 60 00 00 */ li r3, 0 -/* 80357D50 48 00 00 08 */ b lbl_80357D58 -lbl_80357D54: -/* 80357D54 38 60 FF F6 */ li r3, -10 -lbl_80357D58: -/* 80357D58 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80357D5C 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80357D60 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 80357D64 38 21 00 18 */ addi r1, r1, 0x18 -/* 80357D68 7C 08 03 A6 */ mtlr r0 -/* 80357D6C 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDOpen/__CARDIsReadable.s b/asm/dolphin/card/CARDOpen/__CARDIsReadable.s deleted file mode 100644 index 2b70786171..0000000000 --- a/asm/dolphin/card/CARDOpen/__CARDIsReadable.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_80357EA4: -/* 80357EA4 7C 08 02 A6 */ mflr r0 -/* 80357EA8 90 01 00 04 */ stw r0, 4(r1) -/* 80357EAC 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 80357EB0 BF 61 00 14 */ stmw r27, 0x14(r1) -/* 80357EB4 7C 9B 23 78 */ mr r27, r4 -/* 80357EB8 83 83 01 0C */ lwz r28, 0x10c(r3) -/* 80357EBC 4B FF FE 21 */ bl __CARDAccess -/* 80357EC0 3B A3 00 00 */ addi r29, r3, 0 -/* 80357EC4 2C 1D FF F6 */ cmpwi r29, -10 -/* 80357EC8 40 82 00 9C */ bne lbl_80357F64 -/* 80357ECC 88 7B 00 34 */ lbz r3, 0x34(r27) -/* 80357ED0 88 0D 84 F2 */ lbz r0, data_80450A72(r13) -/* 80357ED4 7C 60 00 38 */ and r0, r3, r0 -/* 80357ED8 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 80357EDC 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80357EE0 41 82 00 44 */ beq lbl_80357F24 -/* 80357EE4 3C 60 80 45 */ lis r3, __CARDDiskNone@ha /* 0x8044CDE0@ha */ -/* 80357EE8 3B E3 CD E0 */ addi r31, r3, __CARDDiskNone@l /* 0x8044CDE0@l */ -/* 80357EEC 38 7B 00 00 */ addi r3, r27, 0 -/* 80357EF0 38 9F 00 00 */ addi r4, r31, 0 -/* 80357EF4 38 A0 00 04 */ li r5, 4 -/* 80357EF8 48 00 E1 95 */ bl memcmp -/* 80357EFC 2C 03 00 00 */ cmpwi r3, 0 -/* 80357F00 40 82 00 24 */ bne lbl_80357F24 -/* 80357F04 38 7B 00 04 */ addi r3, r27, 4 -/* 80357F08 38 9F 00 04 */ addi r4, r31, 4 -/* 80357F0C 38 A0 00 02 */ li r5, 2 -/* 80357F10 48 00 E1 7D */ bl memcmp -/* 80357F14 2C 03 00 00 */ cmpwi r3, 0 -/* 80357F18 40 82 00 0C */ bne lbl_80357F24 -/* 80357F1C 3B A0 00 00 */ li r29, 0 -/* 80357F20 48 00 00 44 */ b lbl_80357F64 -lbl_80357F24: -/* 80357F24 57 C0 06 73 */ rlwinm. r0, r30, 0, 0x19, 0x19 -/* 80357F28 41 82 00 3C */ beq lbl_80357F64 -/* 80357F2C 3C 60 80 45 */ lis r3, __CARDDiskNone@ha /* 0x8044CDE0@ha */ -/* 80357F30 38 83 CD E0 */ addi r4, r3, __CARDDiskNone@l /* 0x8044CDE0@l */ -/* 80357F34 38 7B 00 00 */ addi r3, r27, 0 -/* 80357F38 38 A0 00 04 */ li r5, 4 -/* 80357F3C 48 00 E1 51 */ bl memcmp -/* 80357F40 2C 03 00 00 */ cmpwi r3, 0 -/* 80357F44 40 82 00 20 */ bne lbl_80357F64 -/* 80357F48 38 7B 00 04 */ addi r3, r27, 4 -/* 80357F4C 38 9C 00 04 */ addi r4, r28, 4 -/* 80357F50 38 A0 00 02 */ li r5, 2 -/* 80357F54 48 00 E1 39 */ bl memcmp -/* 80357F58 2C 03 00 00 */ cmpwi r3, 0 -/* 80357F5C 40 82 00 08 */ bne lbl_80357F64 -/* 80357F60 3B A0 00 00 */ li r29, 0 -lbl_80357F64: -/* 80357F64 2C 1D FF F6 */ cmpwi r29, -10 -/* 80357F68 40 82 00 18 */ bne lbl_80357F80 -/* 80357F6C 88 1B 00 34 */ lbz r0, 0x34(r27) -/* 80357F70 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 80357F74 41 82 00 0C */ beq lbl_80357F80 -/* 80357F78 38 60 00 00 */ li r3, 0 -/* 80357F7C 48 00 00 08 */ b lbl_80357F84 -lbl_80357F80: -/* 80357F80 7F A3 EB 78 */ mr r3, r29 -lbl_80357F84: -/* 80357F84 BB 61 00 14 */ lmw r27, 0x14(r1) -/* 80357F88 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80357F8C 38 21 00 28 */ addi r1, r1, 0x28 -/* 80357F90 7C 08 03 A6 */ mtlr r0 -/* 80357F94 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDOpen/__CARDIsWritable.s b/asm/dolphin/card/CARDOpen/__CARDIsWritable.s deleted file mode 100644 index 7d23ac0038..0000000000 --- a/asm/dolphin/card/CARDOpen/__CARDIsWritable.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_80357D70: -/* 80357D70 7C 08 02 A6 */ mflr r0 -/* 80357D74 90 01 00 04 */ stw r0, 4(r1) -/* 80357D78 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 80357D7C BF 61 00 14 */ stmw r27, 0x14(r1) -/* 80357D80 7C 9B 23 78 */ mr r27, r4 -/* 80357D84 88 04 00 00 */ lbz r0, 0(r4) -/* 80357D88 83 A3 01 0C */ lwz r29, 0x10c(r3) -/* 80357D8C 28 00 00 FF */ cmplwi r0, 0xff -/* 80357D90 40 82 00 0C */ bne lbl_80357D9C -/* 80357D94 3B C0 FF FC */ li r30, -4 -/* 80357D98 48 00 00 50 */ b lbl_80357DE8 -lbl_80357D9C: -/* 80357D9C 3C 60 80 45 */ lis r3, __CARDDiskNone@ha /* 0x8044CDE0@ha */ -/* 80357DA0 38 03 CD E0 */ addi r0, r3, __CARDDiskNone@l /* 0x8044CDE0@l */ -/* 80357DA4 7C 1D 00 40 */ cmplw r29, r0 -/* 80357DA8 41 82 00 34 */ beq lbl_80357DDC -/* 80357DAC 38 7B 00 00 */ addi r3, r27, 0 -/* 80357DB0 38 9D 00 00 */ addi r4, r29, 0 -/* 80357DB4 38 A0 00 04 */ li r5, 4 -/* 80357DB8 48 00 E2 D5 */ bl memcmp -/* 80357DBC 2C 03 00 00 */ cmpwi r3, 0 -/* 80357DC0 40 82 00 24 */ bne lbl_80357DE4 -/* 80357DC4 38 7B 00 04 */ addi r3, r27, 4 -/* 80357DC8 38 9D 00 04 */ addi r4, r29, 4 -/* 80357DCC 38 A0 00 02 */ li r5, 2 -/* 80357DD0 48 00 E2 BD */ bl memcmp -/* 80357DD4 2C 03 00 00 */ cmpwi r3, 0 -/* 80357DD8 40 82 00 0C */ bne lbl_80357DE4 -lbl_80357DDC: -/* 80357DDC 3B C0 00 00 */ li r30, 0 -/* 80357DE0 48 00 00 08 */ b lbl_80357DE8 -lbl_80357DE4: -/* 80357DE4 3B C0 FF F6 */ li r30, -10 -lbl_80357DE8: -/* 80357DE8 2C 1E FF F6 */ cmpwi r30, -10 -/* 80357DEC 40 82 00 A0 */ bne lbl_80357E8C -/* 80357DF0 88 7B 00 34 */ lbz r3, 0x34(r27) -/* 80357DF4 88 0D 84 F2 */ lbz r0, data_80450A72(r13) -/* 80357DF8 7C 60 00 38 */ and r0, r3, r0 -/* 80357DFC 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 80357E00 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80357E04 41 82 00 44 */ beq lbl_80357E48 -/* 80357E08 3C 60 80 45 */ lis r3, __CARDDiskNone@ha /* 0x8044CDE0@ha */ -/* 80357E0C 3B E3 CD E0 */ addi r31, r3, __CARDDiskNone@l /* 0x8044CDE0@l */ -/* 80357E10 38 7B 00 00 */ addi r3, r27, 0 -/* 80357E14 38 9F 00 00 */ addi r4, r31, 0 -/* 80357E18 38 A0 00 04 */ li r5, 4 -/* 80357E1C 48 00 E2 71 */ bl memcmp -/* 80357E20 2C 03 00 00 */ cmpwi r3, 0 -/* 80357E24 40 82 00 24 */ bne lbl_80357E48 -/* 80357E28 38 7B 00 04 */ addi r3, r27, 4 -/* 80357E2C 38 9F 00 04 */ addi r4, r31, 4 -/* 80357E30 38 A0 00 02 */ li r5, 2 -/* 80357E34 48 00 E2 59 */ bl memcmp -/* 80357E38 2C 03 00 00 */ cmpwi r3, 0 -/* 80357E3C 40 82 00 0C */ bne lbl_80357E48 -/* 80357E40 38 60 00 00 */ li r3, 0 -/* 80357E44 48 00 00 4C */ b lbl_80357E90 -lbl_80357E48: -/* 80357E48 57 80 06 73 */ rlwinm. r0, r28, 0, 0x19, 0x19 -/* 80357E4C 41 82 00 40 */ beq lbl_80357E8C -/* 80357E50 3C 60 80 45 */ lis r3, __CARDDiskNone@ha /* 0x8044CDE0@ha */ -/* 80357E54 38 83 CD E0 */ addi r4, r3, __CARDDiskNone@l /* 0x8044CDE0@l */ -/* 80357E58 38 7B 00 00 */ addi r3, r27, 0 -/* 80357E5C 38 A0 00 04 */ li r5, 4 -/* 80357E60 48 00 E2 2D */ bl memcmp -/* 80357E64 2C 03 00 00 */ cmpwi r3, 0 -/* 80357E68 40 82 00 24 */ bne lbl_80357E8C -/* 80357E6C 38 7B 00 04 */ addi r3, r27, 4 -/* 80357E70 38 9D 00 04 */ addi r4, r29, 4 -/* 80357E74 38 A0 00 02 */ li r5, 2 -/* 80357E78 48 00 E2 15 */ bl memcmp -/* 80357E7C 2C 03 00 00 */ cmpwi r3, 0 -/* 80357E80 40 82 00 0C */ bne lbl_80357E8C -/* 80357E84 38 60 00 00 */ li r3, 0 -/* 80357E88 48 00 00 08 */ b lbl_80357E90 -lbl_80357E8C: -/* 80357E8C 7F C3 F3 78 */ mr r3, r30 -lbl_80357E90: -/* 80357E90 BB 61 00 14 */ lmw r27, 0x14(r1) -/* 80357E94 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80357E98 38 21 00 28 */ addi r1, r1, 0x28 -/* 80357E9C 7C 08 03 A6 */ mtlr r0 -/* 80357EA0 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDRdwr/BlockWriteCallback.s b/asm/dolphin/card/CARDRdwr/BlockWriteCallback.s deleted file mode 100644 index 388d34dd45..0000000000 --- a/asm/dolphin/card/CARDRdwr/BlockWriteCallback.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_803552C4: -/* 803552C4 7C 08 02 A6 */ mflr r0 -/* 803552C8 90 01 00 04 */ stw r0, 4(r1) -/* 803552CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803552D0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803552D4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803552D8 7C 9E 23 79 */ or. r30, r4, r4 -/* 803552DC 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803552E0 3B A3 00 00 */ addi r29, r3, 0 -/* 803552E4 1C BD 01 10 */ mulli r5, r29, 0x110 -/* 803552E8 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 803552EC 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 803552F0 7F E0 2A 14 */ add r31, r0, r5 -/* 803552F4 41 80 00 5C */ blt lbl_80355350 -/* 803552F8 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 803552FC A0 1F 00 0A */ lhz r0, 0xa(r31) -/* 80355300 7C 03 02 14 */ add r0, r3, r0 -/* 80355304 90 1F 00 B8 */ stw r0, 0xb8(r31) -/* 80355308 80 7F 00 B0 */ lwz r3, 0xb0(r31) -/* 8035530C A0 1F 00 0A */ lhz r0, 0xa(r31) -/* 80355310 7C 03 02 14 */ add r0, r3, r0 -/* 80355314 90 1F 00 B0 */ stw r0, 0xb0(r31) -/* 80355318 80 7F 00 B4 */ lwz r3, 0xb4(r31) -/* 8035531C A0 1F 00 0A */ lhz r0, 0xa(r31) -/* 80355320 7C 03 02 14 */ add r0, r3, r0 -/* 80355324 90 1F 00 B4 */ stw r0, 0xb4(r31) -/* 80355328 80 7F 00 AC */ lwz r3, 0xac(r31) -/* 8035532C 34 03 FF FF */ addic. r0, r3, -1 -/* 80355330 90 1F 00 AC */ stw r0, 0xac(r31) -/* 80355334 40 81 00 1C */ ble lbl_80355350 -/* 80355338 3C 60 80 35 */ lis r3, BlockWriteCallback@ha /* 0x803552C4@ha */ -/* 8035533C 38 83 52 C4 */ addi r4, r3, BlockWriteCallback@l /* 0x803552C4@l */ -/* 80355340 38 7D 00 00 */ addi r3, r29, 0 -/* 80355344 4B FF E5 39 */ bl __CARDWritePage -/* 80355348 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8035534C 40 80 00 44 */ bge lbl_80355390 -lbl_80355350: -/* 80355350 80 1F 00 D0 */ lwz r0, 0xd0(r31) -/* 80355354 28 00 00 00 */ cmplwi r0, 0 -/* 80355358 40 82 00 10 */ bne lbl_80355368 -/* 8035535C 38 7F 00 00 */ addi r3, r31, 0 -/* 80355360 38 9E 00 00 */ addi r4, r30, 0 -/* 80355364 4B FF E9 09 */ bl __CARDPutControlBlock -lbl_80355368: -/* 80355368 80 1F 00 D4 */ lwz r0, 0xd4(r31) -/* 8035536C 28 00 00 00 */ cmplwi r0, 0 -/* 80355370 7C 0C 03 78 */ mr r12, r0 -/* 80355374 41 82 00 1C */ beq lbl_80355390 -/* 80355378 38 00 00 00 */ li r0, 0 -/* 8035537C 7D 88 03 A6 */ mtlr r12 -/* 80355380 90 1F 00 D4 */ stw r0, 0xd4(r31) -/* 80355384 38 7D 00 00 */ addi r3, r29, 0 -/* 80355388 38 9E 00 00 */ addi r4, r30, 0 -/* 8035538C 4E 80 00 21 */ blrl -lbl_80355390: -/* 80355390 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80355394 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80355398 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8035539C 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 803553A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 803553A4 7C 08 03 A6 */ mtlr r0 -/* 803553A8 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDRead/CARDReadAsync.s b/asm/dolphin/card/CARDRead/CARDReadAsync.s deleted file mode 100644 index 1c0001a5c3..0000000000 --- a/asm/dolphin/card/CARDRead/CARDReadAsync.s +++ /dev/null @@ -1,91 +0,0 @@ -lbl_80358788: -/* 80358788 7C 08 02 A6 */ mflr r0 -/* 8035878C 90 01 00 04 */ stw r0, 4(r1) -/* 80358790 54 C0 05 FF */ clrlwi. r0, r6, 0x17 -/* 80358794 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80358798 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8035879C 3B E5 00 00 */ addi r31, r5, 0 -/* 803587A0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 803587A4 3B C4 00 00 */ addi r30, r4, 0 -/* 803587A8 93 A1 00 24 */ stw r29, 0x24(r1) -/* 803587AC 3B A3 00 00 */ addi r29, r3, 0 -/* 803587B0 93 81 00 20 */ stw r28, 0x20(r1) -/* 803587B4 3B 87 00 00 */ addi r28, r7, 0 -/* 803587B8 40 82 00 0C */ bne lbl_803587C4 -/* 803587BC 57 E0 05 FF */ clrlwi. r0, r31, 0x17 -/* 803587C0 41 82 00 0C */ beq lbl_803587CC -lbl_803587C4: -/* 803587C4 38 60 FF 80 */ li r3, -128 -/* 803587C8 48 00 00 E4 */ b lbl_803588AC -lbl_803587CC: -/* 803587CC 38 7D 00 00 */ addi r3, r29, 0 -/* 803587D0 38 9F 00 00 */ addi r4, r31, 0 -/* 803587D4 38 A6 00 00 */ addi r5, r6, 0 -/* 803587D8 38 C1 00 1C */ addi r6, r1, 0x1c -/* 803587DC 4B FF FC C5 */ bl __CARDSeek -/* 803587E0 2C 03 00 00 */ cmpwi r3, 0 -/* 803587E4 40 80 00 08 */ bge lbl_803587EC -/* 803587E8 48 00 00 C4 */ b lbl_803588AC -lbl_803587EC: -/* 803587EC 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 803587F0 4B FF CF 8D */ bl __CARDGetDirBlock -/* 803587F4 80 1D 00 04 */ lwz r0, 4(r29) -/* 803587F8 54 00 30 32 */ slwi r0, r0, 6 -/* 803587FC 7C 83 02 14 */ add r4, r3, r0 -/* 80358800 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 80358804 4B FF F6 A1 */ bl __CARDIsReadable -/* 80358808 7C 64 1B 79 */ or. r4, r3, r3 -/* 8035880C 40 80 00 10 */ bge lbl_8035881C -/* 80358810 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 80358814 4B FF B4 59 */ bl __CARDPutControlBlock -/* 80358818 48 00 00 94 */ b lbl_803588AC -lbl_8035881C: -/* 8035881C 38 7E 00 00 */ addi r3, r30, 0 -/* 80358820 38 9F 00 00 */ addi r4, r31, 0 -/* 80358824 4B FE 2D 5D */ bl DCInvalidateRange -/* 80358828 28 1C 00 00 */ cmplwi r28, 0 -/* 8035882C 41 82 00 0C */ beq lbl_80358838 -/* 80358830 7F 80 E3 78 */ mr r0, r28 -/* 80358834 48 00 00 0C */ b lbl_80358840 -lbl_80358838: -/* 80358838 3C 60 80 35 */ lis r3, __CARDDefaultApiCallback@ha /* 0x80352A30@ha */ -/* 8035883C 38 03 2A 30 */ addi r0, r3, __CARDDefaultApiCallback@l /* 0x80352A30@l */ -lbl_80358840: -/* 80358840 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 80358844 90 03 00 D0 */ stw r0, 0xd0(r3) -/* 80358848 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 8035884C 80 9D 00 08 */ lwz r4, 8(r29) -/* 80358850 80 A3 00 0C */ lwz r5, 0xc(r3) -/* 80358854 38 05 FF FF */ addi r0, r5, -1 -/* 80358858 7C 88 00 38 */ and r8, r4, r0 -/* 8035885C 7C 68 28 50 */ subf r3, r8, r5 -/* 80358860 7C 1F 18 00 */ cmpw r31, r3 -/* 80358864 40 80 00 08 */ bge lbl_8035886C -/* 80358868 7F E3 FB 78 */ mr r3, r31 -lbl_8035886C: -/* 8035886C A0 1D 00 10 */ lhz r0, 0x10(r29) -/* 80358870 3C 80 80 36 */ lis r4, ReadCallback@ha /* 0x80358658@ha */ -/* 80358874 3B E3 00 00 */ addi r31, r3, 0 -/* 80358878 80 7D 00 00 */ lwz r3, 0(r29) -/* 8035887C 7C 05 01 D6 */ mullw r0, r5, r0 -/* 80358880 38 E4 86 58 */ addi r7, r4, ReadCallback@l /* 0x80358658@l */ -/* 80358884 38 BF 00 00 */ addi r5, r31, 0 -/* 80358888 38 DE 00 00 */ addi r6, r30, 0 -/* 8035888C 7C 88 02 14 */ add r4, r8, r0 -/* 80358890 4B FF C9 D1 */ bl __CARDRead -/* 80358894 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80358898 40 80 00 10 */ bge lbl_803588A8 -/* 8035889C 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 803588A0 7F A4 EB 78 */ mr r4, r29 -/* 803588A4 4B FF B3 C9 */ bl __CARDPutControlBlock -lbl_803588A8: -/* 803588A8 7F A3 EB 78 */ mr r3, r29 -lbl_803588AC: -/* 803588AC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 803588B0 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 803588B4 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 803588B8 83 A1 00 24 */ lwz r29, 0x24(r1) -/* 803588BC 83 81 00 20 */ lwz r28, 0x20(r1) -/* 803588C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 803588C4 7C 08 03 A6 */ mtlr r0 -/* 803588C8 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDStat/CARDGetStatus.s b/asm/dolphin/card/CARDStat/CARDGetStatus.s deleted file mode 100644 index b80edccac2..0000000000 --- a/asm/dolphin/card/CARDStat/CARDGetStatus.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_80358E88: -/* 80358E88 7C 08 02 A6 */ mflr r0 -/* 80358E8C 90 01 00 04 */ stw r0, 4(r1) -/* 80358E90 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 80358E94 93 E1 00 24 */ stw r31, 0x24(r1) -/* 80358E98 3B E5 00 00 */ addi r31, r5, 0 -/* 80358E9C 93 C1 00 20 */ stw r30, 0x20(r1) -/* 80358EA0 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 80358EA4 7C 9D 23 79 */ or. r29, r4, r4 -/* 80358EA8 41 80 00 0C */ blt lbl_80358EB4 -/* 80358EAC 2C 1D 00 7F */ cmpwi r29, 0x7f -/* 80358EB0 41 80 00 0C */ blt lbl_80358EBC -lbl_80358EB4: -/* 80358EB4 38 60 FF 80 */ li r3, -128 -/* 80358EB8 48 00 00 C8 */ b lbl_80358F80 -lbl_80358EBC: -/* 80358EBC 38 81 00 14 */ addi r4, r1, 0x14 -/* 80358EC0 4B FF AC F5 */ bl __CARDGetControlBlock -/* 80358EC4 2C 03 00 00 */ cmpwi r3, 0 -/* 80358EC8 40 80 00 08 */ bge lbl_80358ED0 -/* 80358ECC 48 00 00 B4 */ b lbl_80358F80 -lbl_80358ED0: -/* 80358ED0 80 61 00 14 */ lwz r3, 0x14(r1) -/* 80358ED4 4B FF C8 A9 */ bl __CARDGetDirBlock -/* 80358ED8 57 A0 30 32 */ slwi r0, r29, 6 -/* 80358EDC 7F A3 02 14 */ add r29, r3, r0 -/* 80358EE0 80 61 00 14 */ lwz r3, 0x14(r1) -/* 80358EE4 7F A4 EB 78 */ mr r4, r29 -/* 80358EE8 4B FF EF BD */ bl __CARDIsReadable -/* 80358EEC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80358EF0 41 80 00 84 */ blt lbl_80358F74 -/* 80358EF4 38 9D 00 00 */ addi r4, r29, 0 -/* 80358EF8 38 7F 00 28 */ addi r3, r31, 0x28 -/* 80358EFC 38 A0 00 04 */ li r5, 4 -/* 80358F00 4B CA A6 41 */ bl memcpy -/* 80358F04 38 7F 00 2C */ addi r3, r31, 0x2c -/* 80358F08 38 9D 00 04 */ addi r4, r29, 4 -/* 80358F0C 38 A0 00 02 */ li r5, 2 -/* 80358F10 4B CA A6 31 */ bl memcpy -/* 80358F14 80 A1 00 14 */ lwz r5, 0x14(r1) -/* 80358F18 7F E3 FB 78 */ mr r3, r31 -/* 80358F1C A0 DD 00 38 */ lhz r6, 0x38(r29) -/* 80358F20 38 9D 00 08 */ addi r4, r29, 8 -/* 80358F24 80 05 00 0C */ lwz r0, 0xc(r5) -/* 80358F28 38 A0 00 20 */ li r5, 0x20 -/* 80358F2C 7C 06 01 D6 */ mullw r0, r6, r0 -/* 80358F30 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80358F34 4B CA A6 0D */ bl memcpy -/* 80358F38 80 1D 00 28 */ lwz r0, 0x28(r29) -/* 80358F3C 38 7D 00 00 */ addi r3, r29, 0 -/* 80358F40 38 9F 00 00 */ addi r4, r31, 0 -/* 80358F44 90 1F 00 24 */ stw r0, 0x24(r31) -/* 80358F48 88 1D 00 07 */ lbz r0, 7(r29) -/* 80358F4C 98 1F 00 2E */ stb r0, 0x2e(r31) -/* 80358F50 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 80358F54 90 1F 00 30 */ stw r0, 0x30(r31) -/* 80358F58 A0 1D 00 30 */ lhz r0, 0x30(r29) -/* 80358F5C B0 1F 00 34 */ sth r0, 0x34(r31) -/* 80358F60 A0 1D 00 32 */ lhz r0, 0x32(r29) -/* 80358F64 B0 1F 00 36 */ sth r0, 0x36(r31) -/* 80358F68 80 1D 00 3C */ lwz r0, 0x3c(r29) -/* 80358F6C 90 1F 00 38 */ stw r0, 0x38(r31) -/* 80358F70 4B FF FD 21 */ bl UpdateIconOffsets -lbl_80358F74: -/* 80358F74 80 61 00 14 */ lwz r3, 0x14(r1) -/* 80358F78 7F C4 F3 78 */ mr r4, r30 -/* 80358F7C 4B FF AC F1 */ bl __CARDPutControlBlock -lbl_80358F80: -/* 80358F80 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80358F84 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 80358F88 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 80358F8C 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 80358F90 38 21 00 28 */ addi r1, r1, 0x28 -/* 80358F94 7C 08 03 A6 */ mtlr r0 -/* 80358F98 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDStat/CARDSetStatusAsync.s b/asm/dolphin/card/CARDStat/CARDSetStatusAsync.s deleted file mode 100644 index 2d6600d80a..0000000000 --- a/asm/dolphin/card/CARDStat/CARDSetStatusAsync.s +++ /dev/null @@ -1,102 +0,0 @@ -lbl_80358F9C: -/* 80358F9C 7C 08 02 A6 */ mflr r0 -/* 80358FA0 90 01 00 04 */ stw r0, 4(r1) -/* 80358FA4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80358FA8 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80358FAC 7C 9F 23 79 */ or. r31, r4, r4 -/* 80358FB0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80358FB4 3B C6 00 00 */ addi r30, r6, 0 -/* 80358FB8 93 A1 00 24 */ stw r29, 0x24(r1) -/* 80358FBC 3B A5 00 00 */ addi r29, r5, 0 -/* 80358FC0 93 81 00 20 */ stw r28, 0x20(r1) -/* 80358FC4 3B 83 00 00 */ addi r28, r3, 0 -/* 80358FC8 41 80 00 40 */ blt lbl_80359008 -/* 80358FCC 2C 1F 00 7F */ cmpwi r31, 0x7f -/* 80358FD0 40 80 00 38 */ bge lbl_80359008 -/* 80358FD4 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 80358FD8 3C 03 00 01 */ addis r0, r3, 1 -/* 80358FDC 28 00 FF FF */ cmplwi r0, 0xffff -/* 80358FE0 41 82 00 0C */ beq lbl_80358FEC -/* 80358FE4 28 03 02 00 */ cmplwi r3, 0x200 -/* 80358FE8 40 80 00 20 */ bge lbl_80359008 -lbl_80358FEC: -/* 80358FEC 80 7D 00 38 */ lwz r3, 0x38(r29) -/* 80358FF0 3C 03 00 01 */ addis r0, r3, 1 -/* 80358FF4 28 00 FF FF */ cmplwi r0, 0xffff -/* 80358FF8 41 82 00 18 */ beq lbl_80359010 -/* 80358FFC 54 60 04 FE */ clrlwi r0, r3, 0x13 -/* 80359000 28 00 1F C0 */ cmplwi r0, 0x1fc0 -/* 80359004 40 81 00 0C */ ble lbl_80359010 -lbl_80359008: -/* 80359008 38 60 FF 80 */ li r3, -128 -/* 8035900C 48 00 00 E4 */ b lbl_803590F0 -lbl_80359010: -/* 80359010 38 7C 00 00 */ addi r3, r28, 0 -/* 80359014 38 81 00 18 */ addi r4, r1, 0x18 -/* 80359018 4B FF AB 9D */ bl __CARDGetControlBlock -/* 8035901C 2C 03 00 00 */ cmpwi r3, 0 -/* 80359020 40 80 00 08 */ bge lbl_80359028 -/* 80359024 48 00 00 CC */ b lbl_803590F0 -lbl_80359028: -/* 80359028 80 61 00 18 */ lwz r3, 0x18(r1) -/* 8035902C 4B FF C7 51 */ bl __CARDGetDirBlock -/* 80359030 57 E0 30 32 */ slwi r0, r31, 6 -/* 80359034 7F E3 02 14 */ add r31, r3, r0 -/* 80359038 80 61 00 18 */ lwz r3, 0x18(r1) -/* 8035903C 7F E4 FB 78 */ mr r4, r31 -/* 80359040 4B FF ED 31 */ bl __CARDIsWritable -/* 80359044 7C 64 1B 79 */ or. r4, r3, r3 -/* 80359048 40 80 00 10 */ bge lbl_80359058 -/* 8035904C 80 61 00 18 */ lwz r3, 0x18(r1) -/* 80359050 4B FF AC 1D */ bl __CARDPutControlBlock -/* 80359054 48 00 00 9C */ b lbl_803590F0 -lbl_80359058: -/* 80359058 88 1D 00 2E */ lbz r0, 0x2e(r29) -/* 8035905C 38 7F 00 00 */ addi r3, r31, 0 -/* 80359060 38 9D 00 00 */ addi r4, r29, 0 -/* 80359064 98 1F 00 07 */ stb r0, 7(r31) -/* 80359068 80 1D 00 30 */ lwz r0, 0x30(r29) -/* 8035906C 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 80359070 A0 1D 00 34 */ lhz r0, 0x34(r29) -/* 80359074 B0 1F 00 30 */ sth r0, 0x30(r31) -/* 80359078 A0 1D 00 36 */ lhz r0, 0x36(r29) -/* 8035907C B0 1F 00 32 */ sth r0, 0x32(r31) -/* 80359080 80 1D 00 38 */ lwz r0, 0x38(r29) -/* 80359084 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 80359088 4B FF FC 09 */ bl UpdateIconOffsets -/* 8035908C 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 80359090 3C 03 00 01 */ addis r0, r3, 1 -/* 80359094 28 00 FF FF */ cmplwi r0, 0xffff -/* 80359098 40 82 00 14 */ bne lbl_803590AC -/* 8035909C A0 1F 00 32 */ lhz r0, 0x32(r31) -/* 803590A0 54 00 00 3A */ rlwinm r0, r0, 0, 0, 0x1d -/* 803590A4 60 00 00 01 */ ori r0, r0, 1 -/* 803590A8 B0 1F 00 32 */ sth r0, 0x32(r31) -lbl_803590AC: -/* 803590AC 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 803590B0 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 803590B4 54 1D F0 BE */ srwi r29, r0, 2 -/* 803590B8 4B FE 96 45 */ bl OSGetTime -/* 803590BC 38 DD 00 00 */ addi r6, r29, 0 -/* 803590C0 38 A0 00 00 */ li r5, 0 -/* 803590C4 48 00 92 61 */ bl __div2i -/* 803590C8 90 9F 00 28 */ stw r4, 0x28(r31) -/* 803590CC 38 7C 00 00 */ addi r3, r28, 0 -/* 803590D0 38 9E 00 00 */ addi r4, r30, 0 -/* 803590D4 4B FF C8 49 */ bl __CARDUpdateDir -/* 803590D8 7C 7C 1B 79 */ or. r28, r3, r3 -/* 803590DC 40 80 00 10 */ bge lbl_803590EC -/* 803590E0 80 61 00 18 */ lwz r3, 0x18(r1) -/* 803590E4 7F 84 E3 78 */ mr r4, r28 -/* 803590E8 4B FF AB 85 */ bl __CARDPutControlBlock -lbl_803590EC: -/* 803590EC 7F 83 E3 78 */ mr r3, r28 -lbl_803590F0: -/* 803590F0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 803590F4 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 803590F8 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 803590FC 83 A1 00 24 */ lwz r29, 0x24(r1) -/* 80359100 83 81 00 20 */ lwz r28, 0x20(r1) -/* 80359104 38 21 00 30 */ addi r1, r1, 0x30 -/* 80359108 7C 08 03 A6 */ mtlr r0 -/* 8035910C 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDUnlock/DoneCallback.s b/asm/dolphin/card/CARDUnlock/DoneCallback.s deleted file mode 100644 index ff38d7b7b2..0000000000 --- a/asm/dolphin/card/CARDUnlock/DoneCallback.s +++ /dev/null @@ -1,212 +0,0 @@ -lbl_80354E60: -/* 80354E60 7C 08 02 A6 */ mflr r0 -/* 80354E64 3C 80 80 45 */ lis r4, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80354E68 90 01 00 04 */ stw r0, 4(r1) -/* 80354E6C 38 84 CB C0 */ addi r4, r4, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80354E70 38 04 00 30 */ addi r0, r4, 0x30 -/* 80354E74 94 21 FF 78 */ stwu r1, -0x88(r1) -/* 80354E78 7C 00 18 40 */ cmplw r0, r3 -/* 80354E7C 93 E1 00 84 */ stw r31, 0x84(r1) -/* 80354E80 3B E0 00 00 */ li r31, 0 -/* 80354E84 93 C1 00 80 */ stw r30, 0x80(r1) -/* 80354E88 93 A1 00 7C */ stw r29, 0x7c(r1) -/* 80354E8C 3B A4 00 00 */ addi r29, r4, 0 -/* 80354E90 93 81 00 78 */ stw r28, 0x78(r1) -/* 80354E94 41 82 00 20 */ beq lbl_80354EB4 -/* 80354E98 38 04 01 40 */ addi r0, r4, 0x140 -/* 80354E9C 7C 00 18 40 */ cmplw r0, r3 -/* 80354EA0 38 84 01 10 */ addi r4, r4, 0x110 -/* 80354EA4 3B A4 00 00 */ addi r29, r4, 0 -/* 80354EA8 3B E0 00 01 */ li r31, 1 -/* 80354EAC 41 82 00 08 */ beq lbl_80354EB4 -/* 80354EB0 3B E0 00 02 */ li r31, 2 -lbl_80354EB4: -/* 80354EB4 80 7D 00 80 */ lwz r3, 0x80(r29) -/* 80354EB8 38 03 00 2F */ addi r0, r3, 0x2f -/* 80354EBC 54 03 00 34 */ rlwinm r3, r0, 0, 0, 0x1a -/* 80354EC0 83 C3 00 20 */ lwz r30, 0x20(r3) -/* 80354EC4 4B FF F3 11 */ bl DummyLen -/* 80354EC8 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 80354ECC 3B 83 00 00 */ addi r28, r3, 0 -/* 80354ED0 38 DC 00 00 */ addi r6, r28, 0 -/* 80354ED4 7F C0 02 78 */ xor r0, r30, r0 -/* 80354ED8 54 04 00 1E */ rlwinm r4, r0, 0, 0, 0xf -/* 80354EDC 38 7F 00 00 */ addi r3, r31, 0 -/* 80354EE0 38 A1 00 34 */ addi r5, r1, 0x34 -/* 80354EE4 38 E0 00 01 */ li r7, 1 -/* 80354EE8 4B FF F1 A9 */ bl ReadArrayUnlock -/* 80354EEC 2C 03 00 00 */ cmpwi r3, 0 -/* 80354EF0 40 80 00 1C */ bge lbl_80354F0C -/* 80354EF4 7F E3 FB 78 */ mr r3, r31 -/* 80354EF8 4B FE F2 25 */ bl EXIUnlock -/* 80354EFC 38 7F 00 00 */ addi r3, r31, 0 -/* 80354F00 38 80 FF FD */ li r4, -3 -/* 80354F04 48 00 21 19 */ bl __CARDMountCallback -/* 80354F08 48 00 02 5C */ b lbl_80355164 -lbl_80354F0C: -/* 80354F0C 80 9D 00 14 */ lwz r4, 0x14(r29) -/* 80354F10 38 60 00 00 */ li r3, 0 -/* 80354F14 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 80354F18 7C 9C 22 14 */ add r4, r28, r4 -/* 80354F1C 38 84 00 04 */ addi r4, r4, 4 -/* 80354F20 54 84 18 38 */ slwi r4, r4, 3 -/* 80354F24 38 84 00 01 */ addi r4, r4, 1 -/* 80354F28 28 04 00 00 */ cmplwi r4, 0 -/* 80354F2C 40 81 01 68 */ ble lbl_80355094 -/* 80354F30 28 04 00 08 */ cmplwi r4, 8 -/* 80354F34 38 C4 FF F8 */ addi r6, r4, -8 -/* 80354F38 40 81 01 24 */ ble lbl_8035505C -/* 80354F3C 38 A6 00 07 */ addi r5, r6, 7 -/* 80354F40 54 A5 E8 FE */ srwi r5, r5, 3 -/* 80354F44 28 06 00 00 */ cmplwi r6, 0 -/* 80354F48 7C A9 03 A6 */ mtctr r5 -/* 80354F4C 40 81 01 10 */ ble lbl_8035505C -lbl_80354F50: -/* 80354F50 54 05 38 30 */ slwi r5, r0, 7 -/* 80354F54 54 06 78 20 */ slwi r6, r0, 0xf -/* 80354F58 7C 05 2A 78 */ xor r5, r0, r5 -/* 80354F5C 7C C5 2A 78 */ xor r5, r6, r5 -/* 80354F60 54 07 B8 10 */ slwi r7, r0, 0x17 -/* 80354F64 7C E5 2A 38 */ eqv r5, r7, r5 -/* 80354F68 54 06 08 3C */ slwi r6, r0, 1 -/* 80354F6C 54 A0 17 BC */ rlwinm r0, r5, 2, 0x1e, 0x1e -/* 80354F70 7C C7 03 78 */ or r7, r6, r0 -/* 80354F74 54 E0 38 30 */ slwi r0, r7, 7 -/* 80354F78 54 E5 78 20 */ slwi r5, r7, 0xf -/* 80354F7C 7C E0 02 78 */ xor r0, r7, r0 -/* 80354F80 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354F84 7C A0 02 78 */ xor r0, r5, r0 -/* 80354F88 7C C0 02 38 */ eqv r0, r6, r0 -/* 80354F8C 54 08 17 BC */ rlwinm r8, r0, 2, 0x1e, 0x1e -/* 80354F90 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 80354F94 55 00 38 30 */ slwi r0, r8, 7 -/* 80354F98 55 05 78 20 */ slwi r5, r8, 0xf -/* 80354F9C 7D 00 02 78 */ xor r0, r8, r0 -/* 80354FA0 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 80354FA4 7C A0 02 78 */ xor r0, r5, r0 -/* 80354FA8 7C C0 02 38 */ eqv r0, r6, r0 -/* 80354FAC 54 07 17 BC */ rlwinm r7, r0, 2, 0x1e, 0x1e -/* 80354FB0 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 80354FB4 54 E0 38 30 */ slwi r0, r7, 7 -/* 80354FB8 54 E5 78 20 */ slwi r5, r7, 0xf -/* 80354FBC 7C E0 02 78 */ xor r0, r7, r0 -/* 80354FC0 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354FC4 7C A0 02 78 */ xor r0, r5, r0 -/* 80354FC8 7C C0 02 38 */ eqv r0, r6, r0 -/* 80354FCC 54 08 17 BC */ rlwinm r8, r0, 2, 0x1e, 0x1e -/* 80354FD0 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 80354FD4 55 00 38 30 */ slwi r0, r8, 7 -/* 80354FD8 55 05 78 20 */ slwi r5, r8, 0xf -/* 80354FDC 7D 00 02 78 */ xor r0, r8, r0 -/* 80354FE0 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 80354FE4 7C A0 02 78 */ xor r0, r5, r0 -/* 80354FE8 7C C0 02 38 */ eqv r0, r6, r0 -/* 80354FEC 54 07 17 BC */ rlwinm r7, r0, 2, 0x1e, 0x1e -/* 80354FF0 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 80354FF4 54 E0 38 30 */ slwi r0, r7, 7 -/* 80354FF8 54 E5 78 20 */ slwi r5, r7, 0xf -/* 80354FFC 7C E0 02 78 */ xor r0, r7, r0 -/* 80355000 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80355004 7C A0 02 78 */ xor r0, r5, r0 -/* 80355008 7C C0 02 38 */ eqv r0, r6, r0 -/* 8035500C 54 08 17 BC */ rlwinm r8, r0, 2, 0x1e, 0x1e -/* 80355010 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 80355014 55 00 38 30 */ slwi r0, r8, 7 -/* 80355018 55 05 78 20 */ slwi r5, r8, 0xf -/* 8035501C 7D 00 02 78 */ xor r0, r8, r0 -/* 80355020 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 80355024 7C A0 02 78 */ xor r0, r5, r0 -/* 80355028 7C C0 02 38 */ eqv r0, r6, r0 -/* 8035502C 54 07 17 BC */ rlwinm r7, r0, 2, 0x1e, 0x1e -/* 80355030 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 80355034 54 E0 38 30 */ slwi r0, r7, 7 -/* 80355038 54 E5 78 20 */ slwi r5, r7, 0xf -/* 8035503C 7C E0 02 78 */ xor r0, r7, r0 -/* 80355040 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80355044 7C A0 02 78 */ xor r0, r5, r0 -/* 80355048 7C C0 02 38 */ eqv r0, r6, r0 -/* 8035504C 54 00 17 BC */ rlwinm r0, r0, 2, 0x1e, 0x1e -/* 80355050 50 E0 08 3A */ rlwimi r0, r7, 1, 0, 0x1d -/* 80355054 38 63 00 08 */ addi r3, r3, 8 -/* 80355058 42 00 FE F8 */ bdnz lbl_80354F50 -lbl_8035505C: -/* 8035505C 7C A3 20 50 */ subf r5, r3, r4 -/* 80355060 7C 03 20 40 */ cmplw r3, r4 -/* 80355064 7C A9 03 A6 */ mtctr r5 -/* 80355068 40 80 00 2C */ bge lbl_80355094 -lbl_8035506C: -/* 8035506C 54 03 38 30 */ slwi r3, r0, 7 -/* 80355070 54 04 78 20 */ slwi r4, r0, 0xf -/* 80355074 7C 03 1A 78 */ xor r3, r0, r3 -/* 80355078 54 05 B8 10 */ slwi r5, r0, 0x17 -/* 8035507C 7C 83 1A 78 */ xor r3, r4, r3 -/* 80355080 7C A3 1A 38 */ eqv r3, r5, r3 -/* 80355084 54 04 08 3C */ slwi r4, r0, 1 -/* 80355088 54 60 17 BC */ rlwinm r0, r3, 2, 0x1e, 0x1e -/* 8035508C 7C 80 03 78 */ or r0, r4, r0 -/* 80355090 42 00 FF DC */ bdnz lbl_8035506C -lbl_80355094: -/* 80355094 54 03 38 30 */ slwi r3, r0, 7 -/* 80355098 54 04 78 20 */ slwi r4, r0, 0xf -/* 8035509C 7C 03 1A 78 */ xor r3, r0, r3 -/* 803550A0 54 05 B8 10 */ slwi r5, r0, 0x17 -/* 803550A4 7C 83 1A 78 */ xor r3, r4, r3 -/* 803550A8 7C A3 1A 38 */ eqv r3, r5, r3 -/* 803550AC 54 63 0F FE */ srwi r3, r3, 0x1f -/* 803550B0 7C 00 1B 78 */ or r0, r0, r3 -/* 803550B4 90 1D 00 2C */ stw r0, 0x2c(r29) -/* 803550B8 4B FF F1 1D */ bl DummyLen -/* 803550BC 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 803550C0 57 C4 80 1E */ slwi r4, r30, 0x10 -/* 803550C4 38 C3 00 00 */ addi r6, r3, 0 -/* 803550C8 7C 80 02 78 */ xor r0, r4, r0 -/* 803550CC 54 04 00 1E */ rlwinm r4, r0, 0, 0, 0xf -/* 803550D0 38 7F 00 00 */ addi r3, r31, 0 -/* 803550D4 38 A1 00 34 */ addi r5, r1, 0x34 -/* 803550D8 38 E0 00 01 */ li r7, 1 -/* 803550DC 4B FF EF B5 */ bl ReadArrayUnlock -/* 803550E0 2C 03 00 00 */ cmpwi r3, 0 -/* 803550E4 40 80 00 1C */ bge lbl_80355100 -/* 803550E8 7F E3 FB 78 */ mr r3, r31 -/* 803550EC 4B FE F0 31 */ bl EXIUnlock -/* 803550F0 38 7F 00 00 */ addi r3, r31, 0 -/* 803550F4 38 80 FF FD */ li r4, -3 -/* 803550F8 48 00 1F 25 */ bl __CARDMountCallback -/* 803550FC 48 00 00 68 */ b lbl_80355164 -lbl_80355100: -/* 80355100 38 7F 00 00 */ addi r3, r31, 0 -/* 80355104 38 81 00 30 */ addi r4, r1, 0x30 -/* 80355108 4B FF DD 3D */ bl __CARDReadStatus -/* 8035510C 3B 83 00 00 */ addi r28, r3, 0 -/* 80355110 38 7F 00 00 */ addi r3, r31, 0 -/* 80355114 4B FE E4 59 */ bl EXIProbe -/* 80355118 2C 03 00 00 */ cmpwi r3, 0 -/* 8035511C 40 82 00 1C */ bne lbl_80355138 -/* 80355120 7F E3 FB 78 */ mr r3, r31 -/* 80355124 4B FE EF F9 */ bl EXIUnlock -/* 80355128 38 7F 00 00 */ addi r3, r31, 0 -/* 8035512C 38 80 FF FD */ li r4, -3 -/* 80355130 48 00 1E ED */ bl __CARDMountCallback -/* 80355134 48 00 00 30 */ b lbl_80355164 -lbl_80355138: -/* 80355138 2C 1C 00 00 */ cmpwi r28, 0 -/* 8035513C 40 82 00 1C */ bne lbl_80355158 -/* 80355140 88 01 00 30 */ lbz r0, 0x30(r1) -/* 80355144 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 80355148 40 82 00 10 */ bne lbl_80355158 -/* 8035514C 7F E3 FB 78 */ mr r3, r31 -/* 80355150 4B FE EF CD */ bl EXIUnlock -/* 80355154 3B 80 FF FB */ li r28, -5 -lbl_80355158: -/* 80355158 38 7F 00 00 */ addi r3, r31, 0 -/* 8035515C 38 9C 00 00 */ addi r4, r28, 0 -/* 80355160 48 00 1E BD */ bl __CARDMountCallback -lbl_80355164: -/* 80355164 80 01 00 8C */ lwz r0, 0x8c(r1) -/* 80355168 83 E1 00 84 */ lwz r31, 0x84(r1) -/* 8035516C 83 C1 00 80 */ lwz r30, 0x80(r1) -/* 80355170 83 A1 00 7C */ lwz r29, 0x7c(r1) -/* 80355174 83 81 00 78 */ lwz r28, 0x78(r1) -/* 80355178 38 21 00 88 */ addi r1, r1, 0x88 -/* 8035517C 7C 08 03 A6 */ mtlr r0 -/* 80355180 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDUnlock/DummyLen.s b/asm/dolphin/card/CARDUnlock/DummyLen.s deleted file mode 100644 index 614994ff59..0000000000 --- a/asm/dolphin/card/CARDUnlock/DummyLen.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_803541D4: -/* 803541D4 7C 08 02 A6 */ mflr r0 -/* 803541D8 90 01 00 04 */ stw r0, 4(r1) -/* 803541DC 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 803541E0 93 E1 00 24 */ stw r31, 0x24(r1) -/* 803541E4 93 C1 00 20 */ stw r30, 0x20(r1) -/* 803541E8 3B C0 00 01 */ li r30, 1 -/* 803541EC 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 803541F0 3B A0 00 00 */ li r29, 0 -/* 803541F4 4B FE E5 21 */ bl OSGetTick -/* 803541F8 90 6D 84 E8 */ stw r3, next(r13) -/* 803541FC 3C 60 41 C6 */ lis r3, 0x41C6 /* 0x41C64E6D@ha */ -/* 80354200 3B E3 4E 6D */ addi r31, r3, 0x4E6D /* 0x41C64E6D@l */ -/* 80354204 80 0D 84 E8 */ lwz r0, next(r13) -/* 80354208 7C 60 F9 D6 */ mullw r3, r0, r31 -/* 8035420C 38 03 30 39 */ addi r0, r3, 0x3039 -/* 80354210 90 0D 84 E8 */ stw r0, next(r13) -/* 80354214 80 0D 84 E8 */ lwz r0, next(r13) -/* 80354218 54 03 86 FE */ rlwinm r3, r0, 0x10, 0x1b, 0x1f -/* 8035421C 38 63 00 01 */ addi r3, r3, 1 -/* 80354220 48 00 00 40 */ b lbl_80354260 -lbl_80354224: -/* 80354224 4B FE E4 F1 */ bl OSGetTick -/* 80354228 7C 60 F0 30 */ slw r0, r3, r30 -/* 8035422C 3B DE 00 01 */ addi r30, r30, 1 -/* 80354230 28 1E 00 10 */ cmplwi r30, 0x10 -/* 80354234 40 81 00 08 */ ble lbl_8035423C -/* 80354238 3B C0 00 01 */ li r30, 1 -lbl_8035423C: -/* 8035423C 90 0D 84 E8 */ stw r0, next(r13) -/* 80354240 3B BD 00 01 */ addi r29, r29, 1 -/* 80354244 80 0D 84 E8 */ lwz r0, next(r13) -/* 80354248 7C 60 F9 D6 */ mullw r3, r0, r31 -/* 8035424C 38 03 30 39 */ addi r0, r3, 0x3039 -/* 80354250 90 0D 84 E8 */ stw r0, next(r13) -/* 80354254 80 0D 84 E8 */ lwz r0, next(r13) -/* 80354258 54 03 86 FE */ rlwinm r3, r0, 0x10, 0x1b, 0x1f -/* 8035425C 38 63 00 01 */ addi r3, r3, 1 -lbl_80354260: -/* 80354260 2C 03 00 04 */ cmpwi r3, 4 -/* 80354264 40 80 00 0C */ bge lbl_80354270 -/* 80354268 28 1D 00 0A */ cmplwi r29, 0xa -/* 8035426C 41 80 FF B8 */ blt lbl_80354224 -lbl_80354270: -/* 80354270 2C 03 00 04 */ cmpwi r3, 4 -/* 80354274 40 80 00 08 */ bge lbl_8035427C -/* 80354278 38 60 00 04 */ li r3, 4 -lbl_8035427C: -/* 8035427C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80354280 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 80354284 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 80354288 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 8035428C 38 21 00 28 */ addi r1, r1, 0x28 -/* 80354290 7C 08 03 A6 */ mtlr r0 -/* 80354294 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDUnlock/InitCallback.s b/asm/dolphin/card/CARDUnlock/InitCallback.s deleted file mode 100644 index 2be8d62bcc..0000000000 --- a/asm/dolphin/card/CARDUnlock/InitCallback.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80354DF0: -/* 80354DF0 7C 08 02 A6 */ mflr r0 -/* 80354DF4 3C 80 80 45 */ lis r4, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80354DF8 90 01 00 04 */ stw r0, 4(r1) -/* 80354DFC 38 84 CB C0 */ addi r4, r4, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80354E00 38 04 00 30 */ addi r0, r4, 0x30 -/* 80354E04 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80354E08 7C 00 18 40 */ cmplw r0, r3 -/* 80354E0C 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80354E10 41 82 00 10 */ beq lbl_80354E20 -/* 80354E14 38 04 01 40 */ addi r0, r4, 0x140 -/* 80354E18 7C 00 18 40 */ cmplw r0, r3 -/* 80354E1C 38 84 01 10 */ addi r4, r4, 0x110 -lbl_80354E20: -/* 80354E20 83 E4 00 80 */ lwz r31, 0x80(r4) -/* 80354E24 3C 60 FF 00 */ lis r3, 0xff00 -/* 80354E28 4B FF D6 41 */ bl DSPSendMailToDSP -lbl_80354E2C: -/* 80354E2C 4B FF D6 05 */ bl DSPCheckMailToDSP -/* 80354E30 28 03 00 00 */ cmplwi r3, 0 -/* 80354E34 40 82 FF F8 */ bne lbl_80354E2C -/* 80354E38 7F E3 FB 78 */ mr r3, r31 -/* 80354E3C 4B FF D6 2D */ bl DSPSendMailToDSP -lbl_80354E40: -/* 80354E40 4B FF D5 F1 */ bl DSPCheckMailToDSP -/* 80354E44 28 03 00 00 */ cmplwi r3, 0 -/* 80354E48 40 82 FF F8 */ bne lbl_80354E40 -/* 80354E4C 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80354E50 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80354E54 38 21 00 18 */ addi r1, r1, 0x18 -/* 80354E58 7C 08 03 A6 */ mtlr r0 -/* 80354E5C 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDUnlock/__CARDUnlock.s b/asm/dolphin/card/CARDUnlock/__CARDUnlock.s deleted file mode 100644 index d6df853015..0000000000 --- a/asm/dolphin/card/CARDUnlock/__CARDUnlock.s +++ /dev/null @@ -1,745 +0,0 @@ -lbl_80354298: -/* 80354298 7C 08 02 A6 */ mflr r0 -/* 8035429C 90 01 00 04 */ stw r0, 4(r1) -/* 803542A0 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 803542A4 BE C1 00 F8 */ stmw r22, 0xf8(r1) -/* 803542A8 3B 03 00 00 */ addi r24, r3, 0 -/* 803542AC 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 803542B0 1C B8 01 10 */ mulli r5, r24, 0x110 -/* 803542B4 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 803542B8 7F E0 2A 14 */ add r31, r0, r5 -/* 803542BC 3A E4 00 00 */ addi r23, r4, 0 -/* 803542C0 3B DF 00 30 */ addi r30, r31, 0x30 -/* 803542C4 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 803542C8 38 03 00 2F */ addi r0, r3, 0x2f -/* 803542CC 54 1C 00 34 */ rlwinm r28, r0, 0, 0, 0x1a -/* 803542D0 3B A3 00 00 */ addi r29, r3, 0 -/* 803542D4 3A DC 00 20 */ addi r22, r28, 0x20 -/* 803542D8 4B FE E4 3D */ bl OSGetTick -/* 803542DC 90 6D 84 E8 */ stw r3, next(r13) -/* 803542E0 3C 60 41 C6 */ lis r3, 0x41C6 /* 0x41C64E6D@ha */ -/* 803542E4 3C A0 7F ED */ lis r5, 0x7FED /* 0x7FEC8000@ha */ -/* 803542E8 80 8D 84 E8 */ lwz r4, next(r13) -/* 803542EC 38 03 4E 6D */ addi r0, r3, 0x4E6D /* 0x41C64E6D@l */ -/* 803542F0 3B 25 80 00 */ addi r25, r5, 0x8000 /* 0x7FEC8000@l */ -/* 803542F4 7C 64 01 D6 */ mullw r3, r4, r0 -/* 803542F8 38 03 30 39 */ addi r0, r3, 0x3039 -/* 803542FC 90 0D 84 E8 */ stw r0, next(r13) -/* 80354300 80 0D 84 E8 */ lwz r0, next(r13) -/* 80354304 54 00 84 7E */ rlwinm r0, r0, 0x10, 0x11, 0x1f -/* 80354308 7F 39 03 78 */ or r25, r25, r0 -/* 8035430C 57 39 00 26 */ rlwinm r25, r25, 0, 0, 0x13 -/* 80354310 4B FF FE C5 */ bl DummyLen -/* 80354314 3B 43 00 00 */ addi r26, r3, 0 -/* 80354318 38 DA 00 00 */ addi r6, r26, 0 -/* 8035431C 38 78 00 00 */ addi r3, r24, 0 -/* 80354320 38 99 00 00 */ addi r4, r25, 0 -/* 80354324 38 A1 00 A4 */ addi r5, r1, 0xa4 -/* 80354328 38 E0 00 00 */ li r7, 0 -/* 8035432C 4B FF FD 65 */ bl ReadArrayUnlock -/* 80354330 2C 03 00 00 */ cmpwi r3, 0 -/* 80354334 40 80 00 0C */ bge lbl_80354340 -/* 80354338 38 60 FF FD */ li r3, -3 -/* 8035433C 48 00 0A A0 */ b lbl_80354DDC -lbl_80354340: -/* 80354340 57 43 18 38 */ slwi r3, r26, 3 -/* 80354344 38 83 00 01 */ addi r4, r3, 1 -/* 80354348 28 04 00 00 */ cmplwi r4, 0 -/* 8035434C 38 60 00 00 */ li r3, 0 -/* 80354350 40 81 01 68 */ ble lbl_803544B8 -/* 80354354 28 04 00 08 */ cmplwi r4, 8 -/* 80354358 38 A4 FF F8 */ addi r5, r4, -8 -/* 8035435C 40 81 01 24 */ ble lbl_80354480 -/* 80354360 38 05 00 07 */ addi r0, r5, 7 -/* 80354364 54 00 E8 FE */ srwi r0, r0, 3 -/* 80354368 28 05 00 00 */ cmplwi r5, 0 -/* 8035436C 7C 09 03 A6 */ mtctr r0 -/* 80354370 40 81 01 10 */ ble lbl_80354480 -lbl_80354374: -/* 80354374 57 20 C9 FE */ srwi r0, r25, 7 -/* 80354378 57 25 8B FE */ srwi r5, r25, 0xf -/* 8035437C 7F 20 02 78 */ xor r0, r25, r0 -/* 80354380 7C A0 02 78 */ xor r0, r5, r0 -/* 80354384 57 26 4D FE */ srwi r6, r25, 0x17 -/* 80354388 7C C0 02 38 */ eqv r0, r6, r0 -/* 8035438C 57 25 F8 7E */ srwi r5, r25, 1 -/* 80354390 54 00 F0 42 */ rlwinm r0, r0, 0x1e, 1, 1 -/* 80354394 7C A7 03 78 */ or r7, r5, r0 -/* 80354398 54 E0 C9 FE */ srwi r0, r7, 7 -/* 8035439C 54 E5 8B FE */ srwi r5, r7, 0xf -/* 803543A0 7C E0 02 78 */ xor r0, r7, r0 -/* 803543A4 54 E6 4D FE */ srwi r6, r7, 0x17 -/* 803543A8 7C A0 02 78 */ xor r0, r5, r0 -/* 803543AC 7C C0 02 38 */ eqv r0, r6, r0 -/* 803543B0 54 08 F0 42 */ rlwinm r8, r0, 0x1e, 1, 1 -/* 803543B4 50 E8 F8 BE */ rlwimi r8, r7, 0x1f, 2, 0x1f -/* 803543B8 55 00 C9 FE */ srwi r0, r8, 7 -/* 803543BC 55 05 8B FE */ srwi r5, r8, 0xf -/* 803543C0 7D 00 02 78 */ xor r0, r8, r0 -/* 803543C4 55 06 4D FE */ srwi r6, r8, 0x17 -/* 803543C8 7C A0 02 78 */ xor r0, r5, r0 -/* 803543CC 7C C0 02 38 */ eqv r0, r6, r0 -/* 803543D0 54 07 F0 42 */ rlwinm r7, r0, 0x1e, 1, 1 -/* 803543D4 51 07 F8 BE */ rlwimi r7, r8, 0x1f, 2, 0x1f -/* 803543D8 54 E0 C9 FE */ srwi r0, r7, 7 -/* 803543DC 54 E5 8B FE */ srwi r5, r7, 0xf -/* 803543E0 7C E0 02 78 */ xor r0, r7, r0 -/* 803543E4 54 E6 4D FE */ srwi r6, r7, 0x17 -/* 803543E8 7C A0 02 78 */ xor r0, r5, r0 -/* 803543EC 7C C0 02 38 */ eqv r0, r6, r0 -/* 803543F0 54 08 F0 42 */ rlwinm r8, r0, 0x1e, 1, 1 -/* 803543F4 50 E8 F8 BE */ rlwimi r8, r7, 0x1f, 2, 0x1f -/* 803543F8 55 00 C9 FE */ srwi r0, r8, 7 -/* 803543FC 55 05 8B FE */ srwi r5, r8, 0xf -/* 80354400 7D 00 02 78 */ xor r0, r8, r0 -/* 80354404 55 06 4D FE */ srwi r6, r8, 0x17 -/* 80354408 7C A0 02 78 */ xor r0, r5, r0 -/* 8035440C 7C C0 02 38 */ eqv r0, r6, r0 -/* 80354410 54 07 F0 42 */ rlwinm r7, r0, 0x1e, 1, 1 -/* 80354414 51 07 F8 BE */ rlwimi r7, r8, 0x1f, 2, 0x1f -/* 80354418 54 E0 C9 FE */ srwi r0, r7, 7 -/* 8035441C 54 E5 8B FE */ srwi r5, r7, 0xf -/* 80354420 7C E0 02 78 */ xor r0, r7, r0 -/* 80354424 54 E6 4D FE */ srwi r6, r7, 0x17 -/* 80354428 7C A0 02 78 */ xor r0, r5, r0 -/* 8035442C 7C C0 02 38 */ eqv r0, r6, r0 -/* 80354430 54 08 F0 42 */ rlwinm r8, r0, 0x1e, 1, 1 -/* 80354434 50 E8 F8 BE */ rlwimi r8, r7, 0x1f, 2, 0x1f -/* 80354438 55 00 C9 FE */ srwi r0, r8, 7 -/* 8035443C 55 05 8B FE */ srwi r5, r8, 0xf -/* 80354440 7D 00 02 78 */ xor r0, r8, r0 -/* 80354444 55 06 4D FE */ srwi r6, r8, 0x17 -/* 80354448 7C A0 02 78 */ xor r0, r5, r0 -/* 8035444C 7C C0 02 38 */ eqv r0, r6, r0 -/* 80354450 54 07 F0 42 */ rlwinm r7, r0, 0x1e, 1, 1 -/* 80354454 51 07 F8 BE */ rlwimi r7, r8, 0x1f, 2, 0x1f -/* 80354458 54 E0 C9 FE */ srwi r0, r7, 7 -/* 8035445C 54 E5 8B FE */ srwi r5, r7, 0xf -/* 80354460 7C E0 02 78 */ xor r0, r7, r0 -/* 80354464 54 E6 4D FE */ srwi r6, r7, 0x17 -/* 80354468 7C A0 02 78 */ xor r0, r5, r0 -/* 8035446C 7C C0 02 38 */ eqv r0, r6, r0 -/* 80354470 54 19 F0 42 */ rlwinm r25, r0, 0x1e, 1, 1 -/* 80354474 50 F9 F8 BE */ rlwimi r25, r7, 0x1f, 2, 0x1f -/* 80354478 38 63 00 08 */ addi r3, r3, 8 -/* 8035447C 42 00 FE F8 */ bdnz lbl_80354374 -lbl_80354480: -/* 80354480 7C 03 20 50 */ subf r0, r3, r4 -/* 80354484 7C 03 20 40 */ cmplw r3, r4 -/* 80354488 7C 09 03 A6 */ mtctr r0 -/* 8035448C 40 80 00 2C */ bge lbl_803544B8 -lbl_80354490: -/* 80354490 57 20 C9 FE */ srwi r0, r25, 7 -/* 80354494 57 23 8B FE */ srwi r3, r25, 0xf -/* 80354498 7F 20 02 78 */ xor r0, r25, r0 -/* 8035449C 57 24 4D FE */ srwi r4, r25, 0x17 -/* 803544A0 7C 60 02 78 */ xor r0, r3, r0 -/* 803544A4 7C 80 02 38 */ eqv r0, r4, r0 -/* 803544A8 57 23 F8 7E */ srwi r3, r25, 1 -/* 803544AC 54 00 F0 42 */ rlwinm r0, r0, 0x1e, 1, 1 -/* 803544B0 7C 79 03 78 */ or r25, r3, r0 -/* 803544B4 42 00 FF DC */ bdnz lbl_80354490 -lbl_803544B8: -/* 803544B8 57 20 C9 FE */ srwi r0, r25, 7 -/* 803544BC 57 23 8B FE */ srwi r3, r25, 0xf -/* 803544C0 7F 20 02 78 */ xor r0, r25, r0 -/* 803544C4 57 24 4D FE */ srwi r4, r25, 0x17 -/* 803544C8 7C 60 02 78 */ xor r0, r3, r0 -/* 803544CC 7C 80 02 38 */ eqv r0, r4, r0 -/* 803544D0 54 00 F8 00 */ slwi r0, r0, 0x1f -/* 803544D4 7F 20 03 78 */ or r0, r25, r0 -/* 803544D8 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 803544DC 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 803544E0 4B FF FA 45 */ bl bitrev -/* 803544E4 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 803544E8 4B FF FC ED */ bl DummyLen -/* 803544EC 3B 63 00 00 */ addi r27, r3, 0 -/* 803544F0 38 DB 00 14 */ addi r6, r27, 0x14 -/* 803544F4 38 78 00 00 */ addi r3, r24, 0 -/* 803544F8 38 A1 00 A4 */ addi r5, r1, 0xa4 -/* 803544FC 38 80 00 00 */ li r4, 0 -/* 80354500 38 E0 00 01 */ li r7, 1 -/* 80354504 4B FF FB 8D */ bl ReadArrayUnlock -/* 80354508 2C 03 00 00 */ cmpwi r3, 0 -/* 8035450C 40 80 00 0C */ bge lbl_80354518 -/* 80354510 38 60 FF FD */ li r3, -3 -/* 80354514 48 00 08 C8 */ b lbl_80354DDC -lbl_80354518: -/* 80354518 38 60 00 04 */ li r3, 4 -/* 8035451C 80 FF 00 2C */ lwz r7, 0x2c(r31) -/* 80354520 83 21 00 A4 */ lwz r25, 0xa4(r1) -/* 80354524 7C 69 03 A6 */ mtctr r3 -/* 80354528 83 41 00 A8 */ lwz r26, 0xa8(r1) -/* 8035452C 83 01 00 AC */ lwz r24, 0xac(r1) -/* 80354530 7F 39 3A 78 */ xor r25, r25, r7 -/* 80354534 80 01 00 B0 */ lwz r0, 0xb0(r1) -/* 80354538 80 A1 00 B4 */ lwz r5, 0xb4(r1) -lbl_8035453C: -/* 8035453C 54 E3 38 30 */ slwi r3, r7, 7 -/* 80354540 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354544 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354548 7C 83 1A 78 */ xor r3, r4, r3 -/* 8035454C 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354550 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354554 54 E4 08 3C */ slwi r4, r7, 1 -/* 80354558 54 63 17 BC */ rlwinm r3, r3, 2, 0x1e, 0x1e -/* 8035455C 7C 87 1B 78 */ or r7, r4, r3 -/* 80354560 54 E3 38 30 */ slwi r3, r7, 7 -/* 80354564 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354568 7C E3 1A 78 */ xor r3, r7, r3 -/* 8035456C 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354570 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354574 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354578 54 69 17 BC */ rlwinm r9, r3, 2, 0x1e, 0x1e -/* 8035457C 50 E9 08 3A */ rlwimi r9, r7, 1, 0, 0x1d -/* 80354580 55 23 38 30 */ slwi r3, r9, 7 -/* 80354584 55 24 78 20 */ slwi r4, r9, 0xf -/* 80354588 7D 23 1A 78 */ xor r3, r9, r3 -/* 8035458C 55 26 B8 10 */ slwi r6, r9, 0x17 -/* 80354590 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354594 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354598 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 8035459C 51 28 08 3A */ rlwimi r8, r9, 1, 0, 0x1d -/* 803545A0 55 03 38 30 */ slwi r3, r8, 7 -/* 803545A4 55 04 78 20 */ slwi r4, r8, 0xf -/* 803545A8 7D 03 1A 78 */ xor r3, r8, r3 -/* 803545AC 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 803545B0 7C 83 1A 78 */ xor r3, r4, r3 -/* 803545B4 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803545B8 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 803545BC 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 803545C0 54 E3 38 30 */ slwi r3, r7, 7 -/* 803545C4 54 E4 78 20 */ slwi r4, r7, 0xf -/* 803545C8 7C E3 1A 78 */ xor r3, r7, r3 -/* 803545CC 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 803545D0 7C 83 1A 78 */ xor r3, r4, r3 -/* 803545D4 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803545D8 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 803545DC 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 803545E0 55 03 38 30 */ slwi r3, r8, 7 -/* 803545E4 55 04 78 20 */ slwi r4, r8, 0xf -/* 803545E8 7D 03 1A 78 */ xor r3, r8, r3 -/* 803545EC 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 803545F0 7C 83 1A 78 */ xor r3, r4, r3 -/* 803545F4 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803545F8 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 803545FC 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 80354600 54 E3 38 30 */ slwi r3, r7, 7 -/* 80354604 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354608 7C E3 1A 78 */ xor r3, r7, r3 -/* 8035460C 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354610 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354614 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354618 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 8035461C 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 80354620 55 03 38 30 */ slwi r3, r8, 7 -/* 80354624 55 04 78 20 */ slwi r4, r8, 0xf -/* 80354628 7D 03 1A 78 */ xor r3, r8, r3 -/* 8035462C 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 80354630 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354634 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354638 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 8035463C 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 80354640 42 00 FE FC */ bdnz lbl_8035453C -/* 80354644 54 E3 38 30 */ slwi r3, r7, 7 -/* 80354648 54 E4 78 20 */ slwi r4, r7, 0xf -/* 8035464C 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354650 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354654 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354658 7C C3 1A 38 */ eqv r3, r6, r3 -/* 8035465C 54 63 0F FE */ srwi r3, r3, 0x1f -/* 80354660 7C E3 1B 78 */ or r3, r7, r3 -/* 80354664 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 80354668 38 60 00 04 */ li r3, 4 -/* 8035466C 7C 69 03 A6 */ mtctr r3 -/* 80354670 80 FF 00 2C */ lwz r7, 0x2c(r31) -/* 80354674 7F 5A 3A 78 */ xor r26, r26, r7 -lbl_80354678: -/* 80354678 54 E3 38 30 */ slwi r3, r7, 7 -/* 8035467C 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354680 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354684 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354688 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 8035468C 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354690 54 E4 08 3C */ slwi r4, r7, 1 -/* 80354694 54 63 17 BC */ rlwinm r3, r3, 2, 0x1e, 0x1e -/* 80354698 7C 87 1B 78 */ or r7, r4, r3 -/* 8035469C 54 E3 38 30 */ slwi r3, r7, 7 -/* 803546A0 54 E4 78 20 */ slwi r4, r7, 0xf -/* 803546A4 7C E3 1A 78 */ xor r3, r7, r3 -/* 803546A8 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 803546AC 7C 83 1A 78 */ xor r3, r4, r3 -/* 803546B0 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803546B4 54 69 17 BC */ rlwinm r9, r3, 2, 0x1e, 0x1e -/* 803546B8 50 E9 08 3A */ rlwimi r9, r7, 1, 0, 0x1d -/* 803546BC 55 23 38 30 */ slwi r3, r9, 7 -/* 803546C0 55 24 78 20 */ slwi r4, r9, 0xf -/* 803546C4 7D 23 1A 78 */ xor r3, r9, r3 -/* 803546C8 55 26 B8 10 */ slwi r6, r9, 0x17 -/* 803546CC 7C 83 1A 78 */ xor r3, r4, r3 -/* 803546D0 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803546D4 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 803546D8 51 28 08 3A */ rlwimi r8, r9, 1, 0, 0x1d -/* 803546DC 55 03 38 30 */ slwi r3, r8, 7 -/* 803546E0 55 04 78 20 */ slwi r4, r8, 0xf -/* 803546E4 7D 03 1A 78 */ xor r3, r8, r3 -/* 803546E8 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 803546EC 7C 83 1A 78 */ xor r3, r4, r3 -/* 803546F0 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803546F4 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 803546F8 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 803546FC 54 E3 38 30 */ slwi r3, r7, 7 -/* 80354700 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354704 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354708 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 8035470C 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354710 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354714 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 80354718 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 8035471C 55 03 38 30 */ slwi r3, r8, 7 -/* 80354720 55 04 78 20 */ slwi r4, r8, 0xf -/* 80354724 7D 03 1A 78 */ xor r3, r8, r3 -/* 80354728 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 8035472C 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354730 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354734 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 80354738 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 8035473C 54 E3 38 30 */ slwi r3, r7, 7 -/* 80354740 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354744 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354748 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 8035474C 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354750 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354754 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 80354758 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 8035475C 55 03 38 30 */ slwi r3, r8, 7 -/* 80354760 55 04 78 20 */ slwi r4, r8, 0xf -/* 80354764 7D 03 1A 78 */ xor r3, r8, r3 -/* 80354768 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 8035476C 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354770 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354774 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 80354778 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 8035477C 42 00 FE FC */ bdnz lbl_80354678 -/* 80354780 54 E3 38 30 */ slwi r3, r7, 7 -/* 80354784 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354788 7C E3 1A 78 */ xor r3, r7, r3 -/* 8035478C 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354790 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354794 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354798 54 63 0F FE */ srwi r3, r3, 0x1f -/* 8035479C 7C E3 1B 78 */ or r3, r7, r3 -/* 803547A0 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 803547A4 38 60 00 04 */ li r3, 4 -/* 803547A8 7C 69 03 A6 */ mtctr r3 -/* 803547AC 80 FF 00 2C */ lwz r7, 0x2c(r31) -/* 803547B0 7F 18 3A 78 */ xor r24, r24, r7 -lbl_803547B4: -/* 803547B4 54 E3 38 30 */ slwi r3, r7, 7 -/* 803547B8 54 E4 78 20 */ slwi r4, r7, 0xf -/* 803547BC 7C E3 1A 78 */ xor r3, r7, r3 -/* 803547C0 7C 83 1A 78 */ xor r3, r4, r3 -/* 803547C4 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 803547C8 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803547CC 54 E4 08 3C */ slwi r4, r7, 1 -/* 803547D0 54 63 17 BC */ rlwinm r3, r3, 2, 0x1e, 0x1e -/* 803547D4 7C 87 1B 78 */ or r7, r4, r3 -/* 803547D8 54 E3 38 30 */ slwi r3, r7, 7 -/* 803547DC 54 E4 78 20 */ slwi r4, r7, 0xf -/* 803547E0 7C E3 1A 78 */ xor r3, r7, r3 -/* 803547E4 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 803547E8 7C 83 1A 78 */ xor r3, r4, r3 -/* 803547EC 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803547F0 54 69 17 BC */ rlwinm r9, r3, 2, 0x1e, 0x1e -/* 803547F4 50 E9 08 3A */ rlwimi r9, r7, 1, 0, 0x1d -/* 803547F8 55 23 38 30 */ slwi r3, r9, 7 -/* 803547FC 55 24 78 20 */ slwi r4, r9, 0xf -/* 80354800 7D 23 1A 78 */ xor r3, r9, r3 -/* 80354804 55 26 B8 10 */ slwi r6, r9, 0x17 -/* 80354808 7C 83 1A 78 */ xor r3, r4, r3 -/* 8035480C 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354810 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 80354814 51 28 08 3A */ rlwimi r8, r9, 1, 0, 0x1d -/* 80354818 55 03 38 30 */ slwi r3, r8, 7 -/* 8035481C 55 04 78 20 */ slwi r4, r8, 0xf -/* 80354820 7D 03 1A 78 */ xor r3, r8, r3 -/* 80354824 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 80354828 7C 83 1A 78 */ xor r3, r4, r3 -/* 8035482C 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354830 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 80354834 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 80354838 54 E3 38 30 */ slwi r3, r7, 7 -/* 8035483C 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354840 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354844 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354848 7C 83 1A 78 */ xor r3, r4, r3 -/* 8035484C 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354850 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 80354854 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 80354858 55 03 38 30 */ slwi r3, r8, 7 -/* 8035485C 55 04 78 20 */ slwi r4, r8, 0xf -/* 80354860 7D 03 1A 78 */ xor r3, r8, r3 -/* 80354864 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 80354868 7C 83 1A 78 */ xor r3, r4, r3 -/* 8035486C 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354870 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 80354874 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 80354878 54 E3 38 30 */ slwi r3, r7, 7 -/* 8035487C 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354880 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354884 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354888 7C 83 1A 78 */ xor r3, r4, r3 -/* 8035488C 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354890 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 80354894 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 80354898 55 03 38 30 */ slwi r3, r8, 7 -/* 8035489C 55 04 78 20 */ slwi r4, r8, 0xf -/* 803548A0 7D 03 1A 78 */ xor r3, r8, r3 -/* 803548A4 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 803548A8 7C 83 1A 78 */ xor r3, r4, r3 -/* 803548AC 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803548B0 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 803548B4 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 803548B8 42 00 FE FC */ bdnz lbl_803547B4 -/* 803548BC 54 E3 38 30 */ slwi r3, r7, 7 -/* 803548C0 54 E4 78 20 */ slwi r4, r7, 0xf -/* 803548C4 7C E3 1A 78 */ xor r3, r7, r3 -/* 803548C8 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 803548CC 7C 83 1A 78 */ xor r3, r4, r3 -/* 803548D0 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803548D4 54 63 0F FE */ srwi r3, r3, 0x1f -/* 803548D8 7C E3 1B 78 */ or r3, r7, r3 -/* 803548DC 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 803548E0 38 60 00 04 */ li r3, 4 -/* 803548E4 7C 69 03 A6 */ mtctr r3 -/* 803548E8 80 FF 00 2C */ lwz r7, 0x2c(r31) -/* 803548EC 7C 00 3A 78 */ xor r0, r0, r7 -lbl_803548F0: -/* 803548F0 54 E3 38 30 */ slwi r3, r7, 7 -/* 803548F4 54 E4 78 20 */ slwi r4, r7, 0xf -/* 803548F8 7C E3 1A 78 */ xor r3, r7, r3 -/* 803548FC 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354900 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354904 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354908 54 E4 08 3C */ slwi r4, r7, 1 -/* 8035490C 54 63 17 BC */ rlwinm r3, r3, 2, 0x1e, 0x1e -/* 80354910 7C 87 1B 78 */ or r7, r4, r3 -/* 80354914 54 E3 38 30 */ slwi r3, r7, 7 -/* 80354918 54 E4 78 20 */ slwi r4, r7, 0xf -/* 8035491C 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354920 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354924 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354928 7C C3 1A 38 */ eqv r3, r6, r3 -/* 8035492C 54 69 17 BC */ rlwinm r9, r3, 2, 0x1e, 0x1e -/* 80354930 50 E9 08 3A */ rlwimi r9, r7, 1, 0, 0x1d -/* 80354934 55 23 38 30 */ slwi r3, r9, 7 -/* 80354938 55 24 78 20 */ slwi r4, r9, 0xf -/* 8035493C 7D 23 1A 78 */ xor r3, r9, r3 -/* 80354940 55 26 B8 10 */ slwi r6, r9, 0x17 -/* 80354944 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354948 7C C3 1A 38 */ eqv r3, r6, r3 -/* 8035494C 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 80354950 51 28 08 3A */ rlwimi r8, r9, 1, 0, 0x1d -/* 80354954 55 03 38 30 */ slwi r3, r8, 7 -/* 80354958 55 04 78 20 */ slwi r4, r8, 0xf -/* 8035495C 7D 03 1A 78 */ xor r3, r8, r3 -/* 80354960 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 80354964 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354968 7C C3 1A 38 */ eqv r3, r6, r3 -/* 8035496C 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 80354970 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 80354974 54 E3 38 30 */ slwi r3, r7, 7 -/* 80354978 54 E4 78 20 */ slwi r4, r7, 0xf -/* 8035497C 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354980 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354984 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354988 7C C3 1A 38 */ eqv r3, r6, r3 -/* 8035498C 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 80354990 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 80354994 55 03 38 30 */ slwi r3, r8, 7 -/* 80354998 55 04 78 20 */ slwi r4, r8, 0xf -/* 8035499C 7D 03 1A 78 */ xor r3, r8, r3 -/* 803549A0 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 803549A4 7C 83 1A 78 */ xor r3, r4, r3 -/* 803549A8 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803549AC 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 803549B0 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 803549B4 54 E3 38 30 */ slwi r3, r7, 7 -/* 803549B8 54 E4 78 20 */ slwi r4, r7, 0xf -/* 803549BC 7C E3 1A 78 */ xor r3, r7, r3 -/* 803549C0 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 803549C4 7C 83 1A 78 */ xor r3, r4, r3 -/* 803549C8 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803549CC 54 68 17 BC */ rlwinm r8, r3, 2, 0x1e, 0x1e -/* 803549D0 50 E8 08 3A */ rlwimi r8, r7, 1, 0, 0x1d -/* 803549D4 55 03 38 30 */ slwi r3, r8, 7 -/* 803549D8 55 04 78 20 */ slwi r4, r8, 0xf -/* 803549DC 7D 03 1A 78 */ xor r3, r8, r3 -/* 803549E0 55 06 B8 10 */ slwi r6, r8, 0x17 -/* 803549E4 7C 83 1A 78 */ xor r3, r4, r3 -/* 803549E8 7C C3 1A 38 */ eqv r3, r6, r3 -/* 803549EC 54 67 17 BC */ rlwinm r7, r3, 2, 0x1e, 0x1e -/* 803549F0 51 07 08 3A */ rlwimi r7, r8, 1, 0, 0x1d -/* 803549F4 42 00 FE FC */ bdnz lbl_803548F0 -/* 803549F8 54 E3 38 30 */ slwi r3, r7, 7 -/* 803549FC 54 E4 78 20 */ slwi r4, r7, 0xf -/* 80354A00 7C E3 1A 78 */ xor r3, r7, r3 -/* 80354A04 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354A08 54 E6 B8 10 */ slwi r6, r7, 0x17 -/* 80354A0C 7C C3 1A 38 */ eqv r3, r6, r3 -/* 80354A10 54 63 0F FE */ srwi r3, r3, 0x1f -/* 80354A14 7C E3 1B 78 */ or r3, r7, r3 -/* 80354A18 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 80354A1C 57 64 18 38 */ slwi r4, r27, 3 -/* 80354A20 28 04 00 00 */ cmplwi r4, 0 -/* 80354A24 80 DF 00 2C */ lwz r6, 0x2c(r31) -/* 80354A28 38 60 00 00 */ li r3, 0 -/* 80354A2C 7C A5 32 78 */ xor r5, r5, r6 -/* 80354A30 40 81 01 68 */ ble lbl_80354B98 -/* 80354A34 28 04 00 08 */ cmplwi r4, 8 -/* 80354A38 39 04 FF F8 */ addi r8, r4, -8 -/* 80354A3C 40 81 01 24 */ ble lbl_80354B60 -/* 80354A40 38 E8 00 07 */ addi r7, r8, 7 -/* 80354A44 54 E7 E8 FE */ srwi r7, r7, 3 -/* 80354A48 28 08 00 00 */ cmplwi r8, 0 -/* 80354A4C 7C E9 03 A6 */ mtctr r7 -/* 80354A50 40 81 01 10 */ ble lbl_80354B60 -lbl_80354A54: -/* 80354A54 54 C7 38 30 */ slwi r7, r6, 7 -/* 80354A58 54 C8 78 20 */ slwi r8, r6, 0xf -/* 80354A5C 7C C7 3A 78 */ xor r7, r6, r7 -/* 80354A60 7D 07 3A 78 */ xor r7, r8, r7 -/* 80354A64 54 C9 B8 10 */ slwi r9, r6, 0x17 -/* 80354A68 7D 27 3A 38 */ eqv r7, r9, r7 -/* 80354A6C 54 C8 08 3C */ slwi r8, r6, 1 -/* 80354A70 54 E6 17 BC */ rlwinm r6, r7, 2, 0x1e, 0x1e -/* 80354A74 7D 09 33 78 */ or r9, r8, r6 -/* 80354A78 55 26 38 30 */ slwi r6, r9, 7 -/* 80354A7C 55 27 78 20 */ slwi r7, r9, 0xf -/* 80354A80 7D 26 32 78 */ xor r6, r9, r6 -/* 80354A84 55 28 B8 10 */ slwi r8, r9, 0x17 -/* 80354A88 7C E6 32 78 */ xor r6, r7, r6 -/* 80354A8C 7D 06 32 38 */ eqv r6, r8, r6 -/* 80354A90 54 CA 17 BC */ rlwinm r10, r6, 2, 0x1e, 0x1e -/* 80354A94 51 2A 08 3A */ rlwimi r10, r9, 1, 0, 0x1d -/* 80354A98 55 46 38 30 */ slwi r6, r10, 7 -/* 80354A9C 55 47 78 20 */ slwi r7, r10, 0xf -/* 80354AA0 7D 46 32 78 */ xor r6, r10, r6 -/* 80354AA4 55 48 B8 10 */ slwi r8, r10, 0x17 -/* 80354AA8 7C E6 32 78 */ xor r6, r7, r6 -/* 80354AAC 7D 06 32 38 */ eqv r6, r8, r6 -/* 80354AB0 54 C9 17 BC */ rlwinm r9, r6, 2, 0x1e, 0x1e -/* 80354AB4 51 49 08 3A */ rlwimi r9, r10, 1, 0, 0x1d -/* 80354AB8 55 26 38 30 */ slwi r6, r9, 7 -/* 80354ABC 55 27 78 20 */ slwi r7, r9, 0xf -/* 80354AC0 7D 26 32 78 */ xor r6, r9, r6 -/* 80354AC4 55 28 B8 10 */ slwi r8, r9, 0x17 -/* 80354AC8 7C E6 32 78 */ xor r6, r7, r6 -/* 80354ACC 7D 06 32 38 */ eqv r6, r8, r6 -/* 80354AD0 54 CA 17 BC */ rlwinm r10, r6, 2, 0x1e, 0x1e -/* 80354AD4 51 2A 08 3A */ rlwimi r10, r9, 1, 0, 0x1d -/* 80354AD8 55 46 38 30 */ slwi r6, r10, 7 -/* 80354ADC 55 47 78 20 */ slwi r7, r10, 0xf -/* 80354AE0 7D 46 32 78 */ xor r6, r10, r6 -/* 80354AE4 55 48 B8 10 */ slwi r8, r10, 0x17 -/* 80354AE8 7C E6 32 78 */ xor r6, r7, r6 -/* 80354AEC 7D 06 32 38 */ eqv r6, r8, r6 -/* 80354AF0 54 C9 17 BC */ rlwinm r9, r6, 2, 0x1e, 0x1e -/* 80354AF4 51 49 08 3A */ rlwimi r9, r10, 1, 0, 0x1d -/* 80354AF8 55 26 38 30 */ slwi r6, r9, 7 -/* 80354AFC 55 27 78 20 */ slwi r7, r9, 0xf -/* 80354B00 7D 26 32 78 */ xor r6, r9, r6 -/* 80354B04 55 28 B8 10 */ slwi r8, r9, 0x17 -/* 80354B08 7C E6 32 78 */ xor r6, r7, r6 -/* 80354B0C 7D 06 32 38 */ eqv r6, r8, r6 -/* 80354B10 54 CA 17 BC */ rlwinm r10, r6, 2, 0x1e, 0x1e -/* 80354B14 51 2A 08 3A */ rlwimi r10, r9, 1, 0, 0x1d -/* 80354B18 55 46 38 30 */ slwi r6, r10, 7 -/* 80354B1C 55 47 78 20 */ slwi r7, r10, 0xf -/* 80354B20 7D 46 32 78 */ xor r6, r10, r6 -/* 80354B24 55 48 B8 10 */ slwi r8, r10, 0x17 -/* 80354B28 7C E6 32 78 */ xor r6, r7, r6 -/* 80354B2C 7D 06 32 38 */ eqv r6, r8, r6 -/* 80354B30 54 C9 17 BC */ rlwinm r9, r6, 2, 0x1e, 0x1e -/* 80354B34 51 49 08 3A */ rlwimi r9, r10, 1, 0, 0x1d -/* 80354B38 55 26 38 30 */ slwi r6, r9, 7 -/* 80354B3C 55 27 78 20 */ slwi r7, r9, 0xf -/* 80354B40 7D 26 32 78 */ xor r6, r9, r6 -/* 80354B44 55 28 B8 10 */ slwi r8, r9, 0x17 -/* 80354B48 7C E6 32 78 */ xor r6, r7, r6 -/* 80354B4C 7D 06 32 38 */ eqv r6, r8, r6 -/* 80354B50 54 C6 17 BC */ rlwinm r6, r6, 2, 0x1e, 0x1e -/* 80354B54 51 26 08 3A */ rlwimi r6, r9, 1, 0, 0x1d -/* 80354B58 38 63 00 08 */ addi r3, r3, 8 -/* 80354B5C 42 00 FE F8 */ bdnz lbl_80354A54 -lbl_80354B60: -/* 80354B60 7C E3 20 50 */ subf r7, r3, r4 -/* 80354B64 7C 03 20 40 */ cmplw r3, r4 -/* 80354B68 7C E9 03 A6 */ mtctr r7 -/* 80354B6C 40 80 00 2C */ bge lbl_80354B98 -lbl_80354B70: -/* 80354B70 54 C3 38 30 */ slwi r3, r6, 7 -/* 80354B74 54 C4 78 20 */ slwi r4, r6, 0xf -/* 80354B78 7C C3 1A 78 */ xor r3, r6, r3 -/* 80354B7C 54 C7 B8 10 */ slwi r7, r6, 0x17 -/* 80354B80 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354B84 7C E3 1A 38 */ eqv r3, r7, r3 -/* 80354B88 54 C4 08 3C */ slwi r4, r6, 1 -/* 80354B8C 54 63 17 BC */ rlwinm r3, r3, 2, 0x1e, 0x1e -/* 80354B90 7C 86 1B 78 */ or r6, r4, r3 -/* 80354B94 42 00 FF DC */ bdnz lbl_80354B70 -lbl_80354B98: -/* 80354B98 54 C3 38 30 */ slwi r3, r6, 7 -/* 80354B9C 54 C4 78 20 */ slwi r4, r6, 0xf -/* 80354BA0 7C C3 1A 78 */ xor r3, r6, r3 -/* 80354BA4 54 C7 B8 10 */ slwi r7, r6, 0x17 -/* 80354BA8 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354BAC 7C E3 1A 38 */ eqv r3, r7, r3 -/* 80354BB0 54 63 0F FE */ srwi r3, r3, 0x1f -/* 80354BB4 7C C3 1B 78 */ or r3, r6, r3 -/* 80354BB8 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 80354BBC 38 60 00 04 */ li r3, 4 -/* 80354BC0 7C 69 03 A6 */ mtctr r3 -/* 80354BC4 38 60 00 00 */ li r3, 0 -/* 80354BC8 80 9F 00 2C */ lwz r4, 0x2c(r31) -lbl_80354BCC: -/* 80354BCC 54 86 38 30 */ slwi r6, r4, 7 -/* 80354BD0 54 87 78 20 */ slwi r7, r4, 0xf -/* 80354BD4 7C 86 32 78 */ xor r6, r4, r6 -/* 80354BD8 7C E6 32 78 */ xor r6, r7, r6 -/* 80354BDC 54 88 B8 10 */ slwi r8, r4, 0x17 -/* 80354BE0 7D 06 32 38 */ eqv r6, r8, r6 -/* 80354BE4 54 87 08 3C */ slwi r7, r4, 1 -/* 80354BE8 54 C4 17 BC */ rlwinm r4, r6, 2, 0x1e, 0x1e -/* 80354BEC 7C E8 23 78 */ or r8, r7, r4 -/* 80354BF0 55 04 38 30 */ slwi r4, r8, 7 -/* 80354BF4 55 06 78 20 */ slwi r6, r8, 0xf -/* 80354BF8 7D 04 22 78 */ xor r4, r8, r4 -/* 80354BFC 55 07 B8 10 */ slwi r7, r8, 0x17 -/* 80354C00 7C C4 22 78 */ xor r4, r6, r4 -/* 80354C04 7C E4 22 38 */ eqv r4, r7, r4 -/* 80354C08 54 89 17 BC */ rlwinm r9, r4, 2, 0x1e, 0x1e -/* 80354C0C 51 09 08 3A */ rlwimi r9, r8, 1, 0, 0x1d -/* 80354C10 55 24 38 30 */ slwi r4, r9, 7 -/* 80354C14 55 26 78 20 */ slwi r6, r9, 0xf -/* 80354C18 7D 24 22 78 */ xor r4, r9, r4 -/* 80354C1C 55 27 B8 10 */ slwi r7, r9, 0x17 -/* 80354C20 7C C4 22 78 */ xor r4, r6, r4 -/* 80354C24 7C E4 22 38 */ eqv r4, r7, r4 -/* 80354C28 54 88 17 BC */ rlwinm r8, r4, 2, 0x1e, 0x1e -/* 80354C2C 51 28 08 3A */ rlwimi r8, r9, 1, 0, 0x1d -/* 80354C30 55 04 38 30 */ slwi r4, r8, 7 -/* 80354C34 55 06 78 20 */ slwi r6, r8, 0xf -/* 80354C38 7D 04 22 78 */ xor r4, r8, r4 -/* 80354C3C 55 07 B8 10 */ slwi r7, r8, 0x17 -/* 80354C40 7C C4 22 78 */ xor r4, r6, r4 -/* 80354C44 7C E4 22 38 */ eqv r4, r7, r4 -/* 80354C48 54 89 17 BC */ rlwinm r9, r4, 2, 0x1e, 0x1e -/* 80354C4C 51 09 08 3A */ rlwimi r9, r8, 1, 0, 0x1d -/* 80354C50 55 24 38 30 */ slwi r4, r9, 7 -/* 80354C54 55 26 78 20 */ slwi r6, r9, 0xf -/* 80354C58 7D 24 22 78 */ xor r4, r9, r4 -/* 80354C5C 55 27 B8 10 */ slwi r7, r9, 0x17 -/* 80354C60 7C C4 22 78 */ xor r4, r6, r4 -/* 80354C64 7C E4 22 38 */ eqv r4, r7, r4 -/* 80354C68 54 88 17 BC */ rlwinm r8, r4, 2, 0x1e, 0x1e -/* 80354C6C 51 28 08 3A */ rlwimi r8, r9, 1, 0, 0x1d -/* 80354C70 55 04 38 30 */ slwi r4, r8, 7 -/* 80354C74 55 06 78 20 */ slwi r6, r8, 0xf -/* 80354C78 7D 04 22 78 */ xor r4, r8, r4 -/* 80354C7C 55 07 B8 10 */ slwi r7, r8, 0x17 -/* 80354C80 7C C4 22 78 */ xor r4, r6, r4 -/* 80354C84 7C E4 22 38 */ eqv r4, r7, r4 -/* 80354C88 54 89 17 BC */ rlwinm r9, r4, 2, 0x1e, 0x1e -/* 80354C8C 51 09 08 3A */ rlwimi r9, r8, 1, 0, 0x1d -/* 80354C90 55 24 38 30 */ slwi r4, r9, 7 -/* 80354C94 55 26 78 20 */ slwi r6, r9, 0xf -/* 80354C98 7D 24 22 78 */ xor r4, r9, r4 -/* 80354C9C 55 27 B8 10 */ slwi r7, r9, 0x17 -/* 80354CA0 7C C4 22 78 */ xor r4, r6, r4 -/* 80354CA4 7C E4 22 38 */ eqv r4, r7, r4 -/* 80354CA8 54 88 17 BC */ rlwinm r8, r4, 2, 0x1e, 0x1e -/* 80354CAC 51 28 08 3A */ rlwimi r8, r9, 1, 0, 0x1d -/* 80354CB0 55 04 38 30 */ slwi r4, r8, 7 -/* 80354CB4 55 06 78 20 */ slwi r6, r8, 0xf -/* 80354CB8 7D 04 22 78 */ xor r4, r8, r4 -/* 80354CBC 55 07 B8 10 */ slwi r7, r8, 0x17 -/* 80354CC0 7C C4 22 78 */ xor r4, r6, r4 -/* 80354CC4 7C E4 22 38 */ eqv r4, r7, r4 -/* 80354CC8 54 84 17 BC */ rlwinm r4, r4, 2, 0x1e, 0x1e -/* 80354CCC 51 04 08 3A */ rlwimi r4, r8, 1, 0, 0x1d -/* 80354CD0 38 63 00 08 */ addi r3, r3, 8 -/* 80354CD4 42 00 FE F8 */ bdnz lbl_80354BCC -/* 80354CD8 20 C3 00 21 */ subfic r6, r3, 0x21 -/* 80354CDC 28 03 00 21 */ cmplwi r3, 0x21 -/* 80354CE0 7C C9 03 A6 */ mtctr r6 -/* 80354CE4 40 80 00 2C */ bge lbl_80354D10 -lbl_80354CE8: -/* 80354CE8 54 83 38 30 */ slwi r3, r4, 7 -/* 80354CEC 54 86 78 20 */ slwi r6, r4, 0xf -/* 80354CF0 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354CF4 54 87 B8 10 */ slwi r7, r4, 0x17 -/* 80354CF8 7C C3 1A 78 */ xor r3, r6, r3 -/* 80354CFC 7C E3 1A 38 */ eqv r3, r7, r3 -/* 80354D00 54 84 08 3C */ slwi r4, r4, 1 -/* 80354D04 54 63 17 BC */ rlwinm r3, r3, 2, 0x1e, 0x1e -/* 80354D08 7C 84 1B 78 */ or r4, r4, r3 -/* 80354D0C 42 00 FF DC */ bdnz lbl_80354CE8 -lbl_80354D10: -/* 80354D10 54 83 38 30 */ slwi r3, r4, 7 -/* 80354D14 54 86 78 20 */ slwi r6, r4, 0xf -/* 80354D18 7C 83 1A 78 */ xor r3, r4, r3 -/* 80354D1C 54 87 B8 10 */ slwi r7, r4, 0x17 -/* 80354D20 7C C3 1A 78 */ xor r3, r6, r3 -/* 80354D24 7C E3 1A 38 */ eqv r3, r7, r3 -/* 80354D28 54 63 0F FE */ srwi r3, r3, 0x1f -/* 80354D2C 7C 83 1B 78 */ or r3, r4, r3 -/* 80354D30 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 80354D34 38 C0 00 08 */ li r6, 8 -/* 80354D38 3B 60 00 00 */ li r27, 0 -/* 80354D3C 90 1C 00 00 */ stw r0, 0(r28) -/* 80354D40 38 7C 00 00 */ addi r3, r28, 0 -/* 80354D44 38 80 00 08 */ li r4, 8 -/* 80354D48 90 BC 00 04 */ stw r5, 4(r28) -/* 80354D4C 93 9D 00 00 */ stw r28, 0(r29) -/* 80354D50 90 DD 00 04 */ stw r6, 4(r29) -/* 80354D54 92 DD 00 0C */ stw r22, 0xc(r29) -/* 80354D58 93 7D 00 08 */ stw r27, 8(r29) -/* 80354D5C 4B FE 68 51 */ bl DCFlushRange -/* 80354D60 38 76 00 00 */ addi r3, r22, 0 -/* 80354D64 38 80 00 04 */ li r4, 4 -/* 80354D68 4B FE 68 19 */ bl DCInvalidateRange -/* 80354D6C 38 7D 00 00 */ addi r3, r29, 0 -/* 80354D70 38 80 00 10 */ li r4, 0x10 -/* 80354D74 4B FE 68 39 */ bl DCFlushRange -/* 80354D78 38 00 00 FF */ li r0, 0xff -/* 80354D7C 3C 60 80 3D */ lis r3, CardData@ha /* 0x803D1EA0@ha */ -/* 80354D80 90 1E 00 04 */ stw r0, 4(r30) -/* 80354D84 38 63 1E A0 */ addi r3, r3, CardData@l /* 0x803D1EA0@l */ -/* 80354D88 3C 03 80 00 */ addis r0, r3, 0x8000 -/* 80354D8C 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80354D90 38 00 01 60 */ li r0, 0x160 -/* 80354D94 3C 80 80 35 */ lis r4, InitCallback@ha /* 0x80354DF0@ha */ -/* 80354D98 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80354D9C 3C 60 80 35 */ lis r3, DoneCallback@ha /* 0x80354E60@ha */ -/* 80354DA0 38 A0 00 10 */ li r5, 0x10 -/* 80354DA4 93 7E 00 14 */ stw r27, 0x14(r30) -/* 80354DA8 38 84 4D F0 */ addi r4, r4, InitCallback@l /* 0x80354DF0@l */ -/* 80354DAC 38 03 4E 60 */ addi r0, r3, DoneCallback@l /* 0x80354E60@l */ -/* 80354DB0 B0 BE 00 24 */ sth r5, 0x24(r30) -/* 80354DB4 7F C3 F3 78 */ mr r3, r30 -/* 80354DB8 90 9E 00 28 */ stw r4, 0x28(r30) -/* 80354DBC 93 7E 00 2C */ stw r27, 0x2c(r30) -/* 80354DC0 90 1E 00 30 */ stw r0, 0x30(r30) -/* 80354DC4 93 7E 00 34 */ stw r27, 0x34(r30) -/* 80354DC8 4B F4 9C 39 */ bl DSPAddTask -/* 80354DCC 93 37 00 00 */ stw r25, 0(r23) -/* 80354DD0 38 60 00 00 */ li r3, 0 -/* 80354DD4 93 57 00 04 */ stw r26, 4(r23) -/* 80354DD8 93 17 00 08 */ stw r24, 8(r23) -lbl_80354DDC: -/* 80354DDC BA C1 00 F8 */ lmw r22, 0xf8(r1) -/* 80354DE0 80 01 01 24 */ lwz r0, 0x124(r1) -/* 80354DE4 38 21 01 20 */ addi r1, r1, 0x120 -/* 80354DE8 7C 08 03 A6 */ mtlr r0 -/* 80354DEC 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDWrite/EraseCallback.s b/asm/dolphin/card/CARDWrite/EraseCallback.s deleted file mode 100644 index d7140c2a86..0000000000 --- a/asm/dolphin/card/CARDWrite/EraseCallback.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80358A84: -/* 80358A84 7C 08 02 A6 */ mflr r0 -/* 80358A88 90 01 00 04 */ stw r0, 4(r1) -/* 80358A8C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80358A90 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80358A94 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80358A98 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80358A9C 7C 9D 23 79 */ or. r29, r4, r4 -/* 80358AA0 93 81 00 10 */ stw r28, 0x10(r1) -/* 80358AA4 3B 83 00 00 */ addi r28, r3, 0 -/* 80358AA8 1C BC 01 10 */ mulli r5, r28, 0x110 -/* 80358AAC 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80358AB0 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80358AB4 7F E0 2A 14 */ add r31, r0, r5 -/* 80358AB8 41 80 00 30 */ blt lbl_80358AE8 -/* 80358ABC 80 9F 00 C0 */ lwz r4, 0xc0(r31) -/* 80358AC0 3C 60 80 36 */ lis r3, WriteCallback@ha /* 0x80358914@ha */ -/* 80358AC4 38 E3 89 14 */ addi r7, r3, WriteCallback@l /* 0x80358914@l */ -/* 80358AC8 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 80358ACC A0 04 00 10 */ lhz r0, 0x10(r4) -/* 80358AD0 80 DF 00 B4 */ lwz r6, 0xb4(r31) -/* 80358AD4 38 7C 00 00 */ addi r3, r28, 0 -/* 80358AD8 7C 85 01 D6 */ mullw r4, r5, r0 -/* 80358ADC 4B FF C8 D1 */ bl __CARDWrite -/* 80358AE0 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80358AE4 40 80 00 30 */ bge lbl_80358B14 -lbl_80358AE8: -/* 80358AE8 83 DF 00 D0 */ lwz r30, 0xd0(r31) -/* 80358AEC 38 00 00 00 */ li r0, 0 -/* 80358AF0 38 7F 00 00 */ addi r3, r31, 0 -/* 80358AF4 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80358AF8 7F A4 EB 78 */ mr r4, r29 -/* 80358AFC 4B FF B1 71 */ bl __CARDPutControlBlock -/* 80358B00 39 9E 00 00 */ addi r12, r30, 0 -/* 80358B04 7D 88 03 A6 */ mtlr r12 -/* 80358B08 38 7C 00 00 */ addi r3, r28, 0 -/* 80358B0C 38 9D 00 00 */ addi r4, r29, 0 -/* 80358B10 4E 80 00 21 */ blrl -lbl_80358B14: -/* 80358B14 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80358B18 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80358B1C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80358B20 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80358B24 83 81 00 10 */ lwz r28, 0x10(r1) -/* 80358B28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80358B2C 7C 08 03 A6 */ mtlr r0 -/* 80358B30 4E 80 00 20 */ blr diff --git a/asm/dolphin/card/CARDWrite/WriteCallback.s b/asm/dolphin/card/CARDWrite/WriteCallback.s deleted file mode 100644 index ba0a778188..0000000000 --- a/asm/dolphin/card/CARDWrite/WriteCallback.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_80358914: -/* 80358914 7C 08 02 A6 */ mflr r0 -/* 80358918 90 01 00 04 */ stw r0, 4(r1) -/* 8035891C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80358920 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80358924 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80358928 3B C3 00 00 */ addi r30, r3, 0 -/* 8035892C 3C 60 80 45 */ lis r3, __CARDBlock@ha /* 0x8044CBC0@ha */ -/* 80358930 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80358934 1C BE 01 10 */ mulli r5, r30, 0x110 -/* 80358938 93 81 00 10 */ stw r28, 0x10(r1) -/* 8035893C 38 03 CB C0 */ addi r0, r3, __CARDBlock@l /* 0x8044CBC0@l */ -/* 80358940 7C 9C 23 79 */ or. r28, r4, r4 -/* 80358944 7F E0 2A 14 */ add r31, r0, r5 -/* 80358948 41 80 00 F0 */ blt lbl_80358A38 -/* 8035894C 83 BF 00 C0 */ lwz r29, 0xc0(r31) -/* 80358950 80 7D 00 0C */ lwz r3, 0xc(r29) -/* 80358954 2C 03 00 00 */ cmpwi r3, 0 -/* 80358958 40 80 00 0C */ bge lbl_80358964 -/* 8035895C 3B 80 FF F2 */ li r28, -14 -/* 80358960 48 00 00 D8 */ b lbl_80358A38 -lbl_80358964: -/* 80358964 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 80358968 7C 00 18 50 */ subf r0, r0, r3 -/* 8035896C 90 1D 00 0C */ stw r0, 0xc(r29) -/* 80358970 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 80358974 2C 00 00 00 */ cmpwi r0, 0 -/* 80358978 41 81 00 54 */ bgt lbl_803589CC -/* 8035897C 7F E3 FB 78 */ mr r3, r31 -/* 80358980 4B FF CD FD */ bl __CARDGetDirBlock -/* 80358984 80 BD 00 04 */ lwz r5, 4(r29) -/* 80358988 3C 80 80 00 */ lis r4, 0x8000 /* 0x800000F8@ha */ -/* 8035898C 80 04 00 F8 */ lwz r0, 0x00F8(r4) /* 0x800000F8@l */ -/* 80358990 54 A4 30 32 */ slwi r4, r5, 6 -/* 80358994 7F 83 22 14 */ add r28, r3, r4 -/* 80358998 54 1D F0 BE */ srwi r29, r0, 2 -/* 8035899C 4B FE 9D 61 */ bl OSGetTime -/* 803589A0 38 DD 00 00 */ addi r6, r29, 0 -/* 803589A4 38 A0 00 00 */ li r5, 0 -/* 803589A8 48 00 99 7D */ bl __div2i -/* 803589AC 90 9C 00 28 */ stw r4, 0x28(r28) -/* 803589B0 38 00 00 00 */ li r0, 0 -/* 803589B4 38 7E 00 00 */ addi r3, r30, 0 -/* 803589B8 80 9F 00 D0 */ lwz r4, 0xd0(r31) -/* 803589BC 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 803589C0 4B FF CF 5D */ bl __CARDUpdateDir -/* 803589C4 7C 7C 1B 78 */ mr r28, r3 -/* 803589C8 48 00 00 68 */ b lbl_80358A30 -lbl_803589CC: -/* 803589CC 7F E3 FB 78 */ mr r3, r31 -/* 803589D0 4B FF CA 45 */ bl __CARDGetFatBlock -/* 803589D4 80 9D 00 08 */ lwz r4, 8(r29) -/* 803589D8 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 803589DC 7C 04 02 14 */ add r0, r4, r0 -/* 803589E0 90 1D 00 08 */ stw r0, 8(r29) -/* 803589E4 A0 1D 00 10 */ lhz r0, 0x10(r29) -/* 803589E8 54 00 08 3C */ slwi r0, r0, 1 -/* 803589EC 7C 03 02 2E */ lhzx r0, r3, r0 -/* 803589F0 B0 1D 00 10 */ sth r0, 0x10(r29) -/* 803589F4 A0 9D 00 10 */ lhz r4, 0x10(r29) -/* 803589F8 28 04 00 05 */ cmplwi r4, 5 -/* 803589FC 41 80 00 10 */ blt lbl_80358A0C -/* 80358A00 A0 1F 00 10 */ lhz r0, 0x10(r31) -/* 80358A04 7C 04 00 40 */ cmplw r4, r0 -/* 80358A08 41 80 00 0C */ blt lbl_80358A14 -lbl_80358A0C: -/* 80358A0C 3B 80 FF FA */ li r28, -6 -/* 80358A10 48 00 00 28 */ b lbl_80358A38 -lbl_80358A14: -/* 80358A14 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 80358A18 3C 60 80 36 */ lis r3, EraseCallback@ha /* 0x80358A84@ha */ -/* 80358A1C 38 A3 8A 84 */ addi r5, r3, EraseCallback@l /* 0x80358A84@l */ -/* 80358A20 7C 80 21 D6 */ mullw r4, r0, r4 -/* 80358A24 38 7E 00 00 */ addi r3, r30, 0 -/* 80358A28 4B FF AF 91 */ bl __CARDEraseSector -/* 80358A2C 7C 7C 1B 78 */ mr r28, r3 -lbl_80358A30: -/* 80358A30 2C 1C 00 00 */ cmpwi r28, 0 -/* 80358A34 40 80 00 30 */ bge lbl_80358A64 -lbl_80358A38: -/* 80358A38 83 BF 00 D0 */ lwz r29, 0xd0(r31) -/* 80358A3C 38 00 00 00 */ li r0, 0 -/* 80358A40 38 7F 00 00 */ addi r3, r31, 0 -/* 80358A44 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80358A48 7F 84 E3 78 */ mr r4, r28 -/* 80358A4C 4B FF B2 21 */ bl __CARDPutControlBlock -/* 80358A50 39 9D 00 00 */ addi r12, r29, 0 -/* 80358A54 7D 88 03 A6 */ mtlr r12 -/* 80358A58 38 7E 00 00 */ addi r3, r30, 0 -/* 80358A5C 38 9C 00 00 */ addi r4, r28, 0 -/* 80358A60 4E 80 00 21 */ blrl -lbl_80358A64: -/* 80358A64 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80358A68 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80358A6C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80358A70 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80358A74 83 81 00 10 */ lwz r28, 0x10(r1) -/* 80358A78 38 21 00 20 */ addi r1, r1, 0x20 -/* 80358A7C 7C 08 03 A6 */ mtlr r0 -/* 80358A80 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/DVDCancelAsync.s b/asm/dolphin/dvd/dvd/DVDCancelAsync.s deleted file mode 100644 index 186bc4a9d5..0000000000 --- a/asm/dolphin/dvd/dvd/DVDCancelAsync.s +++ /dev/null @@ -1,177 +0,0 @@ -lbl_8034B2D4: -/* 8034B2D4 7C 08 02 A6 */ mflr r0 -/* 8034B2D8 90 01 00 04 */ stw r0, 4(r1) -/* 8034B2DC 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 8034B2E0 93 E1 00 24 */ stw r31, 0x24(r1) -/* 8034B2E4 93 C1 00 20 */ stw r30, 0x20(r1) -/* 8034B2E8 3B C4 00 00 */ addi r30, r4, 0 -/* 8034B2EC 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 8034B2F0 3B A3 00 00 */ addi r29, r3, 0 -/* 8034B2F4 4B FF 24 01 */ bl OSDisableInterrupts -/* 8034B2F8 80 9D 00 0C */ lwz r4, 0xc(r29) -/* 8034B2FC 3B E3 00 00 */ addi r31, r3, 0 -/* 8034B300 38 04 00 01 */ addi r0, r4, 1 -/* 8034B304 28 00 00 0C */ cmplwi r0, 0xc -/* 8034B308 41 81 02 20 */ bgt lbl_8034B528 -/* 8034B30C 3C 60 80 3D */ lis r3, lit_956@ha /* 0x803D163C@ha */ -/* 8034B310 38 63 16 3C */ addi r3, r3, lit_956@l /* 0x803D163C@l */ -/* 8034B314 54 00 10 3A */ slwi r0, r0, 2 -/* 8034B318 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8034B31C 7C 09 03 A6 */ mtctr r0 -/* 8034B320 4E 80 04 20 */ bctr -/* 8034B324 28 1E 00 00 */ cmplwi r30, 0 -/* 8034B328 41 82 02 00 */ beq lbl_8034B528 -/* 8034B32C 39 9E 00 00 */ addi r12, r30, 0 -/* 8034B330 7D 88 03 A6 */ mtlr r12 -/* 8034B334 38 9D 00 00 */ addi r4, r29, 0 -/* 8034B338 38 60 00 00 */ li r3, 0 -/* 8034B33C 4E 80 00 21 */ blrl -/* 8034B340 48 00 01 E8 */ b lbl_8034B528 -/* 8034B344 80 0D 92 18 */ lwz r0, Canceling(r13) -/* 8034B348 28 00 00 00 */ cmplwi r0, 0 -/* 8034B34C 41 82 00 14 */ beq lbl_8034B360 -/* 8034B350 7F E3 FB 78 */ mr r3, r31 -/* 8034B354 4B FF 23 C9 */ bl OSRestoreInterrupts -/* 8034B358 38 60 00 00 */ li r3, 0 -/* 8034B35C 48 00 01 D8 */ b lbl_8034B534 -lbl_8034B360: -/* 8034B360 38 00 00 01 */ li r0, 1 -/* 8034B364 93 CD 92 1C */ stw r30, CancelCallback(r13) -/* 8034B368 90 0D 92 18 */ stw r0, Canceling(r13) -/* 8034B36C 80 1D 00 08 */ lwz r0, 8(r29) -/* 8034B370 28 00 00 04 */ cmplwi r0, 4 -/* 8034B374 41 82 00 0C */ beq lbl_8034B380 -/* 8034B378 28 00 00 01 */ cmplwi r0, 1 -/* 8034B37C 40 82 01 AC */ bne lbl_8034B528 -lbl_8034B380: -/* 8034B380 4B FF D0 C5 */ bl DVDLowBreak -/* 8034B384 48 00 01 A4 */ b lbl_8034B528 -/* 8034B388 7F A3 EB 78 */ mr r3, r29 -/* 8034B38C 48 00 06 81 */ bl __DVDDequeueWaitingQueue -/* 8034B390 38 00 00 0A */ li r0, 0xa -/* 8034B394 90 1D 00 0C */ stw r0, 0xc(r29) -/* 8034B398 81 9D 00 28 */ lwz r12, 0x28(r29) -/* 8034B39C 28 0C 00 00 */ cmplwi r12, 0 -/* 8034B3A0 41 82 00 14 */ beq lbl_8034B3B4 -/* 8034B3A4 7D 88 03 A6 */ mtlr r12 -/* 8034B3A8 38 9D 00 00 */ addi r4, r29, 0 -/* 8034B3AC 38 60 FF FD */ li r3, -3 -/* 8034B3B0 4E 80 00 21 */ blrl -lbl_8034B3B4: -/* 8034B3B4 28 1E 00 00 */ cmplwi r30, 0 -/* 8034B3B8 41 82 01 70 */ beq lbl_8034B528 -/* 8034B3BC 39 9E 00 00 */ addi r12, r30, 0 -/* 8034B3C0 7D 88 03 A6 */ mtlr r12 -/* 8034B3C4 38 9D 00 00 */ addi r4, r29, 0 -/* 8034B3C8 38 60 00 00 */ li r3, 0 -/* 8034B3CC 4E 80 00 21 */ blrl -/* 8034B3D0 48 00 01 58 */ b lbl_8034B528 -/* 8034B3D4 80 1D 00 08 */ lwz r0, 8(r29) -/* 8034B3D8 2C 00 00 0D */ cmpwi r0, 0xd -/* 8034B3DC 41 82 00 28 */ beq lbl_8034B404 -/* 8034B3E0 40 80 00 18 */ bge lbl_8034B3F8 -/* 8034B3E4 2C 00 00 06 */ cmpwi r0, 6 -/* 8034B3E8 40 80 00 3C */ bge lbl_8034B424 -/* 8034B3EC 2C 00 00 04 */ cmpwi r0, 4 -/* 8034B3F0 40 80 00 14 */ bge lbl_8034B404 -/* 8034B3F4 48 00 00 30 */ b lbl_8034B424 -lbl_8034B3F8: -/* 8034B3F8 2C 00 00 0F */ cmpwi r0, 0xf -/* 8034B3FC 41 82 00 08 */ beq lbl_8034B404 -/* 8034B400 48 00 00 24 */ b lbl_8034B424 -lbl_8034B404: -/* 8034B404 28 1E 00 00 */ cmplwi r30, 0 -/* 8034B408 41 82 01 20 */ beq lbl_8034B528 -/* 8034B40C 39 9E 00 00 */ addi r12, r30, 0 -/* 8034B410 7D 88 03 A6 */ mtlr r12 -/* 8034B414 38 9D 00 00 */ addi r4, r29, 0 -/* 8034B418 38 60 00 00 */ li r3, 0 -/* 8034B41C 4E 80 00 21 */ blrl -/* 8034B420 48 00 01 08 */ b lbl_8034B528 -lbl_8034B424: -/* 8034B424 80 0D 92 18 */ lwz r0, Canceling(r13) -/* 8034B428 28 00 00 00 */ cmplwi r0, 0 -/* 8034B42C 41 82 00 14 */ beq lbl_8034B440 -/* 8034B430 7F E3 FB 78 */ mr r3, r31 -/* 8034B434 4B FF 22 E9 */ bl OSRestoreInterrupts -/* 8034B438 38 60 00 00 */ li r3, 0 -/* 8034B43C 48 00 00 F8 */ b lbl_8034B534 -lbl_8034B440: -/* 8034B440 38 00 00 01 */ li r0, 1 -/* 8034B444 93 CD 92 1C */ stw r30, CancelCallback(r13) -/* 8034B448 90 0D 92 18 */ stw r0, Canceling(r13) -/* 8034B44C 48 00 00 DC */ b lbl_8034B528 -/* 8034B450 4B FF D0 09 */ bl DVDLowClearCallback -/* 8034B454 3C 80 80 35 */ lis r4, cbForStateMotorStopped@ha /* 0x80349FC0@ha */ -/* 8034B458 38 04 9F C0 */ addi r0, r4, cbForStateMotorStopped@l /* 0x80349FC0@l */ -/* 8034B45C 7C 03 00 40 */ cmplw r3, r0 -/* 8034B460 41 82 00 14 */ beq lbl_8034B474 -/* 8034B464 7F E3 FB 78 */ mr r3, r31 -/* 8034B468 4B FF 22 B5 */ bl OSRestoreInterrupts -/* 8034B46C 38 60 00 00 */ li r3, 0 -/* 8034B470 48 00 00 C4 */ b lbl_8034B534 -lbl_8034B474: -/* 8034B474 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 8034B478 2C 00 00 04 */ cmpwi r0, 4 -/* 8034B47C 40 82 00 0C */ bne lbl_8034B488 -/* 8034B480 38 00 00 03 */ li r0, 3 -/* 8034B484 90 0D 92 20 */ stw r0, ResumeFromHere(r13) -lbl_8034B488: -/* 8034B488 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 8034B48C 2C 00 00 05 */ cmpwi r0, 5 -/* 8034B490 40 82 00 0C */ bne lbl_8034B49C -/* 8034B494 38 00 00 04 */ li r0, 4 -/* 8034B498 90 0D 92 20 */ stw r0, ResumeFromHere(r13) -lbl_8034B49C: -/* 8034B49C 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 8034B4A0 2C 00 00 06 */ cmpwi r0, 6 -/* 8034B4A4 40 82 00 0C */ bne lbl_8034B4B0 -/* 8034B4A8 38 00 00 01 */ li r0, 1 -/* 8034B4AC 90 0D 92 20 */ stw r0, ResumeFromHere(r13) -lbl_8034B4B0: -/* 8034B4B0 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 8034B4B4 2C 00 00 0B */ cmpwi r0, 0xb -/* 8034B4B8 40 82 00 0C */ bne lbl_8034B4C4 -/* 8034B4BC 38 00 00 02 */ li r0, 2 -/* 8034B4C0 90 0D 92 20 */ stw r0, ResumeFromHere(r13) -lbl_8034B4C4: -/* 8034B4C4 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 8034B4C8 2C 00 00 07 */ cmpwi r0, 7 -/* 8034B4CC 40 82 00 0C */ bne lbl_8034B4D8 -/* 8034B4D0 38 00 00 07 */ li r0, 7 -/* 8034B4D4 90 0D 92 20 */ stw r0, ResumeFromHere(r13) -lbl_8034B4D8: -/* 8034B4D8 3C 60 80 45 */ lis r3, DummyCommandBlock@ha /* 0x8044C940@ha */ -/* 8034B4DC 38 03 C9 40 */ addi r0, r3, DummyCommandBlock@l /* 0x8044C940@l */ -/* 8034B4E0 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034B4E4 38 00 00 0A */ li r0, 0xa -/* 8034B4E8 90 1D 00 0C */ stw r0, 0xc(r29) -/* 8034B4EC 81 9D 00 28 */ lwz r12, 0x28(r29) -/* 8034B4F0 28 0C 00 00 */ cmplwi r12, 0 -/* 8034B4F4 41 82 00 14 */ beq lbl_8034B508 -/* 8034B4F8 7D 88 03 A6 */ mtlr r12 -/* 8034B4FC 38 9D 00 00 */ addi r4, r29, 0 -/* 8034B500 38 60 FF FD */ li r3, -3 -/* 8034B504 4E 80 00 21 */ blrl -lbl_8034B508: -/* 8034B508 28 1E 00 00 */ cmplwi r30, 0 -/* 8034B50C 41 82 00 18 */ beq lbl_8034B524 -/* 8034B510 39 9E 00 00 */ addi r12, r30, 0 -/* 8034B514 7D 88 03 A6 */ mtlr r12 -/* 8034B518 38 9D 00 00 */ addi r4, r29, 0 -/* 8034B51C 38 60 00 00 */ li r3, 0 -/* 8034B520 4E 80 00 21 */ blrl -lbl_8034B524: -/* 8034B524 4B FF EB 89 */ bl stateReady -lbl_8034B528: -/* 8034B528 7F E3 FB 78 */ mr r3, r31 -/* 8034B52C 4B FF 21 F1 */ bl OSRestoreInterrupts -/* 8034B530 38 60 00 01 */ li r3, 1 -lbl_8034B534: -/* 8034B534 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8034B538 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 8034B53C 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 8034B540 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 8034B544 38 21 00 28 */ addi r1, r1, 0x28 -/* 8034B548 7C 08 03 A6 */ mtlr r0 -/* 8034B54C 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/DVDCancelStreamAsync.s b/asm/dolphin/dvd/dvd/DVDCancelStreamAsync.s deleted file mode 100644 index 4ee9413913..0000000000 --- a/asm/dolphin/dvd/dvd/DVDCancelStreamAsync.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8034AFAC: -/* 8034AFAC 7C 08 02 A6 */ mflr r0 -/* 8034AFB0 90 01 00 04 */ stw r0, 4(r1) -/* 8034AFB4 38 00 00 07 */ li r0, 7 -/* 8034AFB8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8034AFBC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8034AFC0 3B E3 00 00 */ addi r31, r3, 0 -/* 8034AFC4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8034AFC8 90 03 00 08 */ stw r0, 8(r3) -/* 8034AFCC 90 83 00 28 */ stw r4, 0x28(r3) -/* 8034AFD0 80 0D 84 6C */ lwz r0, autoInvalidation(r13) -/* 8034AFD4 2C 00 00 00 */ cmpwi r0, 0 -/* 8034AFD8 41 82 00 30 */ beq lbl_8034B008 -/* 8034AFDC 80 7F 00 08 */ lwz r3, 8(r31) -/* 8034AFE0 28 03 00 01 */ cmplwi r3, 1 -/* 8034AFE4 41 82 00 18 */ beq lbl_8034AFFC -/* 8034AFE8 38 03 FF FC */ addi r0, r3, -4 -/* 8034AFEC 28 00 00 01 */ cmplwi r0, 1 -/* 8034AFF0 40 81 00 0C */ ble lbl_8034AFFC -/* 8034AFF4 28 03 00 0E */ cmplwi r3, 0xe -/* 8034AFF8 40 82 00 10 */ bne lbl_8034B008 -lbl_8034AFFC: -/* 8034AFFC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8034B000 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 8034B004 4B FF 05 7D */ bl DCInvalidateRange -lbl_8034B008: -/* 8034B008 4B FF 26 ED */ bl OSDisableInterrupts -/* 8034B00C 38 00 00 02 */ li r0, 2 -/* 8034B010 90 1F 00 0C */ stw r0, 0xc(r31) -/* 8034B014 3B C3 00 00 */ addi r30, r3, 0 -/* 8034B018 38 9F 00 00 */ addi r4, r31, 0 -/* 8034B01C 38 60 00 01 */ li r3, 1 -/* 8034B020 48 00 08 8D */ bl __DVDPushWaitingQueue -/* 8034B024 80 0D 91 F8 */ lwz r0, executing(r13) -/* 8034B028 3B E3 00 00 */ addi r31, r3, 0 -/* 8034B02C 28 00 00 00 */ cmplwi r0, 0 -/* 8034B030 40 82 00 14 */ bne lbl_8034B044 -/* 8034B034 80 0D 92 04 */ lwz r0, PauseFlag(r13) -/* 8034B038 2C 00 00 00 */ cmpwi r0, 0 -/* 8034B03C 40 82 00 08 */ bne lbl_8034B044 -/* 8034B040 4B FF F0 6D */ bl stateReady -lbl_8034B044: -/* 8034B044 7F C3 F3 78 */ mr r3, r30 -/* 8034B048 4B FF 26 D5 */ bl OSRestoreInterrupts -/* 8034B04C 7F E3 FB 78 */ mr r3, r31 -/* 8034B050 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8034B054 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8034B058 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8034B05C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034B060 7C 08 03 A6 */ mtlr r0 -/* 8034B064 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/DVDCheckDisk.s b/asm/dolphin/dvd/dvd/DVDCheckDisk.s deleted file mode 100644 index ef6f95e2e6..0000000000 --- a/asm/dolphin/dvd/dvd/DVDCheckDisk.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8034B628: -/* 8034B628 7C 08 02 A6 */ mflr r0 -/* 8034B62C 90 01 00 04 */ stw r0, 4(r1) -/* 8034B630 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8034B634 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8034B638 4B FF 20 BD */ bl OSDisableInterrupts -/* 8034B63C 80 0D 92 10 */ lwz r0, FatalErrorFlag(r13) -/* 8034B640 2C 00 00 00 */ cmpwi r0, 0 -/* 8034B644 41 82 00 0C */ beq lbl_8034B650 -/* 8034B648 38 80 FF FF */ li r4, -1 -/* 8034B64C 48 00 00 48 */ b lbl_8034B694 -lbl_8034B650: -/* 8034B650 80 0D 92 08 */ lwz r0, PausingFlag(r13) -/* 8034B654 2C 00 00 00 */ cmpwi r0, 0 -/* 8034B658 41 82 00 0C */ beq lbl_8034B664 -/* 8034B65C 38 80 00 08 */ li r4, 8 -/* 8034B660 48 00 00 34 */ b lbl_8034B694 -lbl_8034B664: -/* 8034B664 80 AD 91 F8 */ lwz r5, executing(r13) -/* 8034B668 28 05 00 00 */ cmplwi r5, 0 -/* 8034B66C 40 82 00 0C */ bne lbl_8034B678 -/* 8034B670 38 80 00 00 */ li r4, 0 -/* 8034B674 48 00 00 20 */ b lbl_8034B694 -lbl_8034B678: -/* 8034B678 3C 80 80 45 */ lis r4, DummyCommandBlock@ha /* 0x8044C940@ha */ -/* 8034B67C 38 04 C9 40 */ addi r0, r4, DummyCommandBlock@l /* 0x8044C940@l */ -/* 8034B680 7C 05 00 40 */ cmplw r5, r0 -/* 8034B684 40 82 00 0C */ bne lbl_8034B690 -/* 8034B688 38 80 00 00 */ li r4, 0 -/* 8034B68C 48 00 00 08 */ b lbl_8034B694 -lbl_8034B690: -/* 8034B690 80 85 00 0C */ lwz r4, 0xc(r5) -lbl_8034B694: -/* 8034B694 38 04 00 01 */ addi r0, r4, 1 -/* 8034B698 28 00 00 0C */ cmplwi r0, 0xc -/* 8034B69C 41 81 00 68 */ bgt lbl_8034B704 -/* 8034B6A0 3C 80 80 3D */ lis r4, lit_1060@ha /* 0x803D1670@ha */ -/* 8034B6A4 38 84 16 70 */ addi r4, r4, lit_1060@l /* 0x803D1670@l */ -/* 8034B6A8 54 00 10 3A */ slwi r0, r0, 2 -/* 8034B6AC 7C 04 00 2E */ lwzx r0, r4, r0 -/* 8034B6B0 7C 09 03 A6 */ mtctr r0 -/* 8034B6B4 4E 80 04 20 */ bctr -/* 8034B6B8 3B E0 00 01 */ li r31, 1 -/* 8034B6BC 48 00 00 48 */ b lbl_8034B704 -/* 8034B6C0 3B E0 00 00 */ li r31, 0 -/* 8034B6C4 48 00 00 40 */ b lbl_8034B704 -/* 8034B6C8 3C 80 CC 00 */ lis r4, 0xCC00 /* 0xCC006000@ha */ -/* 8034B6CC 38 84 60 00 */ addi r4, r4, 0x6000 /* 0xCC006000@l */ -/* 8034B6D0 80 84 00 04 */ lwz r4, 4(r4) -/* 8034B6D4 54 80 F7 FF */ rlwinm. r0, r4, 0x1e, 0x1f, 0x1f -/* 8034B6D8 40 82 00 0C */ bne lbl_8034B6E4 -/* 8034B6DC 54 80 07 FF */ clrlwi. r0, r4, 0x1f -/* 8034B6E0 41 82 00 0C */ beq lbl_8034B6EC -lbl_8034B6E4: -/* 8034B6E4 3B E0 00 00 */ li r31, 0 -/* 8034B6E8 48 00 00 1C */ b lbl_8034B704 -lbl_8034B6EC: -/* 8034B6EC 80 0D 92 20 */ lwz r0, ResumeFromHere(r13) -/* 8034B6F0 28 00 00 00 */ cmplwi r0, 0 -/* 8034B6F4 41 82 00 0C */ beq lbl_8034B700 -/* 8034B6F8 3B E0 00 00 */ li r31, 0 -/* 8034B6FC 48 00 00 08 */ b lbl_8034B704 -lbl_8034B700: -/* 8034B700 3B E0 00 01 */ li r31, 1 -lbl_8034B704: -/* 8034B704 4B FF 20 19 */ bl OSRestoreInterrupts -/* 8034B708 7F E3 FB 78 */ mr r3, r31 -/* 8034B70C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8034B710 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8034B714 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B718 7C 08 03 A6 */ mtlr r0 -/* 8034B71C 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/DVDGetCommandBlockStatus.s b/asm/dolphin/dvd/dvd/DVDGetCommandBlockStatus.s deleted file mode 100644 index bab5cb0953..0000000000 --- a/asm/dolphin/dvd/dvd/DVDGetCommandBlockStatus.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8034B17C: -/* 8034B17C 7C 08 02 A6 */ mflr r0 -/* 8034B180 90 01 00 04 */ stw r0, 4(r1) -/* 8034B184 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 8034B188 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034B18C 7C 7F 1B 78 */ mr r31, r3 -/* 8034B190 4B FF 25 65 */ bl OSDisableInterrupts -/* 8034B194 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 8034B198 2C 00 00 03 */ cmpwi r0, 3 -/* 8034B19C 40 82 00 0C */ bne lbl_8034B1A8 -/* 8034B1A0 3B E0 00 01 */ li r31, 1 -/* 8034B1A4 48 00 00 08 */ b lbl_8034B1AC -lbl_8034B1A8: -/* 8034B1A8 7C 1F 03 78 */ mr r31, r0 -lbl_8034B1AC: -/* 8034B1AC 4B FF 25 71 */ bl OSRestoreInterrupts -/* 8034B1B0 7F E3 FB 78 */ mr r3, r31 -/* 8034B1B4 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8034B1B8 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8034B1BC 38 21 00 18 */ addi r1, r1, 0x18 -/* 8034B1C0 7C 08 03 A6 */ mtlr r0 -/* 8034B1C4 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/DVDGetDriveStatus.s b/asm/dolphin/dvd/dvd/DVDGetDriveStatus.s deleted file mode 100644 index 4712c8c140..0000000000 --- a/asm/dolphin/dvd/dvd/DVDGetDriveStatus.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8034B1C8: -/* 8034B1C8 7C 08 02 A6 */ mflr r0 -/* 8034B1CC 90 01 00 04 */ stw r0, 4(r1) -/* 8034B1D0 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 8034B1D4 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034B1D8 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8034B1DC 4B FF 25 19 */ bl OSDisableInterrupts -/* 8034B1E0 80 0D 92 10 */ lwz r0, FatalErrorFlag(r13) -/* 8034B1E4 3B C3 00 00 */ addi r30, r3, 0 -/* 8034B1E8 2C 00 00 00 */ cmpwi r0, 0 -/* 8034B1EC 41 82 00 0C */ beq lbl_8034B1F8 -/* 8034B1F0 3B E0 FF FF */ li r31, -1 -/* 8034B1F4 48 00 00 5C */ b lbl_8034B250 -lbl_8034B1F8: -/* 8034B1F8 80 0D 92 08 */ lwz r0, PausingFlag(r13) -/* 8034B1FC 2C 00 00 00 */ cmpwi r0, 0 -/* 8034B200 41 82 00 0C */ beq lbl_8034B20C -/* 8034B204 3B E0 00 08 */ li r31, 8 -/* 8034B208 48 00 00 48 */ b lbl_8034B250 -lbl_8034B20C: -/* 8034B20C 83 ED 91 F8 */ lwz r31, executing(r13) -/* 8034B210 28 1F 00 00 */ cmplwi r31, 0 -/* 8034B214 40 82 00 0C */ bne lbl_8034B220 -/* 8034B218 3B E0 00 00 */ li r31, 0 -/* 8034B21C 48 00 00 34 */ b lbl_8034B250 -lbl_8034B220: -/* 8034B220 3C 60 80 45 */ lis r3, DummyCommandBlock@ha /* 0x8044C940@ha */ -/* 8034B224 38 03 C9 40 */ addi r0, r3, DummyCommandBlock@l /* 0x8044C940@l */ -/* 8034B228 7C 1F 00 40 */ cmplw r31, r0 -/* 8034B22C 40 82 00 0C */ bne lbl_8034B238 -/* 8034B230 3B E0 00 00 */ li r31, 0 -/* 8034B234 48 00 00 1C */ b lbl_8034B250 -lbl_8034B238: -/* 8034B238 4B FF 24 BD */ bl OSDisableInterrupts -/* 8034B23C 83 FF 00 0C */ lwz r31, 0xc(r31) -/* 8034B240 2C 1F 00 03 */ cmpwi r31, 3 -/* 8034B244 40 82 00 08 */ bne lbl_8034B24C -/* 8034B248 3B E0 00 01 */ li r31, 1 -lbl_8034B24C: -/* 8034B24C 4B FF 24 D1 */ bl OSRestoreInterrupts -lbl_8034B250: -/* 8034B250 7F C3 F3 78 */ mr r3, r30 -/* 8034B254 4B FF 24 C9 */ bl OSRestoreInterrupts -/* 8034B258 7F E3 FB 78 */ mr r3, r31 -/* 8034B25C 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8034B260 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8034B264 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 8034B268 38 21 00 18 */ addi r1, r1, 0x18 -/* 8034B26C 7C 08 03 A6 */ mtlr r0 -/* 8034B270 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/DVDInquiryAsync.s b/asm/dolphin/dvd/dvd/DVDInquiryAsync.s deleted file mode 100644 index a60ea21b00..0000000000 --- a/asm/dolphin/dvd/dvd/DVDInquiryAsync.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_8034B068: -/* 8034B068 7C 08 02 A6 */ mflr r0 -/* 8034B06C 90 01 00 04 */ stw r0, 4(r1) -/* 8034B070 38 00 00 0E */ li r0, 0xe -/* 8034B074 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 8034B078 93 E1 00 24 */ stw r31, 0x24(r1) -/* 8034B07C 3B E3 00 00 */ addi r31, r3, 0 -/* 8034B080 93 C1 00 20 */ stw r30, 0x20(r1) -/* 8034B084 90 03 00 08 */ stw r0, 8(r3) -/* 8034B088 38 60 00 20 */ li r3, 0x20 -/* 8034B08C 38 00 00 00 */ li r0, 0 -/* 8034B090 90 9F 00 18 */ stw r4, 0x18(r31) -/* 8034B094 90 7F 00 14 */ stw r3, 0x14(r31) -/* 8034B098 90 1F 00 20 */ stw r0, 0x20(r31) -/* 8034B09C 90 BF 00 28 */ stw r5, 0x28(r31) -/* 8034B0A0 80 0D 84 6C */ lwz r0, autoInvalidation(r13) -/* 8034B0A4 2C 00 00 00 */ cmpwi r0, 0 -/* 8034B0A8 41 82 00 30 */ beq lbl_8034B0D8 -/* 8034B0AC 80 7F 00 08 */ lwz r3, 8(r31) -/* 8034B0B0 28 03 00 01 */ cmplwi r3, 1 -/* 8034B0B4 41 82 00 18 */ beq lbl_8034B0CC -/* 8034B0B8 38 03 FF FC */ addi r0, r3, -4 -/* 8034B0BC 28 00 00 01 */ cmplwi r0, 1 -/* 8034B0C0 40 81 00 0C */ ble lbl_8034B0CC -/* 8034B0C4 28 03 00 0E */ cmplwi r3, 0xe -/* 8034B0C8 40 82 00 10 */ bne lbl_8034B0D8 -lbl_8034B0CC: -/* 8034B0CC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8034B0D0 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 8034B0D4 4B FF 04 AD */ bl DCInvalidateRange -lbl_8034B0D8: -/* 8034B0D8 4B FF 26 1D */ bl OSDisableInterrupts -/* 8034B0DC 38 00 00 02 */ li r0, 2 -/* 8034B0E0 90 1F 00 0C */ stw r0, 0xc(r31) -/* 8034B0E4 3B C3 00 00 */ addi r30, r3, 0 -/* 8034B0E8 38 9F 00 00 */ addi r4, r31, 0 -/* 8034B0EC 38 60 00 02 */ li r3, 2 -/* 8034B0F0 48 00 07 BD */ bl __DVDPushWaitingQueue -/* 8034B0F4 80 0D 91 F8 */ lwz r0, executing(r13) -/* 8034B0F8 3B E3 00 00 */ addi r31, r3, 0 -/* 8034B0FC 28 00 00 00 */ cmplwi r0, 0 -/* 8034B100 40 82 00 14 */ bne lbl_8034B114 -/* 8034B104 80 0D 92 04 */ lwz r0, PauseFlag(r13) -/* 8034B108 2C 00 00 00 */ cmpwi r0, 0 -/* 8034B10C 40 82 00 08 */ bne lbl_8034B114 -/* 8034B110 4B FF EF 9D */ bl stateReady -lbl_8034B114: -/* 8034B114 7F C3 F3 78 */ mr r3, r30 -/* 8034B118 4B FF 26 05 */ bl OSRestoreInterrupts -/* 8034B11C 7F E3 FB 78 */ mr r3, r31 -/* 8034B120 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8034B124 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 8034B128 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 8034B12C 38 21 00 28 */ addi r1, r1, 0x28 -/* 8034B130 7C 08 03 A6 */ mtlr r0 -/* 8034B134 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/DVDReadAbsAsyncForBS.s b/asm/dolphin/dvd/dvd/DVDReadAbsAsyncForBS.s deleted file mode 100644 index f988406bc0..0000000000 --- a/asm/dolphin/dvd/dvd/DVDReadAbsAsyncForBS.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_8034AE08: -/* 8034AE08 7C 08 02 A6 */ mflr r0 -/* 8034AE0C 90 01 00 04 */ stw r0, 4(r1) -/* 8034AE10 38 00 00 04 */ li r0, 4 -/* 8034AE14 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8034AE18 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8034AE1C 3B E3 00 00 */ addi r31, r3, 0 -/* 8034AE20 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8034AE24 90 03 00 08 */ stw r0, 8(r3) -/* 8034AE28 38 00 00 00 */ li r0, 0 -/* 8034AE2C 90 83 00 18 */ stw r4, 0x18(r3) -/* 8034AE30 90 A3 00 14 */ stw r5, 0x14(r3) -/* 8034AE34 90 C3 00 10 */ stw r6, 0x10(r3) -/* 8034AE38 90 03 00 20 */ stw r0, 0x20(r3) -/* 8034AE3C 90 E3 00 28 */ stw r7, 0x28(r3) -/* 8034AE40 80 0D 84 6C */ lwz r0, autoInvalidation(r13) -/* 8034AE44 2C 00 00 00 */ cmpwi r0, 0 -/* 8034AE48 41 82 00 30 */ beq lbl_8034AE78 -/* 8034AE4C 80 7F 00 08 */ lwz r3, 8(r31) -/* 8034AE50 28 03 00 01 */ cmplwi r3, 1 -/* 8034AE54 41 82 00 18 */ beq lbl_8034AE6C -/* 8034AE58 38 03 FF FC */ addi r0, r3, -4 -/* 8034AE5C 28 00 00 01 */ cmplwi r0, 1 -/* 8034AE60 40 81 00 0C */ ble lbl_8034AE6C -/* 8034AE64 28 03 00 0E */ cmplwi r3, 0xe -/* 8034AE68 40 82 00 10 */ bne lbl_8034AE78 -lbl_8034AE6C: -/* 8034AE6C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8034AE70 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 8034AE74 4B FF 07 0D */ bl DCInvalidateRange -lbl_8034AE78: -/* 8034AE78 4B FF 28 7D */ bl OSDisableInterrupts -/* 8034AE7C 38 00 00 02 */ li r0, 2 -/* 8034AE80 90 1F 00 0C */ stw r0, 0xc(r31) -/* 8034AE84 3B C3 00 00 */ addi r30, r3, 0 -/* 8034AE88 38 9F 00 00 */ addi r4, r31, 0 -/* 8034AE8C 38 60 00 02 */ li r3, 2 -/* 8034AE90 48 00 0A 1D */ bl __DVDPushWaitingQueue -/* 8034AE94 80 0D 91 F8 */ lwz r0, executing(r13) -/* 8034AE98 3B E3 00 00 */ addi r31, r3, 0 -/* 8034AE9C 28 00 00 00 */ cmplwi r0, 0 -/* 8034AEA0 40 82 00 14 */ bne lbl_8034AEB4 -/* 8034AEA4 80 0D 92 04 */ lwz r0, PauseFlag(r13) -/* 8034AEA8 2C 00 00 00 */ cmpwi r0, 0 -/* 8034AEAC 40 82 00 08 */ bne lbl_8034AEB4 -/* 8034AEB0 4B FF F1 FD */ bl stateReady -lbl_8034AEB4: -/* 8034AEB4 7F C3 F3 78 */ mr r3, r30 -/* 8034AEB8 4B FF 28 65 */ bl OSRestoreInterrupts -/* 8034AEBC 7F E3 FB 78 */ mr r3, r31 -/* 8034AEC0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8034AEC4 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8034AEC8 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 8034AECC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034AED0 7C 08 03 A6 */ mtlr r0 -/* 8034AED4 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/DVDReadAbsAsyncPrio.s b/asm/dolphin/dvd/dvd/DVDReadAbsAsyncPrio.s deleted file mode 100644 index 21506fe7d6..0000000000 --- a/asm/dolphin/dvd/dvd/DVDReadAbsAsyncPrio.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8034AD2C: -/* 8034AD2C 7C 08 02 A6 */ mflr r0 -/* 8034AD30 90 01 00 04 */ stw r0, 4(r1) -/* 8034AD34 38 00 00 01 */ li r0, 1 -/* 8034AD38 94 21 FF C8 */ stwu r1, -0x38(r1) -/* 8034AD3C 93 E1 00 34 */ stw r31, 0x34(r1) -/* 8034AD40 3B E8 00 00 */ addi r31, r8, 0 -/* 8034AD44 93 C1 00 30 */ stw r30, 0x30(r1) -/* 8034AD48 93 A1 00 2C */ stw r29, 0x2c(r1) -/* 8034AD4C 3B A3 00 00 */ addi r29, r3, 0 -/* 8034AD50 90 03 00 08 */ stw r0, 8(r3) -/* 8034AD54 38 00 00 00 */ li r0, 0 -/* 8034AD58 90 83 00 18 */ stw r4, 0x18(r3) -/* 8034AD5C 90 A3 00 14 */ stw r5, 0x14(r3) -/* 8034AD60 90 C3 00 10 */ stw r6, 0x10(r3) -/* 8034AD64 90 03 00 20 */ stw r0, 0x20(r3) -/* 8034AD68 90 E3 00 28 */ stw r7, 0x28(r3) -/* 8034AD6C 80 0D 84 6C */ lwz r0, autoInvalidation(r13) -/* 8034AD70 2C 00 00 00 */ cmpwi r0, 0 -/* 8034AD74 41 82 00 30 */ beq lbl_8034ADA4 -/* 8034AD78 80 7D 00 08 */ lwz r3, 8(r29) -/* 8034AD7C 28 03 00 01 */ cmplwi r3, 1 -/* 8034AD80 41 82 00 18 */ beq lbl_8034AD98 -/* 8034AD84 38 03 FF FC */ addi r0, r3, -4 -/* 8034AD88 28 00 00 01 */ cmplwi r0, 1 -/* 8034AD8C 40 81 00 0C */ ble lbl_8034AD98 -/* 8034AD90 28 03 00 0E */ cmplwi r3, 0xe -/* 8034AD94 40 82 00 10 */ bne lbl_8034ADA4 -lbl_8034AD98: -/* 8034AD98 80 7D 00 18 */ lwz r3, 0x18(r29) -/* 8034AD9C 80 9D 00 14 */ lwz r4, 0x14(r29) -/* 8034ADA0 4B FF 07 E1 */ bl DCInvalidateRange -lbl_8034ADA4: -/* 8034ADA4 4B FF 29 51 */ bl OSDisableInterrupts -/* 8034ADA8 38 00 00 02 */ li r0, 2 -/* 8034ADAC 90 1D 00 0C */ stw r0, 0xc(r29) -/* 8034ADB0 3B C3 00 00 */ addi r30, r3, 0 -/* 8034ADB4 38 7F 00 00 */ addi r3, r31, 0 -/* 8034ADB8 38 9D 00 00 */ addi r4, r29, 0 -/* 8034ADBC 48 00 0A F1 */ bl __DVDPushWaitingQueue -/* 8034ADC0 80 0D 91 F8 */ lwz r0, executing(r13) -/* 8034ADC4 3B E3 00 00 */ addi r31, r3, 0 -/* 8034ADC8 28 00 00 00 */ cmplwi r0, 0 -/* 8034ADCC 40 82 00 14 */ bne lbl_8034ADE0 -/* 8034ADD0 80 0D 92 04 */ lwz r0, PauseFlag(r13) -/* 8034ADD4 2C 00 00 00 */ cmpwi r0, 0 -/* 8034ADD8 40 82 00 08 */ bne lbl_8034ADE0 -/* 8034ADDC 4B FF F2 D1 */ bl stateReady -lbl_8034ADE0: -/* 8034ADE0 7F C3 F3 78 */ mr r3, r30 -/* 8034ADE4 4B FF 29 39 */ bl OSRestoreInterrupts -/* 8034ADE8 7F E3 FB 78 */ mr r3, r31 -/* 8034ADEC 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 8034ADF0 83 E1 00 34 */ lwz r31, 0x34(r1) -/* 8034ADF4 83 C1 00 30 */ lwz r30, 0x30(r1) -/* 8034ADF8 83 A1 00 2C */ lwz r29, 0x2c(r1) -/* 8034ADFC 38 21 00 38 */ addi r1, r1, 0x38 -/* 8034AE00 7C 08 03 A6 */ mtlr r0 -/* 8034AE04 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/DVDReadDiskID.s b/asm/dolphin/dvd/dvd/DVDReadDiskID.s deleted file mode 100644 index 22f315a9d9..0000000000 --- a/asm/dolphin/dvd/dvd/DVDReadDiskID.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_8034AED8: -/* 8034AED8 7C 08 02 A6 */ mflr r0 -/* 8034AEDC 90 01 00 04 */ stw r0, 4(r1) -/* 8034AEE0 38 00 00 05 */ li r0, 5 -/* 8034AEE4 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 8034AEE8 93 E1 00 24 */ stw r31, 0x24(r1) -/* 8034AEEC 3B E3 00 00 */ addi r31, r3, 0 -/* 8034AEF0 93 C1 00 20 */ stw r30, 0x20(r1) -/* 8034AEF4 90 03 00 08 */ stw r0, 8(r3) -/* 8034AEF8 38 60 00 20 */ li r3, 0x20 -/* 8034AEFC 38 00 00 00 */ li r0, 0 -/* 8034AF00 90 9F 00 18 */ stw r4, 0x18(r31) -/* 8034AF04 90 7F 00 14 */ stw r3, 0x14(r31) -/* 8034AF08 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8034AF0C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 8034AF10 90 BF 00 28 */ stw r5, 0x28(r31) -/* 8034AF14 80 0D 84 6C */ lwz r0, autoInvalidation(r13) -/* 8034AF18 2C 00 00 00 */ cmpwi r0, 0 -/* 8034AF1C 41 82 00 30 */ beq lbl_8034AF4C -/* 8034AF20 80 7F 00 08 */ lwz r3, 8(r31) -/* 8034AF24 28 03 00 01 */ cmplwi r3, 1 -/* 8034AF28 41 82 00 18 */ beq lbl_8034AF40 -/* 8034AF2C 38 03 FF FC */ addi r0, r3, -4 -/* 8034AF30 28 00 00 01 */ cmplwi r0, 1 -/* 8034AF34 40 81 00 0C */ ble lbl_8034AF40 -/* 8034AF38 28 03 00 0E */ cmplwi r3, 0xe -/* 8034AF3C 40 82 00 10 */ bne lbl_8034AF4C -lbl_8034AF40: -/* 8034AF40 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8034AF44 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 8034AF48 4B FF 06 39 */ bl DCInvalidateRange -lbl_8034AF4C: -/* 8034AF4C 4B FF 27 A9 */ bl OSDisableInterrupts -/* 8034AF50 38 00 00 02 */ li r0, 2 -/* 8034AF54 90 1F 00 0C */ stw r0, 0xc(r31) -/* 8034AF58 3B C3 00 00 */ addi r30, r3, 0 -/* 8034AF5C 38 9F 00 00 */ addi r4, r31, 0 -/* 8034AF60 38 60 00 02 */ li r3, 2 -/* 8034AF64 48 00 09 49 */ bl __DVDPushWaitingQueue -/* 8034AF68 80 0D 91 F8 */ lwz r0, executing(r13) -/* 8034AF6C 3B E3 00 00 */ addi r31, r3, 0 -/* 8034AF70 28 00 00 00 */ cmplwi r0, 0 -/* 8034AF74 40 82 00 14 */ bne lbl_8034AF88 -/* 8034AF78 80 0D 92 04 */ lwz r0, PauseFlag(r13) -/* 8034AF7C 2C 00 00 00 */ cmpwi r0, 0 -/* 8034AF80 40 82 00 08 */ bne lbl_8034AF88 -/* 8034AF84 4B FF F1 29 */ bl stateReady -lbl_8034AF88: -/* 8034AF88 7F C3 F3 78 */ mr r3, r30 -/* 8034AF8C 4B FF 27 91 */ bl OSRestoreInterrupts -/* 8034AF90 7F E3 FB 78 */ mr r3, r31 -/* 8034AF94 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8034AF98 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 8034AF9C 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 8034AFA0 38 21 00 28 */ addi r1, r1, 0x28 -/* 8034AFA4 7C 08 03 A6 */ mtlr r0 -/* 8034AFA8 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/__DVDPrepareResetAsync.s b/asm/dolphin/dvd/dvd/__DVDPrepareResetAsync.s deleted file mode 100644 index 2dc596ae71..0000000000 --- a/asm/dolphin/dvd/dvd/__DVDPrepareResetAsync.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_8034B720: -/* 8034B720 7C 08 02 A6 */ mflr r0 -/* 8034B724 90 01 00 04 */ stw r0, 4(r1) -/* 8034B728 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8034B72C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8034B730 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8034B734 7C 7E 1B 78 */ mr r30, r3 -/* 8034B738 93 A1 00 14 */ stw r29, 0x14(r1) -/* 8034B73C 4B FF 1F B9 */ bl OSDisableInterrupts -/* 8034B740 7C 7D 1B 78 */ mr r29, r3 -/* 8034B744 48 00 01 31 */ bl __DVDClearWaitingQueue -/* 8034B748 80 0D 92 18 */ lwz r0, Canceling(r13) -/* 8034B74C 28 00 00 00 */ cmplwi r0, 0 -/* 8034B750 41 82 00 0C */ beq lbl_8034B75C -/* 8034B754 93 CD 92 1C */ stw r30, CancelCallback(r13) -/* 8034B758 48 00 00 C0 */ b lbl_8034B818 -lbl_8034B75C: -/* 8034B75C 80 6D 91 F8 */ lwz r3, executing(r13) -/* 8034B760 28 03 00 00 */ cmplwi r3, 0 -/* 8034B764 41 82 00 0C */ beq lbl_8034B770 -/* 8034B768 38 00 00 00 */ li r0, 0 -/* 8034B76C 90 03 00 28 */ stw r0, 0x28(r3) -lbl_8034B770: -/* 8034B770 4B FF 1F 85 */ bl OSDisableInterrupts -/* 8034B774 7C 7F 1B 78 */ mr r31, r3 -/* 8034B778 4B FF 1F 7D */ bl OSDisableInterrupts -/* 8034B77C 80 0D 91 F8 */ lwz r0, executing(r13) -/* 8034B780 38 80 00 01 */ li r4, 1 -/* 8034B784 90 8D 92 04 */ stw r4, PauseFlag(r13) -/* 8034B788 28 00 00 00 */ cmplwi r0, 0 -/* 8034B78C 40 82 00 08 */ bne lbl_8034B794 -/* 8034B790 90 8D 92 08 */ stw r4, PausingFlag(r13) -lbl_8034B794: -/* 8034B794 4B FF 1F 89 */ bl OSRestoreInterrupts -/* 8034B798 48 00 00 0C */ b lbl_8034B7A4 -lbl_8034B79C: -/* 8034B79C 38 80 00 00 */ li r4, 0 -/* 8034B7A0 4B FF FB 35 */ bl DVDCancelAsync -lbl_8034B7A4: -/* 8034B7A4 48 00 01 71 */ bl __DVDPopWaitingQueue -/* 8034B7A8 28 03 00 00 */ cmplwi r3, 0 -/* 8034B7AC 40 82 FF F0 */ bne lbl_8034B79C -/* 8034B7B0 80 6D 91 F8 */ lwz r3, executing(r13) -/* 8034B7B4 28 03 00 00 */ cmplwi r3, 0 -/* 8034B7B8 41 82 00 10 */ beq lbl_8034B7C8 -/* 8034B7BC 7F C4 F3 78 */ mr r4, r30 -/* 8034B7C0 4B FF FB 15 */ bl DVDCancelAsync -/* 8034B7C4 48 00 00 20 */ b lbl_8034B7E4 -lbl_8034B7C8: -/* 8034B7C8 28 1E 00 00 */ cmplwi r30, 0 -/* 8034B7CC 41 82 00 18 */ beq lbl_8034B7E4 -/* 8034B7D0 39 9E 00 00 */ addi r12, r30, 0 -/* 8034B7D4 7D 88 03 A6 */ mtlr r12 -/* 8034B7D8 38 60 00 00 */ li r3, 0 -/* 8034B7DC 38 80 00 00 */ li r4, 0 -/* 8034B7E0 4E 80 00 21 */ blrl -lbl_8034B7E4: -/* 8034B7E4 4B FF 1F 11 */ bl OSDisableInterrupts -/* 8034B7E8 38 80 00 00 */ li r4, 0 -/* 8034B7EC 90 8D 92 04 */ stw r4, PauseFlag(r13) -/* 8034B7F0 7C 7E 1B 78 */ mr r30, r3 -/* 8034B7F4 80 0D 92 08 */ lwz r0, PausingFlag(r13) -/* 8034B7F8 2C 00 00 00 */ cmpwi r0, 0 -/* 8034B7FC 41 82 00 0C */ beq lbl_8034B808 -/* 8034B800 90 8D 92 08 */ stw r4, PausingFlag(r13) -/* 8034B804 4B FF E8 A9 */ bl stateReady -lbl_8034B808: -/* 8034B808 7F C3 F3 78 */ mr r3, r30 -/* 8034B80C 4B FF 1F 11 */ bl OSRestoreInterrupts -/* 8034B810 7F E3 FB 78 */ mr r3, r31 -/* 8034B814 4B FF 1F 09 */ bl OSRestoreInterrupts -lbl_8034B818: -/* 8034B818 7F A3 EB 78 */ mr r3, r29 -/* 8034B81C 4B FF 1F 01 */ bl OSRestoreInterrupts -/* 8034B820 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8034B824 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8034B828 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8034B82C 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 8034B830 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034B834 7C 08 03 A6 */ mtlr r0 -/* 8034B838 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/cbForStateBusy.s b/asm/dolphin/dvd/dvd/cbForStateBusy.s deleted file mode 100644 index 23240e013a..0000000000 --- a/asm/dolphin/dvd/dvd/cbForStateBusy.s +++ /dev/null @@ -1,462 +0,0 @@ -lbl_8034A6D4: -/* 8034A6D4 7C 08 02 A6 */ mflr r0 -/* 8034A6D8 28 03 00 10 */ cmplwi r3, 0x10 -/* 8034A6DC 90 01 00 04 */ stw r0, 4(r1) -/* 8034A6E0 3C 80 80 45 */ lis r4, BB2@ha /* 0x8044C900@ha */ -/* 8034A6E4 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 8034A6E8 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034A6EC 3B E4 C9 00 */ addi r31, r4, BB2@l /* 0x8044C900@l */ -/* 8034A6F0 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8034A6F4 40 82 00 20 */ bne lbl_8034A714 -/* 8034A6F8 3C 60 01 23 */ lis r3, 0x0123 /* 0x01234568@ha */ -/* 8034A6FC 38 63 45 68 */ addi r3, r3, 0x4568 /* 0x01234568@l */ -/* 8034A700 48 00 14 89 */ bl __DVDStoreErrorCode -/* 8034A704 48 00 0A 35 */ bl DVDReset -/* 8034A708 38 60 00 00 */ li r3, 0 -/* 8034A70C 4B FF EB D1 */ bl cbForStateError -/* 8034A710 48 00 06 04 */ b lbl_8034AD14 -lbl_8034A714: -/* 8034A714 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034A718 28 00 00 03 */ cmplwi r0, 3 -/* 8034A71C 41 82 00 10 */ beq lbl_8034A72C -/* 8034A720 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034A724 28 00 00 0F */ cmplwi r0, 0xf -/* 8034A728 40 82 00 E0 */ bne lbl_8034A808 -lbl_8034A72C: -/* 8034A72C 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e -/* 8034A730 41 82 00 20 */ beq lbl_8034A750 -/* 8034A734 3C 60 01 23 */ lis r3, 0x0123 /* 0x01234567@ha */ -/* 8034A738 38 63 45 67 */ addi r3, r3, 0x4567 /* 0x01234567@l */ -/* 8034A73C 48 00 14 4D */ bl __DVDStoreErrorCode -/* 8034A740 3C 60 80 35 */ lis r3, cbForStateError@ha /* 0x803492DC@ha */ -/* 8034A744 38 63 92 DC */ addi r3, r3, cbForStateError@l /* 0x803492DC@l */ -/* 8034A748 4B FF D8 CD */ bl DVDLowStopMotor -/* 8034A74C 48 00 05 C8 */ b lbl_8034AD14 -lbl_8034A750: -/* 8034A750 38 00 00 00 */ li r0, 0 -/* 8034A754 90 0D 92 2C */ stw r0, NumInternalRetry(r13) -/* 8034A758 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034A75C 28 00 00 0F */ cmplwi r0, 0xf -/* 8034A760 40 82 00 0C */ bne lbl_8034A76C -/* 8034A764 38 00 00 01 */ li r0, 1 -/* 8034A768 90 0D 92 30 */ stw r0, ResetRequired(r13) -lbl_8034A76C: -/* 8034A76C 80 0D 92 18 */ lwz r0, Canceling(r13) -/* 8034A770 28 00 00 00 */ cmplwi r0, 0 -/* 8034A774 41 82 00 6C */ beq lbl_8034A7E0 -/* 8034A778 38 00 00 07 */ li r0, 7 -/* 8034A77C 83 CD 91 F8 */ lwz r30, executing(r13) -/* 8034A780 90 0D 92 20 */ stw r0, ResumeFromHere(r13) -/* 8034A784 38 7F 00 40 */ addi r3, r31, 0x40 -/* 8034A788 38 00 00 00 */ li r0, 0 -/* 8034A78C 90 0D 92 18 */ stw r0, Canceling(r13) -/* 8034A790 38 00 00 0A */ li r0, 0xa -/* 8034A794 90 6D 91 F8 */ stw r3, executing(r13) -/* 8034A798 90 1E 00 0C */ stw r0, 0xc(r30) -/* 8034A79C 81 9E 00 28 */ lwz r12, 0x28(r30) -/* 8034A7A0 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A7A4 41 82 00 14 */ beq lbl_8034A7B8 -/* 8034A7A8 7D 88 03 A6 */ mtlr r12 -/* 8034A7AC 38 9E 00 00 */ addi r4, r30, 0 -/* 8034A7B0 38 60 FF FD */ li r3, -3 -/* 8034A7B4 4E 80 00 21 */ blrl -lbl_8034A7B8: -/* 8034A7B8 81 8D 92 1C */ lwz r12, CancelCallback(r13) -/* 8034A7BC 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A7C0 41 82 00 14 */ beq lbl_8034A7D4 -/* 8034A7C4 7D 88 03 A6 */ mtlr r12 -/* 8034A7C8 38 9E 00 00 */ addi r4, r30, 0 -/* 8034A7CC 38 60 00 00 */ li r3, 0 -/* 8034A7D0 4E 80 00 21 */ blrl -lbl_8034A7D4: -/* 8034A7D4 4B FF F8 D9 */ bl stateReady -/* 8034A7D8 38 00 00 01 */ li r0, 1 -/* 8034A7DC 48 00 00 08 */ b lbl_8034A7E4 -lbl_8034A7E0: -/* 8034A7E0 38 00 00 00 */ li r0, 0 -lbl_8034A7E4: -/* 8034A7E4 2C 00 00 00 */ cmpwi r0, 0 -/* 8034A7E8 40 82 05 2C */ bne lbl_8034AD14 -/* 8034A7EC 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034A7F0 38 00 00 07 */ li r0, 7 -/* 8034A7F4 3C 60 80 35 */ lis r3, cbForStateMotorStopped@ha /* 0x80349FC0@ha */ -/* 8034A7F8 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034A7FC 38 63 9F C0 */ addi r3, r3, cbForStateMotorStopped@l /* 0x80349FC0@l */ -/* 8034A800 4B FF D7 45 */ bl DVDLowWaitCoverClose -/* 8034A804 48 00 05 10 */ b lbl_8034AD14 -lbl_8034A808: -/* 8034A808 80 8D 92 14 */ lwz r4, CurrCommand(r13) -/* 8034A80C 28 04 00 01 */ cmplwi r4, 1 -/* 8034A810 41 82 00 18 */ beq lbl_8034A828 -/* 8034A814 38 04 FF FC */ addi r0, r4, -4 -/* 8034A818 28 00 00 01 */ cmplwi r0, 1 -/* 8034A81C 40 81 00 0C */ ble lbl_8034A828 -/* 8034A820 28 04 00 0E */ cmplwi r4, 0xe -/* 8034A824 40 82 00 0C */ bne lbl_8034A830 -lbl_8034A828: -/* 8034A828 38 00 00 01 */ li r0, 1 -/* 8034A82C 48 00 00 1C */ b lbl_8034A848 -lbl_8034A830: -/* 8034A830 80 0D 84 7C */ lwz r0, DmaCommand(r13) -/* 8034A834 7C 04 00 40 */ cmplw r4, r0 -/* 8034A838 40 82 00 0C */ bne lbl_8034A844 -/* 8034A83C 38 00 00 01 */ li r0, 1 -/* 8034A840 48 00 00 08 */ b lbl_8034A848 -lbl_8034A844: -/* 8034A844 38 00 00 00 */ li r0, 0 -lbl_8034A848: -/* 8034A848 2C 00 00 00 */ cmpwi r0, 0 -/* 8034A84C 41 82 00 28 */ beq lbl_8034A874 -/* 8034A850 80 CD 91 F8 */ lwz r6, executing(r13) -/* 8034A854 3C 80 CC 00 */ lis r4, 0xCC00 /* 0xCC006000@ha */ -/* 8034A858 38 84 60 00 */ addi r4, r4, 0x6000 /* 0xCC006000@l */ -/* 8034A85C 80 84 00 18 */ lwz r4, 0x18(r4) -/* 8034A860 80 06 00 1C */ lwz r0, 0x1c(r6) -/* 8034A864 80 A6 00 20 */ lwz r5, 0x20(r6) -/* 8034A868 7C 04 00 50 */ subf r0, r4, r0 -/* 8034A86C 7C 05 02 14 */ add r0, r5, r0 -/* 8034A870 90 06 00 20 */ stw r0, 0x20(r6) -lbl_8034A874: -/* 8034A874 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c -/* 8034A878 41 82 00 60 */ beq lbl_8034A8D8 -/* 8034A87C 83 CD 91 F8 */ lwz r30, executing(r13) -/* 8034A880 38 7F 00 40 */ addi r3, r31, 0x40 -/* 8034A884 38 00 00 00 */ li r0, 0 -/* 8034A888 90 0D 92 18 */ stw r0, Canceling(r13) -/* 8034A88C 38 00 00 0A */ li r0, 0xa -/* 8034A890 90 6D 91 F8 */ stw r3, executing(r13) -/* 8034A894 90 1E 00 0C */ stw r0, 0xc(r30) -/* 8034A898 81 9E 00 28 */ lwz r12, 0x28(r30) -/* 8034A89C 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A8A0 41 82 00 14 */ beq lbl_8034A8B4 -/* 8034A8A4 7D 88 03 A6 */ mtlr r12 -/* 8034A8A8 38 9E 00 00 */ addi r4, r30, 0 -/* 8034A8AC 38 60 FF FD */ li r3, -3 -/* 8034A8B0 4E 80 00 21 */ blrl -lbl_8034A8B4: -/* 8034A8B4 81 8D 92 1C */ lwz r12, CancelCallback(r13) -/* 8034A8B8 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A8BC 41 82 00 14 */ beq lbl_8034A8D0 -/* 8034A8C0 7D 88 03 A6 */ mtlr r12 -/* 8034A8C4 38 9E 00 00 */ addi r4, r30, 0 -/* 8034A8C8 38 60 00 00 */ li r3, 0 -/* 8034A8CC 4E 80 00 21 */ blrl -lbl_8034A8D0: -/* 8034A8D0 4B FF F7 DD */ bl stateReady -/* 8034A8D4 48 00 04 40 */ b lbl_8034AD14 -lbl_8034A8D8: -/* 8034A8D8 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 8034A8DC 41 82 03 14 */ beq lbl_8034ABF0 -/* 8034A8E0 38 A0 00 00 */ li r5, 0 -/* 8034A8E4 90 AD 92 2C */ stw r5, NumInternalRetry(r13) -/* 8034A8E8 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034A8EC 28 00 00 10 */ cmplwi r0, 0x10 -/* 8034A8F0 40 82 00 3C */ bne lbl_8034A92C -/* 8034A8F4 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034A8F8 38 1F 00 40 */ addi r0, r31, 0x40 -/* 8034A8FC 38 60 00 01 */ li r3, 1 -/* 8034A900 90 6D 92 38 */ stw r3, MotorState(r13) -/* 8034A904 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034A908 90 A4 00 0C */ stw r5, 0xc(r4) -/* 8034A90C 81 84 00 28 */ lwz r12, 0x28(r4) -/* 8034A910 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A914 41 82 00 10 */ beq lbl_8034A924 -/* 8034A918 7D 88 03 A6 */ mtlr r12 -/* 8034A91C 38 60 00 00 */ li r3, 0 -/* 8034A920 4E 80 00 21 */ blrl -lbl_8034A924: -/* 8034A924 4B FF F7 89 */ bl stateReady -/* 8034A928 48 00 03 EC */ b lbl_8034AD14 -lbl_8034A92C: -/* 8034A92C 80 0D 92 18 */ lwz r0, Canceling(r13) -/* 8034A930 28 00 00 00 */ cmplwi r0, 0 -/* 8034A934 41 82 00 60 */ beq lbl_8034A994 -/* 8034A938 90 AD 92 20 */ stw r5, ResumeFromHere(r13) -/* 8034A93C 38 7F 00 40 */ addi r3, r31, 0x40 -/* 8034A940 83 CD 91 F8 */ lwz r30, executing(r13) -/* 8034A944 38 00 00 0A */ li r0, 0xa -/* 8034A948 90 AD 92 18 */ stw r5, Canceling(r13) -/* 8034A94C 90 6D 91 F8 */ stw r3, executing(r13) -/* 8034A950 90 1E 00 0C */ stw r0, 0xc(r30) -/* 8034A954 81 9E 00 28 */ lwz r12, 0x28(r30) -/* 8034A958 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A95C 41 82 00 14 */ beq lbl_8034A970 -/* 8034A960 7D 88 03 A6 */ mtlr r12 -/* 8034A964 38 9E 00 00 */ addi r4, r30, 0 -/* 8034A968 38 60 FF FD */ li r3, -3 -/* 8034A96C 4E 80 00 21 */ blrl -lbl_8034A970: -/* 8034A970 81 8D 92 1C */ lwz r12, CancelCallback(r13) -/* 8034A974 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A978 41 82 00 14 */ beq lbl_8034A98C -/* 8034A97C 7D 88 03 A6 */ mtlr r12 -/* 8034A980 38 9E 00 00 */ addi r4, r30, 0 -/* 8034A984 38 60 00 00 */ li r3, 0 -/* 8034A988 4E 80 00 21 */ blrl -lbl_8034A98C: -/* 8034A98C 4B FF F7 21 */ bl stateReady -/* 8034A990 38 A0 00 01 */ li r5, 1 -lbl_8034A994: -/* 8034A994 2C 05 00 00 */ cmpwi r5, 0 -/* 8034A998 40 82 03 7C */ bne lbl_8034AD14 -/* 8034A99C 80 6D 92 14 */ lwz r3, CurrCommand(r13) -/* 8034A9A0 28 03 00 01 */ cmplwi r3, 1 -/* 8034A9A4 41 82 00 18 */ beq lbl_8034A9BC -/* 8034A9A8 38 03 FF FC */ addi r0, r3, -4 -/* 8034A9AC 28 00 00 01 */ cmplwi r0, 1 -/* 8034A9B0 40 81 00 0C */ ble lbl_8034A9BC -/* 8034A9B4 28 03 00 0E */ cmplwi r3, 0xe -/* 8034A9B8 40 82 00 0C */ bne lbl_8034A9C4 -lbl_8034A9BC: -/* 8034A9BC 38 00 00 01 */ li r0, 1 -/* 8034A9C0 48 00 00 1C */ b lbl_8034A9DC -lbl_8034A9C4: -/* 8034A9C4 80 0D 84 7C */ lwz r0, DmaCommand(r13) -/* 8034A9C8 7C 03 00 40 */ cmplw r3, r0 -/* 8034A9CC 40 82 00 0C */ bne lbl_8034A9D8 -/* 8034A9D0 38 00 00 01 */ li r0, 1 -/* 8034A9D4 48 00 00 08 */ b lbl_8034A9DC -lbl_8034A9D8: -/* 8034A9D8 38 00 00 00 */ li r0, 0 -lbl_8034A9DC: -/* 8034A9DC 2C 00 00 00 */ cmpwi r0, 0 -/* 8034A9E0 41 82 00 54 */ beq lbl_8034AA34 -/* 8034A9E4 80 6D 91 F8 */ lwz r3, executing(r13) -/* 8034A9E8 80 83 00 20 */ lwz r4, 0x20(r3) -/* 8034A9EC 80 03 00 14 */ lwz r0, 0x14(r3) -/* 8034A9F0 7C 04 00 40 */ cmplw r4, r0 -/* 8034A9F4 41 82 00 0C */ beq lbl_8034AA00 -/* 8034A9F8 4B FF F9 9D */ bl stateBusy -/* 8034A9FC 48 00 03 18 */ b lbl_8034AD14 -lbl_8034AA00: -/* 8034AA00 38 1F 00 40 */ addi r0, r31, 0x40 -/* 8034AA04 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034AA08 38 00 00 00 */ li r0, 0 -/* 8034AA0C 38 83 00 00 */ addi r4, r3, 0 -/* 8034AA10 90 03 00 0C */ stw r0, 0xc(r3) -/* 8034AA14 81 83 00 28 */ lwz r12, 0x28(r3) -/* 8034AA18 28 0C 00 00 */ cmplwi r12, 0 -/* 8034AA1C 41 82 00 10 */ beq lbl_8034AA2C -/* 8034AA20 80 64 00 20 */ lwz r3, 0x20(r4) -/* 8034AA24 7D 88 03 A6 */ mtlr r12 -/* 8034AA28 4E 80 00 21 */ blrl -lbl_8034AA2C: -/* 8034AA2C 4B FF F6 81 */ bl stateReady -/* 8034AA30 48 00 02 E4 */ b lbl_8034AD14 -lbl_8034AA34: -/* 8034AA34 80 8D 92 14 */ lwz r4, CurrCommand(r13) -/* 8034AA38 38 04 FF F7 */ addi r0, r4, -9 -/* 8034AA3C 28 00 00 03 */ cmplwi r0, 3 -/* 8034AA40 41 81 00 0C */ bgt lbl_8034AA4C -/* 8034AA44 38 00 00 01 */ li r0, 1 -/* 8034AA48 48 00 00 48 */ b lbl_8034AA90 -lbl_8034AA4C: -/* 8034AA4C 3C 60 80 3D */ lis r3, ImmCommand@ha /* 0x803D15EC@ha */ -/* 8034AA50 84 03 15 EC */ lwzu r0, ImmCommand@l(r3) /* 0x803D15EC@l */ -/* 8034AA54 7C 04 00 40 */ cmplw r4, r0 -/* 8034AA58 40 82 00 0C */ bne lbl_8034AA64 -/* 8034AA5C 38 00 00 01 */ li r0, 1 -/* 8034AA60 48 00 00 30 */ b lbl_8034AA90 -lbl_8034AA64: -/* 8034AA64 84 03 00 04 */ lwzu r0, 4(r3) -/* 8034AA68 7C 04 00 40 */ cmplw r4, r0 -/* 8034AA6C 40 82 00 0C */ bne lbl_8034AA78 -/* 8034AA70 38 00 00 01 */ li r0, 1 -/* 8034AA74 48 00 00 1C */ b lbl_8034AA90 -lbl_8034AA78: -/* 8034AA78 80 03 00 04 */ lwz r0, 4(r3) -/* 8034AA7C 7C 04 00 40 */ cmplw r4, r0 -/* 8034AA80 40 82 00 0C */ bne lbl_8034AA8C -/* 8034AA84 38 00 00 01 */ li r0, 1 -/* 8034AA88 48 00 00 08 */ b lbl_8034AA90 -lbl_8034AA8C: -/* 8034AA8C 38 00 00 00 */ li r0, 0 -lbl_8034AA90: -/* 8034AA90 2C 00 00 00 */ cmpwi r0, 0 -/* 8034AA94 41 82 00 68 */ beq lbl_8034AAFC -/* 8034AA98 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034AA9C 28 00 00 0B */ cmplwi r0, 0xb -/* 8034AAA0 41 82 00 10 */ beq lbl_8034AAB0 -/* 8034AAA4 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034AAA8 28 00 00 0A */ cmplwi r0, 0xa -/* 8034AAAC 40 82 00 14 */ bne lbl_8034AAC0 -lbl_8034AAB0: -/* 8034AAB0 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC006020@ha */ -/* 8034AAB4 80 03 60 20 */ lwz r0, 0x6020(r3) /* 0xCC006020@l */ -/* 8034AAB8 54 03 10 3A */ slwi r3, r0, 2 -/* 8034AABC 48 00 00 10 */ b lbl_8034AACC -lbl_8034AAC0: -/* 8034AAC0 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC006000@ha */ -/* 8034AAC4 38 63 60 00 */ addi r3, r3, 0x6000 /* 0xCC006000@l */ -/* 8034AAC8 80 63 00 20 */ lwz r3, 0x20(r3) -lbl_8034AACC: -/* 8034AACC 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034AAD0 38 BF 00 40 */ addi r5, r31, 0x40 -/* 8034AAD4 38 00 00 00 */ li r0, 0 -/* 8034AAD8 90 AD 91 F8 */ stw r5, executing(r13) -/* 8034AADC 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034AAE0 81 84 00 28 */ lwz r12, 0x28(r4) -/* 8034AAE4 28 0C 00 00 */ cmplwi r12, 0 -/* 8034AAE8 41 82 00 0C */ beq lbl_8034AAF4 -/* 8034AAEC 7D 88 03 A6 */ mtlr r12 -/* 8034AAF0 4E 80 00 21 */ blrl -lbl_8034AAF4: -/* 8034AAF4 4B FF F5 B9 */ bl stateReady -/* 8034AAF8 48 00 02 1C */ b lbl_8034AD14 -lbl_8034AAFC: -/* 8034AAFC 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034AB00 28 00 00 06 */ cmplwi r0, 6 -/* 8034AB04 40 82 00 B8 */ bne lbl_8034ABBC -/* 8034AB08 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034AB0C 38 A4 00 1C */ addi r5, r4, 0x1c -/* 8034AB10 80 04 00 1C */ lwz r0, 0x1c(r4) -/* 8034AB14 28 00 00 00 */ cmplwi r0, 0 -/* 8034AB18 40 82 00 74 */ bne lbl_8034AB8C -/* 8034AB1C 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC006020@ha */ -/* 8034AB20 80 03 60 20 */ lwz r0, 0x6020(r3) /* 0xCC006020@l */ -/* 8034AB24 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8034AB28 41 82 00 34 */ beq lbl_8034AB5C -/* 8034AB2C 38 1F 00 40 */ addi r0, r31, 0x40 -/* 8034AB30 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034AB34 38 00 00 09 */ li r0, 9 -/* 8034AB38 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034AB3C 81 84 00 28 */ lwz r12, 0x28(r4) -/* 8034AB40 28 0C 00 00 */ cmplwi r12, 0 -/* 8034AB44 41 82 00 10 */ beq lbl_8034AB54 -/* 8034AB48 7D 88 03 A6 */ mtlr r12 -/* 8034AB4C 38 60 FF FE */ li r3, -2 -/* 8034AB50 4E 80 00 21 */ blrl -lbl_8034AB54: -/* 8034AB54 4B FF F5 59 */ bl stateReady -/* 8034AB58 48 00 01 BC */ b lbl_8034AD14 -lbl_8034AB5C: -/* 8034AB5C 38 00 00 00 */ li r0, 0 -/* 8034AB60 90 0D 92 0C */ stw r0, AutoFinishing(r13) -/* 8034AB64 38 00 00 01 */ li r0, 1 -/* 8034AB68 3C 60 80 35 */ lis r3, cbForStateBusy@ha /* 0x8034A6D4@ha */ -/* 8034AB6C 90 05 00 00 */ stw r0, 0(r5) -/* 8034AB70 38 C3 A6 D4 */ addi r6, r3, cbForStateBusy@l /* 0x8034A6D4@l */ -/* 8034AB74 38 60 00 00 */ li r3, 0 -/* 8034AB78 80 AD 91 F8 */ lwz r5, executing(r13) -/* 8034AB7C 80 85 00 14 */ lwz r4, 0x14(r5) -/* 8034AB80 80 A5 00 10 */ lwz r5, 0x10(r5) -/* 8034AB84 4B FF D6 45 */ bl DVDLowAudioStream -/* 8034AB88 48 00 01 8C */ b lbl_8034AD14 -lbl_8034AB8C: -/* 8034AB8C 38 1F 00 40 */ addi r0, r31, 0x40 -/* 8034AB90 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034AB94 38 00 00 00 */ li r0, 0 -/* 8034AB98 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034AB9C 81 84 00 28 */ lwz r12, 0x28(r4) -/* 8034ABA0 28 0C 00 00 */ cmplwi r12, 0 -/* 8034ABA4 41 82 00 10 */ beq lbl_8034ABB4 -/* 8034ABA8 7D 88 03 A6 */ mtlr r12 -/* 8034ABAC 38 60 00 00 */ li r3, 0 -/* 8034ABB0 4E 80 00 21 */ blrl -lbl_8034ABB4: -/* 8034ABB4 4B FF F4 F9 */ bl stateReady -/* 8034ABB8 48 00 01 5C */ b lbl_8034AD14 -lbl_8034ABBC: -/* 8034ABBC 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034ABC0 38 7F 00 40 */ addi r3, r31, 0x40 -/* 8034ABC4 38 00 00 00 */ li r0, 0 -/* 8034ABC8 90 6D 91 F8 */ stw r3, executing(r13) -/* 8034ABCC 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034ABD0 81 84 00 28 */ lwz r12, 0x28(r4) -/* 8034ABD4 28 0C 00 00 */ cmplwi r12, 0 -/* 8034ABD8 41 82 00 10 */ beq lbl_8034ABE8 -/* 8034ABDC 7D 88 03 A6 */ mtlr r12 -/* 8034ABE0 38 60 00 00 */ li r3, 0 -/* 8034ABE4 4E 80 00 21 */ blrl -lbl_8034ABE8: -/* 8034ABE8 4B FF F4 C5 */ bl stateReady -/* 8034ABEC 48 00 01 28 */ b lbl_8034AD14 -lbl_8034ABF0: -/* 8034ABF0 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034ABF4 28 00 00 0E */ cmplwi r0, 0xe -/* 8034ABF8 40 82 00 20 */ bne lbl_8034AC18 -/* 8034ABFC 3C 60 01 23 */ lis r3, 0x0123 /* 0x01234567@ha */ -/* 8034AC00 38 63 45 67 */ addi r3, r3, 0x4567 /* 0x01234567@l */ -/* 8034AC04 48 00 0F 85 */ bl __DVDStoreErrorCode -/* 8034AC08 3C 60 80 35 */ lis r3, cbForStateError@ha /* 0x803492DC@ha */ -/* 8034AC0C 38 63 92 DC */ addi r3, r3, cbForStateError@l /* 0x803492DC@l */ -/* 8034AC10 4B FF D4 05 */ bl DVDLowStopMotor -/* 8034AC14 48 00 01 00 */ b lbl_8034AD14 -lbl_8034AC18: -/* 8034AC18 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034AC1C 28 00 00 01 */ cmplwi r0, 1 -/* 8034AC20 41 82 00 28 */ beq lbl_8034AC48 -/* 8034AC24 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034AC28 28 00 00 04 */ cmplwi r0, 4 -/* 8034AC2C 41 82 00 1C */ beq lbl_8034AC48 -/* 8034AC30 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034AC34 28 00 00 05 */ cmplwi r0, 5 -/* 8034AC38 41 82 00 10 */ beq lbl_8034AC48 -/* 8034AC3C 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034AC40 28 00 00 0E */ cmplwi r0, 0xe -/* 8034AC44 40 82 00 C4 */ bne lbl_8034AD08 -lbl_8034AC48: -/* 8034AC48 83 CD 91 F8 */ lwz r30, executing(r13) -/* 8034AC4C 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 8034AC50 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 8034AC54 7C 03 00 40 */ cmplw r3, r0 -/* 8034AC58 40 82 00 B0 */ bne lbl_8034AD08 -/* 8034AC5C 80 0D 92 18 */ lwz r0, Canceling(r13) -/* 8034AC60 28 00 00 00 */ cmplwi r0, 0 -/* 8034AC64 41 82 00 64 */ beq lbl_8034ACC8 -/* 8034AC68 38 80 00 00 */ li r4, 0 -/* 8034AC6C 90 8D 92 20 */ stw r4, ResumeFromHere(r13) -/* 8034AC70 38 7F 00 40 */ addi r3, r31, 0x40 -/* 8034AC74 38 00 00 0A */ li r0, 0xa -/* 8034AC78 90 8D 92 18 */ stw r4, Canceling(r13) -/* 8034AC7C 90 6D 91 F8 */ stw r3, executing(r13) -/* 8034AC80 90 1E 00 0C */ stw r0, 0xc(r30) -/* 8034AC84 81 9E 00 28 */ lwz r12, 0x28(r30) -/* 8034AC88 28 0C 00 00 */ cmplwi r12, 0 -/* 8034AC8C 41 82 00 14 */ beq lbl_8034ACA0 -/* 8034AC90 7D 88 03 A6 */ mtlr r12 -/* 8034AC94 38 9E 00 00 */ addi r4, r30, 0 -/* 8034AC98 38 60 FF FD */ li r3, -3 -/* 8034AC9C 4E 80 00 21 */ blrl -lbl_8034ACA0: -/* 8034ACA0 81 8D 92 1C */ lwz r12, CancelCallback(r13) -/* 8034ACA4 28 0C 00 00 */ cmplwi r12, 0 -/* 8034ACA8 41 82 00 14 */ beq lbl_8034ACBC -/* 8034ACAC 7D 88 03 A6 */ mtlr r12 -/* 8034ACB0 38 9E 00 00 */ addi r4, r30, 0 -/* 8034ACB4 38 60 00 00 */ li r3, 0 -/* 8034ACB8 4E 80 00 21 */ blrl -lbl_8034ACBC: -/* 8034ACBC 4B FF F3 F1 */ bl stateReady -/* 8034ACC0 38 00 00 01 */ li r0, 1 -/* 8034ACC4 48 00 00 08 */ b lbl_8034ACCC -lbl_8034ACC8: -/* 8034ACC8 38 00 00 00 */ li r0, 0 -lbl_8034ACCC: -/* 8034ACCC 2C 00 00 00 */ cmpwi r0, 0 -/* 8034ACD0 40 82 00 44 */ bne lbl_8034AD14 -/* 8034ACD4 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034ACD8 38 7F 00 40 */ addi r3, r31, 0x40 -/* 8034ACDC 38 00 00 00 */ li r0, 0 -/* 8034ACE0 90 6D 91 F8 */ stw r3, executing(r13) -/* 8034ACE4 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034ACE8 81 84 00 28 */ lwz r12, 0x28(r4) -/* 8034ACEC 28 0C 00 00 */ cmplwi r12, 0 -/* 8034ACF0 41 82 00 10 */ beq lbl_8034AD00 -/* 8034ACF4 80 64 00 20 */ lwz r3, 0x20(r4) -/* 8034ACF8 7D 88 03 A6 */ mtlr r12 -/* 8034ACFC 4E 80 00 21 */ blrl -lbl_8034AD00: -/* 8034AD00 4B FF F3 AD */ bl stateReady -/* 8034AD04 48 00 00 10 */ b lbl_8034AD14 -lbl_8034AD08: -/* 8034AD08 3C 60 80 35 */ lis r3, cbForStateGettingError@ha /* 0x80349498@ha */ -/* 8034AD0C 38 63 94 98 */ addi r3, r3, cbForStateGettingError@l /* 0x80349498@l */ -/* 8034AD10 4B FF D3 91 */ bl DVDLowRequestError -lbl_8034AD14: -/* 8034AD14 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8034AD18 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8034AD1C 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 8034AD20 38 21 00 18 */ addi r1, r1, 0x18 -/* 8034AD24 7C 08 03 A6 */ mtlr r0 -/* 8034AD28 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/cbForStateCheckID2.s b/asm/dolphin/dvd/dvd/cbForStateCheckID2.s deleted file mode 100644 index 5eddaa7220..0000000000 --- a/asm/dolphin/dvd/dvd/cbForStateCheckID2.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80349C24: -/* 80349C24 7C 08 02 A6 */ mflr r0 -/* 80349C28 28 03 00 10 */ cmplwi r3, 0x10 -/* 80349C2C 90 01 00 04 */ stw r0, 4(r1) -/* 80349C30 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80349C34 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80349C38 40 82 00 20 */ bne lbl_80349C58 -/* 80349C3C 3C 60 01 23 */ lis r3, 0x0123 /* 0x01234568@ha */ -/* 80349C40 38 63 45 68 */ addi r3, r3, 0x4568 /* 0x01234568@l */ -/* 80349C44 48 00 1F 45 */ bl __DVDStoreErrorCode -/* 80349C48 48 00 14 F1 */ bl DVDReset -/* 80349C4C 38 60 00 00 */ li r3, 0 -/* 80349C50 4B FF F6 8D */ bl cbForStateError -/* 80349C54 48 00 00 94 */ b lbl_80349CE8 -lbl_80349C58: -/* 80349C58 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 80349C5C 41 82 00 80 */ beq lbl_80349CDC -/* 80349C60 3C 60 80 35 */ lis r3, stateReadingFST@ha /* 0x803491C8@ha */ -/* 80349C64 80 8D 92 00 */ lwz r4, bootInfo(r13) -/* 80349C68 38 03 91 C8 */ addi r0, r3, stateReadingFST@l /* 0x803491C8@l */ -/* 80349C6C 38 A0 00 00 */ li r5, 0 -/* 80349C70 90 0D 92 40 */ stw r0, LastState(r13) -/* 80349C74 3C 60 80 45 */ lis r3, BB2@ha /* 0x8044C900@ha */ -/* 80349C78 90 AD 92 2C */ stw r5, NumInternalRetry(r13) -/* 80349C7C 38 63 C9 00 */ addi r3, r3, BB2@l /* 0x8044C900@l */ -/* 80349C80 3B E3 00 08 */ addi r31, r3, 8 -/* 80349C84 80 64 00 3C */ lwz r3, 0x3c(r4) -/* 80349C88 80 1F 00 00 */ lwz r0, 0(r31) -/* 80349C8C 7C 03 00 40 */ cmplw r3, r0 -/* 80349C90 40 80 00 1C */ bge lbl_80349CAC -/* 80349C94 3C 60 80 3D */ lis r3, lit_24@ha /* 0x803D1574@ha */ -/* 80349C98 4C C6 31 82 */ crclr 6 -/* 80349C9C 38 A3 15 74 */ addi r5, r3, lit_24@l /* 0x803D1574@l */ -/* 80349CA0 38 6D 84 74 */ la r3, lit_23(r13) /* 804509F4-_SDA_BASE_ */ -/* 80349CA4 38 80 02 95 */ li r4, 0x295 -/* 80349CA8 4B CB D1 D5 */ bl OSPanic -lbl_80349CAC: -/* 80349CAC 3C 60 80 45 */ lis r3, BB2@ha /* 0x8044C900@ha */ -/* 80349CB0 80 DF 00 00 */ lwz r6, 0(r31) -/* 80349CB4 38 A3 C9 00 */ addi r5, r3, BB2@l /* 0x8044C900@l */ -/* 80349CB8 80 ED 92 00 */ lwz r7, bootInfo(r13) -/* 80349CBC 3C 80 80 35 */ lis r4, cbForStateReadingFST@ha /* 0x8034925C@ha */ -/* 80349CC0 80 A5 00 04 */ lwz r5, 4(r5) -/* 80349CC4 38 06 00 1F */ addi r0, r6, 0x1f -/* 80349CC8 80 67 00 38 */ lwz r3, 0x38(r7) -/* 80349CCC 38 C4 92 5C */ addi r6, r4, cbForStateReadingFST@l /* 0x8034925C@l */ -/* 80349CD0 54 04 00 34 */ rlwinm r4, r0, 0, 0, 0x1a -/* 80349CD4 4B FF DF 45 */ bl DVDLowRead -/* 80349CD8 48 00 00 10 */ b lbl_80349CE8 -lbl_80349CDC: -/* 80349CDC 3C 60 80 35 */ lis r3, cbForStateGettingError@ha /* 0x80349498@ha */ -/* 80349CE0 38 63 94 98 */ addi r3, r3, cbForStateGettingError@l /* 0x80349498@l */ -/* 80349CE4 4B FF E3 BD */ bl DVDLowRequestError -lbl_80349CE8: -/* 80349CE8 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80349CEC 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80349CF0 38 21 00 18 */ addi r1, r1, 0x18 -/* 80349CF4 7C 08 03 A6 */ mtlr r0 -/* 80349CF8 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/stateReadingFST.s b/asm/dolphin/dvd/dvd/stateReadingFST.s deleted file mode 100644 index 799c2da465..0000000000 --- a/asm/dolphin/dvd/dvd/stateReadingFST.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_803491C8: -/* 803491C8 7C 08 02 A6 */ mflr r0 -/* 803491CC 3C 60 80 35 */ lis r3, stateReadingFST@ha /* 0x803491C8@ha */ -/* 803491D0 90 01 00 04 */ stw r0, 4(r1) -/* 803491D4 38 03 91 C8 */ addi r0, r3, stateReadingFST@l /* 0x803491C8@l */ -/* 803491D8 3C 60 80 45 */ lis r3, BB2@ha /* 0x8044C900@ha */ -/* 803491DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803491E0 38 63 C9 00 */ addi r3, r3, BB2@l /* 0x8044C900@l */ -/* 803491E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803491E8 3B E3 00 08 */ addi r31, r3, 8 -/* 803491EC 90 0D 92 40 */ stw r0, LastState(r13) -/* 803491F0 80 8D 92 00 */ lwz r4, bootInfo(r13) -/* 803491F4 80 1F 00 00 */ lwz r0, 0(r31) -/* 803491F8 80 64 00 3C */ lwz r3, 0x3c(r4) -/* 803491FC 7C 03 00 40 */ cmplw r3, r0 -/* 80349200 40 80 00 1C */ bge lbl_8034921C -/* 80349204 3C 60 80 3D */ lis r3, lit_24@ha /* 0x803D1574@ha */ -/* 80349208 4C C6 31 82 */ crclr 6 -/* 8034920C 38 A3 15 74 */ addi r5, r3, lit_24@l /* 0x803D1574@l */ -/* 80349210 38 6D 84 74 */ la r3, lit_23(r13) /* 804509F4-_SDA_BASE_ */ -/* 80349214 38 80 02 95 */ li r4, 0x295 -/* 80349218 4B CB DC 65 */ bl OSPanic -lbl_8034921C: -/* 8034921C 3C 60 80 45 */ lis r3, BB2@ha /* 0x8044C900@ha */ -/* 80349220 80 DF 00 00 */ lwz r6, 0(r31) -/* 80349224 38 A3 C9 00 */ addi r5, r3, BB2@l /* 0x8044C900@l */ -/* 80349228 80 ED 92 00 */ lwz r7, bootInfo(r13) -/* 8034922C 3C 80 80 35 */ lis r4, cbForStateReadingFST@ha /* 0x8034925C@ha */ -/* 80349230 80 A5 00 04 */ lwz r5, 4(r5) -/* 80349234 38 06 00 1F */ addi r0, r6, 0x1f -/* 80349238 80 67 00 38 */ lwz r3, 0x38(r7) -/* 8034923C 38 C4 92 5C */ addi r6, r4, cbForStateReadingFST@l /* 0x8034925C@l */ -/* 80349240 54 04 00 34 */ rlwinm r4, r0, 0, 0, 0x1a -/* 80349244 4B FF E9 D5 */ bl DVDLowRead -/* 80349248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8034924C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80349250 38 21 00 10 */ addi r1, r1, 0x10 -/* 80349254 7C 08 03 A6 */ mtlr r0 -/* 80349258 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvd/stateReady.s b/asm/dolphin/dvd/dvd/stateReady.s deleted file mode 100644 index 01427ffd08..0000000000 --- a/asm/dolphin/dvd/dvd/stateReady.s +++ /dev/null @@ -1,209 +0,0 @@ -lbl_8034A0AC: -/* 8034A0AC 7C 08 02 A6 */ mflr r0 -/* 8034A0B0 3C 60 80 45 */ lis r3, BB2@ha /* 0x8044C900@ha */ -/* 8034A0B4 90 01 00 04 */ stw r0, 4(r1) -/* 8034A0B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8034A0BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8034A0C0 3B E3 C9 00 */ addi r31, r3, BB2@l /* 0x8044C900@l */ -/* 8034A0C4 48 00 18 F1 */ bl __DVDCheckWaitingQueue -/* 8034A0C8 2C 03 00 00 */ cmpwi r3, 0 -/* 8034A0CC 40 82 00 10 */ bne lbl_8034A0DC -/* 8034A0D0 38 00 00 00 */ li r0, 0 -/* 8034A0D4 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034A0D8 48 00 02 A8 */ b lbl_8034A380 -lbl_8034A0DC: -/* 8034A0DC 80 0D 92 04 */ lwz r0, PauseFlag(r13) -/* 8034A0E0 2C 00 00 00 */ cmpwi r0, 0 -/* 8034A0E4 41 82 00 18 */ beq lbl_8034A0FC -/* 8034A0E8 38 60 00 01 */ li r3, 1 -/* 8034A0EC 38 00 00 00 */ li r0, 0 -/* 8034A0F0 90 6D 92 08 */ stw r3, PausingFlag(r13) -/* 8034A0F4 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034A0F8 48 00 02 88 */ b lbl_8034A380 -lbl_8034A0FC: -/* 8034A0FC 48 00 18 19 */ bl __DVDPopWaitingQueue -/* 8034A100 80 0D 92 10 */ lwz r0, FatalErrorFlag(r13) -/* 8034A104 90 6D 91 F8 */ stw r3, executing(r13) -/* 8034A108 2C 00 00 00 */ cmpwi r0, 0 -/* 8034A10C 41 82 00 3C */ beq lbl_8034A148 -/* 8034A110 80 6D 91 F8 */ lwz r3, executing(r13) -/* 8034A114 38 80 FF FF */ li r4, -1 -/* 8034A118 38 1F 00 40 */ addi r0, r31, 0x40 -/* 8034A11C 90 83 00 0C */ stw r4, 0xc(r3) -/* 8034A120 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034A124 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034A128 81 84 00 28 */ lwz r12, 0x28(r4) -/* 8034A12C 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A130 41 82 00 10 */ beq lbl_8034A140 -/* 8034A134 7D 88 03 A6 */ mtlr r12 -/* 8034A138 38 60 FF FF */ li r3, -1 -/* 8034A13C 4E 80 00 21 */ blrl -lbl_8034A140: -/* 8034A140 4B FF FF 6D */ bl stateReady -/* 8034A144 48 00 02 3C */ b lbl_8034A380 -lbl_8034A148: -/* 8034A148 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034A14C 80 04 00 08 */ lwz r0, 8(r4) -/* 8034A150 90 0D 92 14 */ stw r0, CurrCommand(r13) -/* 8034A154 80 0D 92 20 */ lwz r0, ResumeFromHere(r13) -/* 8034A158 28 00 00 00 */ cmplwi r0, 0 -/* 8034A15C 41 82 01 5C */ beq lbl_8034A2B8 -/* 8034A160 80 0D 92 20 */ lwz r0, ResumeFromHere(r13) -/* 8034A164 2C 00 00 04 */ cmpwi r0, 4 -/* 8034A168 41 82 00 64 */ beq lbl_8034A1CC -/* 8034A16C 40 80 00 1C */ bge lbl_8034A188 -/* 8034A170 2C 00 00 02 */ cmpwi r0, 2 -/* 8034A174 41 82 00 28 */ beq lbl_8034A19C -/* 8034A178 40 80 00 3C */ bge lbl_8034A1B4 -/* 8034A17C 2C 00 00 01 */ cmpwi r0, 1 -/* 8034A180 40 80 00 64 */ bge lbl_8034A1E4 -/* 8034A184 48 00 01 28 */ b lbl_8034A2AC -lbl_8034A188: -/* 8034A188 2C 00 00 08 */ cmpwi r0, 8 -/* 8034A18C 40 80 01 20 */ bge lbl_8034A2AC -/* 8034A190 2C 00 00 06 */ cmpwi r0, 6 -/* 8034A194 40 80 00 50 */ bge lbl_8034A1E4 -/* 8034A198 48 00 01 00 */ b lbl_8034A298 -lbl_8034A19C: -/* 8034A19C 38 00 00 0B */ li r0, 0xb -/* 8034A1A0 3C 60 80 35 */ lis r3, cbForStateMotorStopped@ha /* 0x80349FC0@ha */ -/* 8034A1A4 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034A1A8 38 63 9F C0 */ addi r3, r3, cbForStateMotorStopped@l /* 0x80349FC0@l */ -/* 8034A1AC 4B FF DD 99 */ bl DVDLowWaitCoverClose -/* 8034A1B0 48 00 00 FC */ b lbl_8034A2AC -lbl_8034A1B4: -/* 8034A1B4 38 00 00 04 */ li r0, 4 -/* 8034A1B8 3C 60 80 35 */ lis r3, cbForStateMotorStopped@ha /* 0x80349FC0@ha */ -/* 8034A1BC 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034A1C0 38 63 9F C0 */ addi r3, r3, cbForStateMotorStopped@l /* 0x80349FC0@l */ -/* 8034A1C4 4B FF DD 81 */ bl DVDLowWaitCoverClose -/* 8034A1C8 48 00 00 E4 */ b lbl_8034A2AC -lbl_8034A1CC: -/* 8034A1CC 38 00 00 05 */ li r0, 5 -/* 8034A1D0 3C 60 80 35 */ lis r3, cbForStateMotorStopped@ha /* 0x80349FC0@ha */ -/* 8034A1D4 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034A1D8 38 63 9F C0 */ addi r3, r3, cbForStateMotorStopped@l /* 0x80349FC0@l */ -/* 8034A1DC 4B FF DD 69 */ bl DVDLowWaitCoverClose -/* 8034A1E0 48 00 00 CC */ b lbl_8034A2AC -lbl_8034A1E4: -/* 8034A1E4 38 00 00 03 */ li r0, 3 -/* 8034A1E8 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034A1EC 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034A1F0 2C 00 00 0D */ cmpwi r0, 0xd -/* 8034A1F4 41 82 00 28 */ beq lbl_8034A21C -/* 8034A1F8 40 80 00 18 */ bge lbl_8034A210 -/* 8034A1FC 2C 00 00 06 */ cmpwi r0, 6 -/* 8034A200 40 80 00 4C */ bge lbl_8034A24C -/* 8034A204 2C 00 00 04 */ cmpwi r0, 4 -/* 8034A208 40 80 00 14 */ bge lbl_8034A21C -/* 8034A20C 48 00 00 40 */ b lbl_8034A24C -lbl_8034A210: -/* 8034A210 2C 00 00 0F */ cmpwi r0, 0xf -/* 8034A214 41 82 00 08 */ beq lbl_8034A21C -/* 8034A218 48 00 00 34 */ b lbl_8034A24C -lbl_8034A21C: -/* 8034A21C 48 00 16 59 */ bl __DVDClearWaitingQueue -/* 8034A220 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034A224 38 1F 00 40 */ addi r0, r31, 0x40 -/* 8034A228 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034A22C 81 84 00 28 */ lwz r12, 0x28(r4) -/* 8034A230 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A234 41 82 00 10 */ beq lbl_8034A244 -/* 8034A238 7D 88 03 A6 */ mtlr r12 -/* 8034A23C 38 60 FF FC */ li r3, -4 -/* 8034A240 4E 80 00 21 */ blrl -lbl_8034A244: -/* 8034A244 4B FF FE 69 */ bl stateReady -/* 8034A248 48 00 00 64 */ b lbl_8034A2AC -lbl_8034A24C: -/* 8034A24C 38 00 00 00 */ li r0, 0 -/* 8034A250 90 0D 92 38 */ stw r0, MotorState(r13) -/* 8034A254 48 00 0E E5 */ bl DVDReset -/* 8034A258 38 7F 00 70 */ addi r3, r31, 0x70 -/* 8034A25C 4B FF 06 9D */ bl OSCreateAlarm -/* 8034A260 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 8034A264 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 8034A268 3C 80 10 62 */ lis r4, 0x1062 /* 0x10624DD3@ha */ -/* 8034A26C 3C 60 80 35 */ lis r3, AlarmHandler@ha /* 0x80349DEC@ha */ -/* 8034A270 54 00 F0 BE */ srwi r0, r0, 2 -/* 8034A274 38 84 4D D3 */ addi r4, r4, 0x4DD3 /* 0x10624DD3@l */ -/* 8034A278 7C 04 00 16 */ mulhwu r0, r4, r0 -/* 8034A27C 54 00 D1 BE */ srwi r0, r0, 6 -/* 8034A280 1C C0 04 7E */ mulli r6, r0, 0x47e -/* 8034A284 38 E3 9D EC */ addi r7, r3, AlarmHandler@l /* 0x80349DEC@l */ -/* 8034A288 38 7F 00 70 */ addi r3, r31, 0x70 -/* 8034A28C 38 A0 00 00 */ li r5, 0 -/* 8034A290 4B FF 08 C9 */ bl OSSetAlarm -/* 8034A294 48 00 00 18 */ b lbl_8034A2AC -lbl_8034A298: -/* 8034A298 80 6D 92 24 */ lwz r3, CancelLastError(r13) -/* 8034A29C 48 00 18 ED */ bl __DVDStoreErrorCode -/* 8034A2A0 3C 60 80 35 */ lis r3, cbForStateError@ha /* 0x803492DC@ha */ -/* 8034A2A4 38 63 92 DC */ addi r3, r3, cbForStateError@l /* 0x803492DC@l */ -/* 8034A2A8 4B FF DD 6D */ bl DVDLowStopMotor -lbl_8034A2AC: -/* 8034A2AC 38 00 00 00 */ li r0, 0 -/* 8034A2B0 90 0D 92 20 */ stw r0, ResumeFromHere(r13) -/* 8034A2B4 48 00 00 CC */ b lbl_8034A380 -lbl_8034A2B8: -/* 8034A2B8 80 0D 92 38 */ lwz r0, MotorState(r13) -/* 8034A2BC 28 00 00 00 */ cmplwi r0, 0 -/* 8034A2C0 40 82 00 18 */ bne lbl_8034A2D8 -/* 8034A2C4 38 00 00 01 */ li r0, 1 -/* 8034A2C8 90 04 00 0C */ stw r0, 0xc(r4) -/* 8034A2CC 80 6D 91 F8 */ lwz r3, executing(r13) -/* 8034A2D0 48 00 00 C5 */ bl stateBusy -/* 8034A2D4 48 00 00 AC */ b lbl_8034A380 -lbl_8034A2D8: -/* 8034A2D8 80 0D 92 14 */ lwz r0, CurrCommand(r13) -/* 8034A2DC 2C 00 00 0D */ cmpwi r0, 0xd -/* 8034A2E0 41 82 00 28 */ beq lbl_8034A308 -/* 8034A2E4 40 80 00 18 */ bge lbl_8034A2FC -/* 8034A2E8 2C 00 00 06 */ cmpwi r0, 6 -/* 8034A2EC 40 80 00 4C */ bge lbl_8034A338 -/* 8034A2F0 2C 00 00 04 */ cmpwi r0, 4 -/* 8034A2F4 40 80 00 14 */ bge lbl_8034A308 -/* 8034A2F8 48 00 00 40 */ b lbl_8034A338 -lbl_8034A2FC: -/* 8034A2FC 2C 00 00 0F */ cmpwi r0, 0xf -/* 8034A300 41 82 00 08 */ beq lbl_8034A308 -/* 8034A304 48 00 00 34 */ b lbl_8034A338 -lbl_8034A308: -/* 8034A308 48 00 15 6D */ bl __DVDClearWaitingQueue -/* 8034A30C 80 8D 91 F8 */ lwz r4, executing(r13) -/* 8034A310 38 1F 00 40 */ addi r0, r31, 0x40 -/* 8034A314 90 0D 91 F8 */ stw r0, executing(r13) -/* 8034A318 81 84 00 28 */ lwz r12, 0x28(r4) -/* 8034A31C 28 0C 00 00 */ cmplwi r12, 0 -/* 8034A320 41 82 00 10 */ beq lbl_8034A330 -/* 8034A324 7D 88 03 A6 */ mtlr r12 -/* 8034A328 38 60 FF FC */ li r3, -4 -/* 8034A32C 4E 80 00 21 */ blrl -lbl_8034A330: -/* 8034A330 4B FF FD 7D */ bl stateReady -/* 8034A334 48 00 00 4C */ b lbl_8034A380 -lbl_8034A338: -/* 8034A338 38 00 00 00 */ li r0, 0 -/* 8034A33C 90 0D 92 38 */ stw r0, MotorState(r13) -/* 8034A340 48 00 0D F9 */ bl DVDReset -/* 8034A344 38 7F 00 70 */ addi r3, r31, 0x70 -/* 8034A348 4B FF 05 B1 */ bl OSCreateAlarm -/* 8034A34C 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 8034A350 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 8034A354 3C 80 10 62 */ lis r4, 0x1062 /* 0x10624DD3@ha */ -/* 8034A358 3C 60 80 35 */ lis r3, AlarmHandler@ha /* 0x80349DEC@ha */ -/* 8034A35C 54 00 F0 BE */ srwi r0, r0, 2 -/* 8034A360 38 84 4D D3 */ addi r4, r4, 0x4DD3 /* 0x10624DD3@l */ -/* 8034A364 7C 04 00 16 */ mulhwu r0, r4, r0 -/* 8034A368 54 00 D1 BE */ srwi r0, r0, 6 -/* 8034A36C 1C C0 04 7E */ mulli r6, r0, 0x47e -/* 8034A370 38 E3 9D EC */ addi r7, r3, AlarmHandler@l /* 0x80349DEC@l */ -/* 8034A374 38 7F 00 70 */ addi r3, r31, 0x70 -/* 8034A378 38 A0 00 00 */ li r5, 0 -/* 8034A37C 4B FF 07 DD */ bl OSSetAlarm -lbl_8034A380: -/* 8034A380 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8034A384 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8034A388 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A38C 7C 08 03 A6 */ mtlr r0 -/* 8034A390 4E 80 00 20 */ blr diff --git a/asm/dolphin/dvd/dvdlow/DVDLowClearCallback.s b/asm/dolphin/dvd/dvdlow/DVDLowClearCallback.s deleted file mode 100644 index 8210d28a93..0000000000 --- a/asm/dolphin/dvd/dvdlow/DVDLowClearCallback.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80348458: -/* 80348458 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC006004@ha */ -/* 8034845C 38 00 00 00 */ li r0, 0 -/* 80348460 90 03 60 04 */ stw r0, 0x6004(r3) /* 0xCC006004@l */ -/* 80348464 80 6D 91 98 */ lwz r3, Callback(r13) -/* 80348468 90 0D 91 AC */ stw r0, WaitingCoverClose(r13) -/* 8034846C 90 0D 91 98 */ stw r0, Callback(r13) -/* 80348470 4E 80 00 20 */ blr diff --git a/asm/dolphin/pad/Pad/PADReceiveCheckCallback.s b/asm/dolphin/pad/Pad/PADReceiveCheckCallback.s deleted file mode 100644 index 679217e739..0000000000 --- a/asm/dolphin/pad/Pad/PADReceiveCheckCallback.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_8034E9EC: -/* 8034E9EC 7C 08 02 A6 */ mflr r0 -/* 8034E9F0 90 01 00 04 */ stw r0, 4(r1) -/* 8034E9F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8034E9F8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8034E9FC 7C 7F 1B 78 */ mr r31, r3 -/* 8034EA00 3C 60 80 00 */ lis r3, 0x8000 -/* 8034EA04 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8034EA08 93 A1 00 14 */ stw r29, 0x14(r1) -/* 8034EA0C 7C 7D FC 30 */ srw r29, r3, r31 -/* 8034EA10 80 0D 92 CC */ lwz r0, EnabledBits(r13) -/* 8034EA14 7C 00 E8 39 */ and. r0, r0, r29 -/* 8034EA18 41 82 00 F8 */ beq lbl_8034EB10 -/* 8034EA1C 80 AD 92 D8 */ lwz r5, WaitingBits(r13) -/* 8034EA20 7F A6 E8 F8 */ nor r6, r29, r29 -/* 8034EA24 80 6D 92 DC */ lwz r3, CheckingBits(r13) -/* 8034EA28 54 80 07 3F */ clrlwi. r0, r4, 0x1c -/* 8034EA2C 7C A5 30 38 */ and r5, r5, r6 -/* 8034EA30 7C 63 30 38 */ and r3, r3, r6 -/* 8034EA34 90 AD 92 D8 */ stw r5, WaitingBits(r13) -/* 8034EA38 90 6D 92 DC */ stw r3, CheckingBits(r13) -/* 8034EA3C 54 83 00 2E */ rlwinm r3, r4, 0, 0, 0x17 -/* 8034EA40 40 82 00 6C */ bne lbl_8034EAAC -/* 8034EA44 54 60 00 01 */ rlwinm. r0, r3, 0, 0, 0 -/* 8034EA48 41 82 00 64 */ beq lbl_8034EAAC -/* 8034EA4C 54 60 02 D7 */ rlwinm. r0, r3, 0, 0xb, 0xb -/* 8034EA50 41 82 00 5C */ beq lbl_8034EAAC -/* 8034EA54 54 60 00 43 */ rlwinm. r0, r3, 0, 1, 1 -/* 8034EA58 41 82 00 54 */ beq lbl_8034EAAC -/* 8034EA5C 54 60 01 4B */ rlwinm. r0, r3, 0, 5, 5 -/* 8034EA60 40 82 00 4C */ bne lbl_8034EAAC -/* 8034EA64 54 60 03 19 */ rlwinm. r0, r3, 0, 0xc, 0xc -/* 8034EA68 40 82 00 44 */ bne lbl_8034EAAC -/* 8034EA6C 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd -/* 8034EA70 40 82 00 3C */ bne lbl_8034EAAC -/* 8034EA74 1C 9F 00 0C */ mulli r4, r31, 0xc -/* 8034EA78 3C 60 80 45 */ lis r3, Origin@ha /* 0x8044CB80@ha */ -/* 8034EA7C 38 03 CB 80 */ addi r0, r3, Origin@l /* 0x8044CB80@l */ -/* 8034EA80 3C 60 80 35 */ lis r3, PADOriginUpdateCallback@ha /* 0x8034E51C@ha */ -/* 8034EA84 7C C0 22 14 */ add r6, r0, r4 -/* 8034EA88 39 03 E5 1C */ addi r8, r3, PADOriginUpdateCallback@l /* 0x8034E51C@l */ -/* 8034EA8C 38 7F 00 00 */ addi r3, r31, 0 -/* 8034EA90 38 8D 84 B8 */ la r4, CmdReadOrigin(r13) /* 80450A38-_SDA_BASE_ */ -/* 8034EA94 38 A0 00 01 */ li r5, 1 -/* 8034EA98 38 E0 00 0A */ li r7, 0xa -/* 8034EA9C 39 40 00 00 */ li r10, 0 -/* 8034EAA0 39 20 00 00 */ li r9, 0 -/* 8034EAA4 4B FF 70 E9 */ bl SITransfer -/* 8034EAA8 48 00 00 68 */ b lbl_8034EB10 -lbl_8034EAAC: -/* 8034EAAC 4B FE EC 49 */ bl OSDisableInterrupts -/* 8034EAB0 3B C3 00 00 */ addi r30, r3, 0 -/* 8034EAB4 38 7D 00 00 */ addi r3, r29, 0 -/* 8034EAB8 4B FF 6E 45 */ bl SIDisablePolling -/* 8034EABC 80 0D 92 CC */ lwz r0, EnabledBits(r13) -/* 8034EAC0 7F A9 E8 F8 */ nor r9, r29, r29 -/* 8034EAC4 80 CD 92 D8 */ lwz r6, WaitingBits(r13) -/* 8034EAC8 7F E3 FB 78 */ mr r3, r31 -/* 8034EACC 80 AD 92 DC */ lwz r5, CheckingBits(r13) -/* 8034EAD0 80 8D 92 E0 */ lwz r4, PendingBits(r13) -/* 8034EAD4 7C 08 48 38 */ and r8, r0, r9 -/* 8034EAD8 80 0D 92 E4 */ lwz r0, BarrelBits(r13) -/* 8034EADC 7C C7 48 38 */ and r7, r6, r9 -/* 8034EAE0 7C A6 48 38 */ and r6, r5, r9 -/* 8034EAE4 7C 85 48 38 */ and r5, r4, r9 -/* 8034EAE8 91 0D 92 CC */ stw r8, EnabledBits(r13) -/* 8034EAEC 7C 00 48 38 */ and r0, r0, r9 -/* 8034EAF0 90 ED 92 D8 */ stw r7, WaitingBits(r13) -/* 8034EAF4 38 80 00 00 */ li r4, 0 -/* 8034EAF8 90 CD 92 DC */ stw r6, CheckingBits(r13) -/* 8034EAFC 90 AD 92 E0 */ stw r5, PendingBits(r13) -/* 8034EB00 90 0D 92 E4 */ stw r0, BarrelBits(r13) -/* 8034EB04 4B FF 1D 49 */ bl OSSetWirelessID -/* 8034EB08 7F C3 F3 78 */ mr r3, r30 -/* 8034EB0C 4B FE EC 11 */ bl OSRestoreInterrupts -lbl_8034EB10: -/* 8034EB10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8034EB14 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8034EB18 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8034EB1C 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 8034EB20 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034EB24 7C 08 03 A6 */ mtlr r0 -/* 8034EB28 4E 80 00 20 */ blr diff --git a/asm/dolphin/pad/Pad/PADSetSamplingCallback.s b/asm/dolphin/pad/Pad/PADSetSamplingCallback.s deleted file mode 100644 index 3963385512..0000000000 --- a/asm/dolphin/pad/Pad/PADSetSamplingCallback.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8034FBA0: -/* 8034FBA0 7C 08 02 A6 */ mflr r0 -/* 8034FBA4 28 03 00 00 */ cmplwi r3, 0 -/* 8034FBA8 90 01 00 04 */ stw r0, 4(r1) -/* 8034FBAC 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 8034FBB0 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034FBB4 83 ED 92 E8 */ lwz r31, SamplingCallback(r13) -/* 8034FBB8 90 6D 92 E8 */ stw r3, SamplingCallback(r13) -/* 8034FBBC 41 82 00 14 */ beq lbl_8034FBD0 -/* 8034FBC0 3C 60 80 35 */ lis r3, SamplingHandler@ha /* 0x8034FB40@ha */ -/* 8034FBC4 38 63 FB 40 */ addi r3, r3, SamplingHandler@l /* 0x8034FB40@l */ -/* 8034FBC8 4B FF 57 0D */ bl SIRegisterPollingHandler -/* 8034FBCC 48 00 00 10 */ b lbl_8034FBDC -lbl_8034FBD0: -/* 8034FBD0 3C 60 80 35 */ lis r3, SamplingHandler@ha /* 0x8034FB40@ha */ -/* 8034FBD4 38 63 FB 40 */ addi r3, r3, SamplingHandler@l /* 0x8034FB40@l */ -/* 8034FBD8 4B FF 57 C9 */ bl SIUnregisterPollingHandler -lbl_8034FBDC: -/* 8034FBDC 7F E3 FB 78 */ mr r3, r31 -/* 8034FBE0 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8034FBE4 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8034FBE8 38 21 00 18 */ addi r1, r1, 0x18 -/* 8034FBEC 7C 08 03 A6 */ mtlr r0 -/* 8034FBF0 4E 80 00 20 */ blr diff --git a/asm/dolphin/pad/Pad/__PADDisableRecalibration.s b/asm/dolphin/pad/Pad/__PADDisableRecalibration.s deleted file mode 100644 index 8ebfedd7e0..0000000000 --- a/asm/dolphin/pad/Pad/__PADDisableRecalibration.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8034FBF4: -/* 8034FBF4 7C 08 02 A6 */ mflr r0 -/* 8034FBF8 90 01 00 04 */ stw r0, 4(r1) -/* 8034FBFC 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 8034FC00 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034FC04 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8034FC08 7C 7E 1B 78 */ mr r30, r3 -/* 8034FC0C 4B FE DA E9 */ bl OSDisableInterrupts -/* 8034FC10 3C 80 80 00 */ lis r4, 0x8000 /* 0x800030E3@ha */ -/* 8034FC14 88 04 30 E3 */ lbz r0, 0x30E3(r4) /* 0x800030E3@l */ -/* 8034FC18 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 8034FC1C 41 82 00 0C */ beq lbl_8034FC28 -/* 8034FC20 3B E0 00 01 */ li r31, 1 -/* 8034FC24 48 00 00 08 */ b lbl_8034FC2C -lbl_8034FC28: -/* 8034FC28 3B E0 00 00 */ li r31, 0 -lbl_8034FC2C: -/* 8034FC2C 3C 80 80 00 */ lis r4, 0x8000 /* 0x800030E3@ha */ -/* 8034FC30 88 04 30 E3 */ lbz r0, 0x30E3(r4) /* 0x800030E3@l */ -/* 8034FC34 2C 1E 00 00 */ cmpwi r30, 0 -/* 8034FC38 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 8034FC3C 98 04 30 E3 */ stb r0, 0x30e3(r4) -/* 8034FC40 41 82 00 10 */ beq lbl_8034FC50 -/* 8034FC44 88 04 30 E3 */ lbz r0, 0x30e3(r4) -/* 8034FC48 60 00 00 40 */ ori r0, r0, 0x40 -/* 8034FC4C 98 04 30 E3 */ stb r0, 0x30e3(r4) -lbl_8034FC50: -/* 8034FC50 4B FE DA CD */ bl OSRestoreInterrupts -/* 8034FC54 7F E3 FB 78 */ mr r3, r31 -/* 8034FC58 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8034FC5C 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8034FC60 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 8034FC64 38 21 00 18 */ addi r1, r1, 0x18 -/* 8034FC68 7C 08 03 A6 */ mtlr r0 -/* 8034FC6C 4E 80 00 20 */ blr diff --git a/diff.py b/diff.py index 10451f29f7..676e1c24a4 100644 --- a/diff.py +++ b/diff.py @@ -334,7 +334,7 @@ parser.add_argument( "--select-occurence", dest="select_occurence", type=int, - default=0, + default=None, help="If multiple occurence of the same symbol is found, use this to select the correct ocurrance." ) parser.add_argument( @@ -426,6 +426,7 @@ class Config: source_old_binutils: bool diff_section: str inlines: bool + select_occurence: Optional[int] max_function_size_lines: int max_function_size_bytes: int @@ -515,6 +516,7 @@ def create_config(args: argparse.Namespace, project: ProjectSettings) -> Config: source_old_binutils=args.source_old_binutils, diff_section=args.diff_section, inlines=args.inlines, + select_occurence=args.select_occurence, max_function_size_lines=args.max_lines, max_function_size_bytes=args.max_lines * 4, # Display options @@ -1155,7 +1157,12 @@ def search_map_file( fail(f"Internal error while parsing map file") if len(cands) > 1: - fail(f"Found multiple occurrences of function {fn_name} in map file.") + if config.select_occurence is None : + fail(f"Found {len(cands)} occurrences of function {fn_name} in map file.") + elif config.select_occurence >= len(cands): + fail(f"Could not choose index {config.select_occurence} of {fn_name} in map file out of {len(cands)}.") + else: + return cands[config.select_occurence] if len(cands) == 1: return cands[0] elif project.map_format == "mw": @@ -1171,7 +1178,12 @@ def search_map_file( contents, ) if len(find) > 1: - fail(f"Found multiple occurrences of function {fn_name} in map file.") + if config.select_occurence is None: + fail(f"Found {len(find)} occurrences of function {fn_name} in map file.") + elif config.select_occurence >= len(find): + fail(f"Could not choose index {config.select_occurence} of {fn_name} in map file out of {len(find)}.") + else: + find = [find[config.select_occurence]] if len(find) == 1: rom = int(find[0][1], 16) objname = find[0][2] @@ -1209,7 +1221,11 @@ def search_map_file( contents, ) if len(find) > 1: - fail(f"Found multiple occurrences of function {fn_name} in map file.") + fail(f"Found {len(find)} occurrences of function {fn_name} in map file.") + elif config.select_occurence >= len(find): + fail(f"Could not choose index {config.select_occurence} of {fn_name} in map file out of {len(find)}.") + else: + find = [find[config.select_occurence]] if len(find) == 1: names_find = re.search(r"(\S+) ... (\S+)", find[0]) assert names_find is not None diff --git a/include/dolphin/ar/arq.h b/include/dolphin/ar/arq.h index b34cf555a1..083c118a4a 100644 --- a/include/dolphin/ar/arq.h +++ b/include/dolphin/ar/arq.h @@ -7,8 +7,20 @@ extern "C" { #endif +#define ARQ_CHUNK_SIZE_DEFAULT 4096 + typedef void (*ARQCallback)(u32 request_address); +typedef enum _ARamType { + ARAM_DIR_MRAM_TO_ARAM, + ARAM_DIR_ARAM_TO_MRAM, +} ARamType; + +typedef enum _ArqPriotity { + ARQ_PRIORITY_LOW, + ARQ_PRIORITY_HIGH, +} ArqPriotity; + typedef struct ARQRequest { struct ARQRequest* next; u32 owner; diff --git a/include/dolphin/card/CARDPriv.h b/include/dolphin/card/CARDPriv.h index 6d6f3da480..2e6df14132 100644 --- a/include/dolphin/card/CARDPriv.h +++ b/include/dolphin/card/CARDPriv.h @@ -117,7 +117,7 @@ void __CARDTxHandler(s32 chan, OSContext* context); void __CARDUnlockedHandler(s32 chan, OSContext* context); s32 __CARDEnableInterrupt(s32 chan, BOOL enable); s32 __CARDReadStatus(s32 chan, u8* status); -void __CARDReadVendorID(); +s32 __CARDReadVendorID(s32 chan, u16* vendorId); s32 __CARDClearStatus(s32 chan); s32 __CARDStart(s32 chan, CARDCallback txCallback, CARDCallback exiCallback); s32 __CARDReadSegment(s32 chan, CARDCallback callback); diff --git a/include/dolphin/dvd/dvd.h b/include/dolphin/dvd/dvd.h index 5253960ac2..4674992277 100644 --- a/include/dolphin/dvd/dvd.h +++ b/include/dolphin/dvd/dvd.h @@ -7,8 +7,6 @@ extern "C" { #endif -vu32 __DIRegs[16] : 0xCC006000; - typedef enum DVDState { DVD_STATE_END = 0x0, DVD_STATE_BUSY = 0x1, @@ -50,7 +48,6 @@ struct DVDFileInfo; struct DVDCommandBlock; typedef void (*DVDCBCallback)(s32 result, struct DVDCommandBlock* block); typedef void (*DVDCallback)(s32 result, struct DVDFileInfo* info); -typedef void (*DVDLowCallback)(u32 intType); typedef struct DVDCommandBlock { /* 0x00 */ struct DVDCommandBlock* next; diff --git a/include/dolphin/dvd/dvdlow.h b/include/dolphin/dvd/dvdlow.h index c6a28eeaa1..a7645d901c 100644 --- a/include/dolphin/dvd/dvdlow.h +++ b/include/dolphin/dvd/dvdlow.h @@ -3,4 +3,7 @@ #include "dolphin/types.h" +typedef void (*DVDLowCallback)(u32 intType); +vu32 __DIRegs[16] : 0xCC006000; + #endif /* DVDLOW_H */ diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index 2d91a6ad0c..cee76aa0db 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -131,7 +131,7 @@ void __OSEVEnd(); static void OSDefaultExceptionHandler(__OSException exception, OSContext* context); void __OSPSInit(void); u32 __OSGetDIConfig(void); -void OSRegisterVersion(char* version); +void OSRegisterVersion(const char* version); void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); inline s16 __OSf32tos16(register f32 inF) { diff --git a/libs/dolphin/ai/Makefile b/libs/dolphin/ai/Makefile index 256159ed07..7adebe00ec 100644 --- a/libs/dolphin/ai/Makefile +++ b/libs/dolphin/ai/Makefile @@ -14,6 +14,7 @@ LIBAI_A_CFLAGS := \ -fp hard \ -nodefaults \ -str reuse \ + -inline auto \ -RTTI off \ -maxerrors 5 \ -enum int $(INCLUDES) \ @@ -35,10 +36,11 @@ $(BUILD_DIR)/libs/dolphin/ai/%.o: libs/dolphin/ai/%.c $(BUILD_DIR)/libs/dolphin/ @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBAI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(FRANK_CC) $(LIBAI_A_CFLAGS) -c -o $(@:.o=.po) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBAI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ - @$(PYTHON) $(FRANK) $@ $@ $@ + @$(PYTHON) $(FRANK) $@ $(@:.o=.po) $@ ifndef DISABLE_DEPS LIBAI_A_D_FILES := $(LIBAI_A_O_FILES:.o=.d) diff --git a/libs/dolphin/ai/ai.c b/libs/dolphin/ai/ai.c index c305f12085..c5f864b734 100644 --- a/libs/dolphin/ai/ai.c +++ b/libs/dolphin/ai/ai.c @@ -211,8 +211,41 @@ static OSTime max_wait; /* 804518B0-804518B4 000DB0 0004+00 2/2 0/0 0/0 .sbss buffer */ static OSTime buffer; +inline void AIResetStreamSampleCount(void) { __AIRegs[0] = (__AIRegs[0] & ~0x20) | 0x20; } + +inline void AISetStreamTrigger(u32 trigger) { __AIRegs[3] = trigger; } + /* 80350084-803501F0 34A9C4 016C+00 0/0 1/1 0/0 .text AIInit */ -// need compiler epilogue patch +// time assignments are weird +#ifdef NONMATCHING +void AIInit(u8* stack) { + if (__AI_init_flag == TRUE) { + return; + } + + OSRegisterVersion(__AIVersion); + bound_32KHz = OSNanosecondsToTicks(31524); + bound_48KHz = OSNanosecondsToTicks(42024); + min_wait = OSNanosecondsToTicks(42000); + max_wait = OSNanosecondsToTicks(63000); + buffer = OSNanosecondsToTicks(3000); + + AISetStreamVolRight(0); + AISetStreamVolLeft(0); + AISetStreamTrigger(0); + AIResetStreamSampleCount(); + __AI_set_stream_sample_rate(1); + AISetDSPSampleRate(0); + __AIS_Callback = 0; + __AID_Callback = 0; + __CallbackStack = stack; + __OSSetInterruptHandler(5, __AIDHandler); + __OSUnmaskInterrupts(0x04000000); + __OSSetInterruptHandler(8, __AISHandler); + __OSUnmaskInterrupts(0x800000); + __AI_init_flag = TRUE; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -221,6 +254,7 @@ asm void AIInit(u8* stack) { #include "asm/dolphin/ai/ai/AIInit.s" } #pragma pop +#endif /* 803501F0-8035026C 34AB30 007C+00 1/1 0/0 0/0 .text __AISHandler */ void __AISHandler(s16 interrupt, OSContext* context) { diff --git a/libs/dolphin/ar/Makefile b/libs/dolphin/ar/Makefile index 0d583d014c..f46c7fa8d9 100644 --- a/libs/dolphin/ar/Makefile +++ b/libs/dolphin/ar/Makefile @@ -37,10 +37,11 @@ $(BUILD_DIR)/libs/dolphin/ar/%.o: libs/dolphin/ar/%.c $(BUILD_DIR)/libs/dolphin/ @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBAR_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(FRANK_CC) $(LIBAR_A_CFLAGS) -c -o $(@:.o=.po) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBAR_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ - @$(PYTHON) $(FRANK) $@ $@ $@ + @$(PYTHON) $(FRANK) $@ $(@:.o=.po) $@ ifndef DISABLE_DEPS LIBAR_A_D_FILES := $(LIBAR_A_O_FILES:.o=.d) diff --git a/libs/dolphin/ar/ar.c b/libs/dolphin/ar/ar.c index 71a085cce9..6f11a21f84 100644 --- a/libs/dolphin/ar/ar.c +++ b/libs/dolphin/ar/ar.c @@ -12,7 +12,7 @@ void __ARHandler(s16 interrupt, OSContext* context); void __ARClearInterrupt(); -void __ARGetInterruptStatus(); +u16 __ARGetInterruptStatus(); void __ARChecksize(); /* ############################################################################################## */ @@ -20,8 +20,6 @@ void __ARChecksize(); static ARCallback __AR_Callback; /* 80350554-80350598 34AE94 0044+00 0/0 1/1 0/0 .text ARRegisterDMACallback */ -// needs compiler epilogue patch -#ifdef NONMATCHING ARCallback ARRegisterDMACallback(ARCallback callback) { ARCallback oldCb; BOOL enabled; @@ -31,20 +29,8 @@ ARCallback ARRegisterDMACallback(ARCallback callback) { OSRestoreInterrupts(enabled); return oldCb; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm ARCallback ARRegisterDMACallback(ARCallback callback) { - nofralloc -#include "asm/dolphin/ar/ar/ARRegisterDMACallback.s" -} -#pragma pop -#endif /* 80350598-803505D4 34AED8 003C+00 0/0 2/2 0/0 .text ARGetDMAStatus */ -// needs compiler epilogue patch -#ifdef NONMATCHING u32 ARGetDMAStatus() { BOOL enabled; u32 val; @@ -53,16 +39,6 @@ u32 ARGetDMAStatus() { OSRestoreInterrupts(enabled); return val; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 ARGetDMAStatus(void) { - nofralloc -#include "asm/dolphin/ar/ar/ARGetDMAStatus.s" -} -#pragma pop -#endif /* 803505D4-803506C4 34AF14 00F0+00 0/0 5/5 0/0 .text ARStartDMA */ void ARStartDMA(u32 type, u32 mainmem_addr, u32 aram_addr, u32 length) { @@ -100,8 +76,6 @@ static u32 __AR_FreeBlocks; static u32* __AR_BlockLength; /* 803506C4-8035072C 34B004 0068+00 0/0 1/1 0/0 .text ARAlloc */ -// needs compiler epilogue patch -#ifdef NONMATCHING u32 ARAlloc(u32 length) { u32 tmp; BOOL enabled; @@ -116,16 +90,6 @@ u32 ARAlloc(u32 length) { return tmp; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 ARAlloc(u32 length) { - nofralloc -#include "asm/dolphin/ar/ar/ARAlloc.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 803D1BE8-803D1C30 02ED08 0044+04 1/0 0/0 0/0 .data @1 */ @@ -139,14 +103,39 @@ SECTION_SDATA static const char* __ARVersion = lit_1; static volatile BOOL __AR_init_flag; /* 8035072C-803507F0 34B06C 00C4+00 0/0 1/1 0/0 .text ARInit */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 ARInit(u32* stack_index_addr, u32 num_entries) { - nofralloc -#include "asm/dolphin/ar/ar/ARInit.s" +u32 ARInit(u32* stack_index_addr, u32 num_entries) { + BOOL old; + u16 refresh; + + if (__AR_init_flag == TRUE) { + return 0x4000; + } + + OSRegisterVersion(__ARVersion); + + old = OSDisableInterrupts(); + + __AR_Callback = NULL; + + __OSSetInterruptHandler(OS_INTR_DSP_ARAM, __ARHandler); + __OSUnmaskInterrupts(OS_INTERRUPTMASK_DSP_ARAM); + + __AR_StackPointer = 0x4000; + __AR_FreeBlocks = num_entries; + __AR_BlockLength = stack_index_addr; + + refresh = (u16)(__DSPRegs[13] & 0x000000ff); + + __DSPRegs[13] = (u16)((__DSPRegs[13] & ~0x000000ff) | (refresh & 0x000000ff)); + + __ARChecksize(); + + __AR_init_flag = TRUE; + + OSRestoreInterrupts(old); + + return __AR_StackPointer; } -#pragma pop /* 803507F0-803507F8 -00001 0008+00 0/0 0/0 0/0 .text ARGetSize */ u32 ARGetSize(void) { @@ -174,26 +163,201 @@ static void __ARHandler(s16 interrupt, OSContext* context) { } /* 80350870-80350890 34B1B0 0020+00 0/0 2/2 0/0 .text __ARClearInterrupt */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __ARClearInterrupt() { - nofralloc -#include "asm/dolphin/ar/ar/__ARClearInterrupt.s" +void __ARClearInterrupt(void) { + u16 tmp; + tmp = __DSPRegs[5]; + tmp = (u16)((tmp & ~(0x00000080 | 0x00000008)) | 0x00000020); + __DSPRegs[5] = tmp; } -#pragma pop /* 80350890-803508A0 34B1D0 0010+00 0/0 2/2 0/0 .text __ARGetInterruptStatus */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __ARGetInterruptStatus() { - nofralloc -#include "asm/dolphin/ar/ar/__ARGetInterruptStatus.s" +u16 __ARGetInterruptStatus(void) { + return ((u16)(__DSPRegs[5] & 0x0020)); } -#pragma pop + +#define RoundUP32(x) (((u32)(x) + 32 - 1) & ~(32 - 1)) /* 803508A0-80352094 34B1E0 17F4+00 1/1 0/0 0/0 .text __ARChecksize */ +#ifdef NONMATCHING +void __ARChecksize(void) { + + u8 test_data_pad[0x20 + 31]; + u8 dummy_data_pad[0x20 + 31]; + u8 buffer_pad[0x20 + 31]; + + u8 save_pad_1[0x20 + 31]; + u8 save_pad_2[0x20 + 31]; + u8 save_pad_3[0x20 + 31]; + u8 save_pad_4[0x20 + 31]; + u8 save_pad_5[0x20 + 31]; + + u16 dspreg9; + u32* test_data; + u32* dummy_data; + u32* buffer; + u32* save1; + u32* save2; + u32* save3; + u32* save4; + u32* save5; + + u16 ARAM_mode = 0; + u32 ARAM_size = 0; + + u32 i; + + while (!(__DSPRegs[11] & 1)) + ; + + ARAM_mode = 3; + __DSPRegs[9] = (u16)((__DSPRegs[9] & ~(0x00000007 | 0x00000038)) | 0x20 | 2 | 1); + ARAM_size = __AR_InternalSize = 0x1000000; + + test_data = (u32*)(RoundUP32((u32)(test_data_pad))); + dummy_data = (u32*)(RoundUP32((u32)(dummy_data_pad))); + buffer = (u32*)(RoundUP32((u32)(buffer_pad))); + + save1 = (u32*)(RoundUP32((u32)(save_pad_1))); + save2 = (u32*)(RoundUP32((u32)(save_pad_2))); + save3 = (u32*)(RoundUP32((u32)(save_pad_3))); + save4 = (u32*)(RoundUP32((u32)(save_pad_4))); + save5 = (u32*)(RoundUP32((u32)(save_pad_5))); + + for (i = 0; i < 8; i++) { + *(test_data + i) = 0xdeadbeef; + *(dummy_data + i) = 0xbad0bad0; + } + + DCFlushRange((void*)test_data, 0x20); + DCFlushRange((void*)dummy_data, 0x20); + + __AR_ExpansionSize = 0; + + DCInvalidateRange((void*)save1, 0x20); + __ARReadDMA((u32)save1, ARAM_size + 0, 0x20); + PPCSync(); + + __ARWriteDMA((u32)test_data, ARAM_size + 0x0000000, 0x20); + + memset((void*)buffer, 0, 0x20); + DCFlushRange((void*)buffer, 0x20); + + __ARReadDMA((u32)buffer, ARAM_size + 0x0000000, 0x20); + PPCSync(); + + if (buffer[0] == test_data[0]) { + + DCInvalidateRange((void*)save2, 0x20); + __ARReadDMA((u32)save2, ARAM_size + 0x0200000, 0x20); + PPCSync(); + + DCInvalidateRange((void*)save3, 0x20); + __ARReadDMA((u32)save3, ARAM_size + 0x1000000, 0x20); + PPCSync(); + + DCInvalidateRange((void*)save4, 0x20); + __ARReadDMA((u32)save4, ARAM_size + 0x0000200, 0x20); + PPCSync(); + + DCInvalidateRange((void*)save5, 0x20); + __ARReadDMA((u32)save5, ARAM_size + 0x0400000, 0x20); + PPCSync(); + + __ARWriteDMA((u32)dummy_data, ARAM_size + 0x0200000, 0x20); + + __ARWriteDMA((u32)test_data, ARAM_size + 0x0000000, 0x20); + + memset((void*)buffer, 0, 0x20); + DCFlushRange((void*)buffer, 0x20); + + __ARReadDMA((u32)buffer, ARAM_size + 0x0200000, 0x20); + PPCSync(); + + if (buffer[0] == test_data[0]) { + __ARWriteDMA((u32)save1, ARAM_size + 0x0000000, 0x20); + + ARAM_mode |= 0 << 1; + ARAM_size += 0x0200000; + __AR_ExpansionSize = 0x0200000; + } else { + __ARWriteDMA((u32)dummy_data, ARAM_size + 0x1000000, 0x20); + + __ARWriteDMA((u32)test_data, ARAM_size + 0x0000000, 0x20); + + memset((void*)buffer, 0, 0x20); + DCFlushRange((void*)buffer, 0x20); + + __ARReadDMA((u32)buffer, ARAM_size + 0x1000000, 0x20); + PPCSync(); + + if (buffer[0] == test_data[0]) { + __ARWriteDMA((u32)save1, ARAM_size + 0x0000000, 0x20); + __ARWriteDMA((u32)save2, ARAM_size + 0x0200000, 0x20); + + ARAM_mode |= 4 << 1; + ARAM_size += 0x0400000; + __AR_ExpansionSize = 0x0400000; + } else { + __ARWriteDMA((u32)dummy_data, ARAM_size + 0x0000200, 0x20); + + __ARWriteDMA((u32)test_data, ARAM_size + 0x0000000, 0x20); + + memset((void*)buffer, 0, 0x20); + DCFlushRange((void*)buffer, 0x20); + + __ARReadDMA((u32)buffer, ARAM_size + 0x0000200, 0x20); + PPCSync(); + + if (buffer[0] == test_data[0]) { + __ARWriteDMA((u32)save1, ARAM_size + 0x0000000, 0x20); + __ARWriteDMA((u32)save2, ARAM_size + 0x0200000, 0x20); + __ARWriteDMA((u32)save3, ARAM_size + 0x1000000, 0x20); + + ARAM_mode |= 8 << 1; + ARAM_size += 0x0800000; + __AR_ExpansionSize = 0x0800000; + } else { + __ARWriteDMA((u32)dummy_data, ARAM_size + 0x0400000, 0x20); + + __ARWriteDMA((u32)test_data, ARAM_size + 0x0000000, 0x20); + + memset((void*)buffer, 0, 0x20); + DCFlushRange((void*)buffer, 0x20); + + __ARReadDMA((u32)buffer, ARAM_size + 0x0400000, 0x20); + PPCSync(); + + if (buffer[0] == test_data[0]) { + __ARWriteDMA((u32)save1, ARAM_size + 0x0000000, 0x20); + __ARWriteDMA((u32)save2, ARAM_size + 0x0200000, 0x20); + __ARWriteDMA((u32)save3, ARAM_size + 0x1000000, 0x20); + __ARWriteDMA((u32)save4, ARAM_size + 0x0000200, 0x20); + + ARAM_mode |= 12 << 1; + ARAM_size += 0x1000000; + __AR_ExpansionSize = 0x1000000; + } else { + __ARWriteDMA((u32)save1, ARAM_size + 0x0000000, 0x20); + __ARWriteDMA((u32)save2, ARAM_size + 0x0200000, 0x20); + __ARWriteDMA((u32)save3, ARAM_size + 0x1000000, 0x20); + __ARWriteDMA((u32)save4, ARAM_size + 0x0000200, 0x20); + __ARWriteDMA((u32)save5, ARAM_size + 0x0400000, 0x20); + + ARAM_mode |= 16 << 1; + ARAM_size += 0x2000000; + __AR_ExpansionSize = 0x2000000; + } + } + } + } + __DSPRegs[9] = (u16)((__DSPRegs[9] & ~(0x07 | 0x38)) | ARAM_mode); + } + + *(u32*)OSPhysicalToUncached(0x00D0) = ARAM_size; + + __AR_Size = ARAM_size; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -202,3 +366,4 @@ asm void __ARChecksize() { #include "asm/dolphin/ar/ar/__ARChecksize.s" } #pragma pop +#endif \ No newline at end of file diff --git a/libs/dolphin/ar/arq.c b/libs/dolphin/ar/arq.c index e068cea863..138c15676d 100644 --- a/libs/dolphin/ar/arq.c +++ b/libs/dolphin/ar/arq.c @@ -21,7 +21,7 @@ void ARQInit(); // void OSRegisterVersion(); -void OSDisableInterrupts(); +BOOL OSDisableInterrupts(); void OSRestoreInterrupts(); void ARRegisterDMACallback(); void ARStartDMA(); @@ -32,41 +32,71 @@ void ARStartDMA(); /* ############################################################################################## */ /* 804518D8-804518DC 000DD8 0004+00 3/3 0/0 0/0 .sbss __ARQRequestQueueHi */ -static u8 __ARQRequestQueueHi[4]; +static ARQRequest* __ARQRequestQueueHi; /* 804518DC-804518E0 000DDC 0004+00 1/1 0/0 0/0 .sbss __ARQRequestTailHi */ -static u8 __ARQRequestTailHi[4]; +static ARQRequest* __ARQRequestTailHi; /* 804518E0-804518E4 000DE0 0004+00 3/3 0/0 0/0 .sbss __ARQRequestQueueLo */ -static u8 __ARQRequestQueueLo[4]; +static ARQRequest* __ARQRequestQueueLo; /* 804518E4-804518E8 000DE4 0004+00 1/1 0/0 0/0 .sbss __ARQRequestTailLo */ -static u8 __ARQRequestTailLo[4]; +static ARQRequest* __ARQRequestTailLo; /* 804518E8-804518EC 000DE8 0004+00 3/3 0/0 0/0 .sbss __ARQRequestPendingHi */ -static u8 __ARQRequestPendingHi[4]; +static ARQRequest* __ARQRequestPendingHi; /* 804518EC-804518F0 000DEC 0004+00 4/4 0/0 0/0 .sbss __ARQRequestPendingLo */ -static u8 __ARQRequestPendingLo[4]; +static ARQRequest* __ARQRequestPendingLo; /* 804518F0-804518F4 000DF0 0004+00 3/3 0/0 0/0 .sbss __ARQCallbackHi */ -static u8 __ARQCallbackHi[4]; +static ARQCallback __ARQCallbackHi; /* 804518F4-804518F8 000DF4 0004+00 3/3 0/0 0/0 .sbss __ARQCallbackLo */ -static u8 __ARQCallbackLo[4]; +static ARQCallback __ARQCallbackLo; /* 804518F8-804518FC 000DF8 0004+00 2/2 0/0 0/0 .sbss __ARQChunkSize */ -static u8 __ARQChunkSize[4]; +static u32 __ARQChunkSize; + +/* 803D1C30-803D1C78 02ED50 0045+03 1/0 0/0 0/0 .data @1 */ +const char* __ARQVersion = "<< Dolphin SDK - ARQ\trelease build: Apr 5 2004 04:15:04 (0x2301) >>"; + +/* 804518FC-80451900 000DFC 0004+00 1/1 0/0 0/0 .sbss __ARQ_init_flag */ +static BOOL __ARQ_init_flag; + /* 80352094-80352194 34C9D4 0100+00 2/2 0/0 0/0 .text __ARQServiceQueueLo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __ARQServiceQueueLo() { - nofralloc -#include "asm/dolphin/ar/arq/__ARQServiceQueueLo.s" +void __ARQServiceQueueLo(void) { + if ((__ARQRequestPendingLo == NULL) && (__ARQRequestQueueLo)) { + __ARQRequestPendingLo = __ARQRequestQueueLo; + + __ARQRequestQueueLo = __ARQRequestQueueLo->next; + } + + if (__ARQRequestPendingLo) { + if (__ARQRequestPendingLo->length <= __ARQChunkSize) { + if (__ARQRequestPendingLo->type == ARAM_DIR_MRAM_TO_ARAM) + ARStartDMA(__ARQRequestPendingLo->type, __ARQRequestPendingLo->source, + __ARQRequestPendingLo->destination, __ARQRequestPendingLo->length); + else + ARStartDMA(__ARQRequestPendingLo->type, __ARQRequestPendingLo->destination, + __ARQRequestPendingLo->source, __ARQRequestPendingLo->length); + + __ARQCallbackLo = __ARQRequestPendingLo->callback; + } else { + if (__ARQRequestPendingLo->type == ARAM_DIR_MRAM_TO_ARAM) + ARStartDMA(__ARQRequestPendingLo->type, __ARQRequestPendingLo->source, + __ARQRequestPendingLo->destination, __ARQChunkSize); + else + ARStartDMA(__ARQRequestPendingLo->type, __ARQRequestPendingLo->destination, + __ARQRequestPendingLo->source, __ARQChunkSize); + } + + __ARQRequestPendingLo->length -= __ARQChunkSize; + __ARQRequestPendingLo->source += __ARQChunkSize; + __ARQRequestPendingLo->destination += __ARQChunkSize; + } } -#pragma pop /* 80352194-80352198 34CAD4 0004+00 1/1 0/0 0/0 .text __ARQCallbackHack */ void __ARQCallbackHack() { @@ -74,46 +104,121 @@ void __ARQCallbackHack() { } /* 80352198-80352264 34CAD8 00CC+00 1/1 0/0 0/0 .text __ARQInterruptServiceRoutine */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __ARQInterruptServiceRoutine() { - nofralloc -#include "asm/dolphin/ar/arq/__ARQInterruptServiceRoutine.s" +void __ARQInterruptServiceRoutine(void) { + if (__ARQCallbackHi) { + (*__ARQCallbackHi)((u32)__ARQRequestPendingHi); + __ARQRequestPendingHi = NULL; + __ARQCallbackHi = NULL; + } + + else if (__ARQCallbackLo) + { + (*__ARQCallbackLo)((u32)__ARQRequestPendingLo); + __ARQRequestPendingLo = NULL; + __ARQCallbackLo = NULL; + } + + if (__ARQRequestQueueHi) { + if (__ARQRequestQueueHi->type == 0) { + ARStartDMA(__ARQRequestQueueHi->type, __ARQRequestQueueHi->source, + __ARQRequestQueueHi->destination, __ARQRequestQueueHi->length); + } else { + ARStartDMA(__ARQRequestQueueHi->type, __ARQRequestQueueHi->destination, + __ARQRequestQueueHi->source, __ARQRequestQueueHi->length); + } + __ARQCallbackHi = __ARQRequestQueueHi->callback; + __ARQRequestPendingHi = __ARQRequestQueueHi; + __ARQRequestQueueHi = __ARQRequestQueueHi->next; + } + + if (__ARQRequestPendingHi == NULL) { + __ARQServiceQueueLo(); + } } -#pragma pop - -/* ############################################################################################## */ -/* 803D1C30-803D1C78 02ED50 0045+03 1/0 0/0 0/0 .data @1 */ -SECTION_DATA static char lit_1[] = "<< Dolphin SDK - ARQ\trelease build: Apr 5 2004 04:15:04 (0x2301) >>"; - -/* 80450A50-80450A58 -00001 0004+04 1/1 0/0 0/0 .sdata __ARQVersion */ -SECTION_SDATA static void* __ARQVersion[1 + 1 /* padding */] = { - (void*)&lit_1, - /* padding */ - NULL, -}; - -/* 804518FC-80451900 000DFC 0004+00 1/1 0/0 0/0 .sbss __ARQ_init_flag */ -static u8 __ARQ_init_flag[4]; /* 80352264-803522D4 34CBA4 0070+00 0/0 1/1 0/0 .text ARQInit */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ARQInit() { - nofralloc -#include "asm/dolphin/ar/arq/ARQInit.s" +void ARQInit(void) { + if (__ARQ_init_flag == TRUE) { + return; + } + + OSRegisterVersion(__ARQVersion); + __ARQRequestQueueHi = __ARQRequestQueueLo = NULL; + __ARQChunkSize = ARQ_CHUNK_SIZE_DEFAULT; + ARRegisterDMACallback(&__ARQInterruptServiceRoutine); + __ARQRequestPendingHi = NULL; + __ARQRequestPendingLo = NULL; + __ARQCallbackHi = NULL; + __ARQCallbackLo = NULL; + __ARQ_init_flag = TRUE; } -#pragma pop /* 803522D4-80352430 34CC14 015C+00 0/0 1/1 0/0 .text ARQPostRequest */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ARQPostRequest(ARQRequest* task, u32 owner, u32 type, u32 priority, u32 source, - u32 destination, u32 length, ARQCallback callback) { - nofralloc -#include "asm/dolphin/ar/arq/ARQPostRequest.s" +void ARQPostRequest(ARQRequest* request, u32 owner, u32 type, u32 priority, u32 source, u32 dest, + u32 length, ARQCallback callback) { + BOOL enabled; + + request->next = NULL; + request->owner = owner; + request->type = type; + request->source = source; + request->destination = dest; + request->length = length; + + if (callback) { + request->callback = callback; + } else { + request->callback = (ARQCallback)&__ARQCallbackHack; + } + + enabled = OSDisableInterrupts(); + + switch (priority) { + case ARQ_PRIORITY_LOW: + + if (__ARQRequestQueueLo) { + __ARQRequestTailLo->next = request; + } else { + __ARQRequestQueueLo = request; + } + __ARQRequestTailLo = request; + + break; + + case ARQ_PRIORITY_HIGH: + + if (__ARQRequestQueueHi) { + __ARQRequestTailHi->next = request; + } else { + __ARQRequestQueueHi = request; + } + + __ARQRequestTailHi = request; + + break; + } + + if ((__ARQRequestPendingHi == NULL) && (__ARQRequestPendingLo == NULL)) { + if (__ARQRequestQueueHi) { + if (__ARQRequestQueueHi->type == ARAM_DIR_MRAM_TO_ARAM) { + ARStartDMA(__ARQRequestQueueHi->type, __ARQRequestQueueHi->source, + __ARQRequestQueueHi->destination, __ARQRequestQueueHi->length); + } else { + ARStartDMA(__ARQRequestQueueHi->type, __ARQRequestQueueHi->destination, + __ARQRequestQueueHi->source, __ARQRequestQueueHi->length); + } + + __ARQCallbackHi = __ARQRequestQueueHi->callback; + + __ARQRequestPendingHi = __ARQRequestQueueHi; + + __ARQRequestQueueHi = __ARQRequestQueueHi->next; + } + + if (__ARQRequestPendingHi == NULL) { + __ARQServiceQueueLo(); + } + } + + OSRestoreInterrupts(enabled); } -#pragma pop diff --git a/libs/dolphin/base/Makefile b/libs/dolphin/base/Makefile index 086f7cd8ef..8a626555e5 100644 --- a/libs/dolphin/base/Makefile +++ b/libs/dolphin/base/Makefile @@ -27,7 +27,7 @@ $(BUILD_DIR)/libs/dolphin/base/%.o: libs/dolphin/base/%.c $(BUILD_DIR)/libs/dolp @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBBASE_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(CFLAGS) $(LIBBASE_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/libs/dolphin/card/CARDBios.c b/libs/dolphin/card/CARDBios.c index 47217f41be..9df3a700f4 100644 --- a/libs/dolphin/card/CARDBios.c +++ b/libs/dolphin/card/CARDBios.c @@ -186,14 +186,23 @@ s32 __CARDReadStatus(s32 chan, u8* status) { } /* 80352F34-80353024 34D874 00F0+00 0/0 1/1 0/0 .text __CARDReadVendorID */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __CARDReadVendorID() { - nofralloc -#include "asm/dolphin/card/CARDBios/__CARDReadVendorID.s" +s32 __CARDReadVendorID(s32 chan, u16* vendorId) { + BOOL err; + u32 cmd; + + if (!EXISelect(chan, 0, 4)) { + return CARD_RESULT_NOCARD; + } + + cmd = 0x85000000; + err = FALSE; + err |= !EXIImm(chan, &cmd, 2, 1, NULL); + err |= !EXISync(chan); + err |= !EXIImm(chan, vendorId, 2, 0, NULL); + err |= !EXISync(chan); + err |= !EXIDeselect(chan); + return err ? CARD_RESULT_NOCARD : CARD_RESULT_READY; } -#pragma pop /* 80353024-803530D0 34D964 00AC+00 1/1 1/1 0/0 .text __CARDClearStatus */ s32 __CARDClearStatus(s32 chan) { @@ -237,15 +246,69 @@ static void TimeoutHandler(OSAlarm* alarm, OSContext* context) { } } -/* 80353174-80353414 34DAB4 02A0+00 2/2 0/0 0/0 .text Retry */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 Retry(s32 chan) { - nofralloc -#include "asm/dolphin/card/CARDBios/Retry.s" +static inline void SetupTimeoutAlarm(CARDControl* card) { + OSCancelAlarm(&card->alarm); + switch (card->cmd[0]) { + case 0xF2: + OSSetAlarm(&card->alarm, OSMillisecondsToTicks(100), TimeoutHandler); + break; + case 0xF3: + break; + case 0xF4: + if (card->pageSize > 0x80) { + OSSetAlarm(&card->alarm, OSSecondsToTicks((OSTime)2) * (card->cBlock / 0x40), + TimeoutHandler); + break; + } + case 0xF1: + OSSetAlarm(&card->alarm, OSSecondsToTicks((OSTime)2) * (card->sectorSize / 0x2000), + TimeoutHandler); + break; + default: + break; + } +} + +/* 80353174-80353414 34DAB4 02A0+00 2/2 0/0 0/0 .text Retry */ +static s32 Retry(s32 chan) { + CARDControl* card; + card = &__CARDBlock[chan]; + + if (!EXISelect(chan, 0, 4)) { + EXIUnlock(chan); + return CARD_RESULT_NOCARD; + } + + SetupTimeoutAlarm(card); + + if (!EXIImmEx(chan, card->cmd, card->cmdlen, 1)) { + EXIDeselect(chan); + EXIUnlock(chan); + return CARD_RESULT_NOCARD; + } + + if (card->cmd[0] == 0x52 && + !EXIImmEx(chan, (u8*)card->workArea + sizeof(CARDID), card->latency, 1)) { + EXIDeselect(chan); + EXIUnlock(chan); + return CARD_RESULT_NOCARD; + } + + if (card->mode == 0xffffffff) { + EXIDeselect(chan); + EXIUnlock(chan); + return CARD_RESULT_READY; + } + + if (!EXIDma(chan, card->buffer, (s32)((card->cmd[0] == 0x52) ? 512 : card->pageSize), card->mode, + __CARDTxHandler)) { + EXIDeselect(chan); + EXIUnlock(chan); + return CARD_RESULT_NOCARD; + } + + return CARD_RESULT_READY; } -#pragma pop /* 80353414-80353524 34DD54 0110+00 1/1 0/0 0/0 .text UnlockedCallback */ static void UnlockedCallback(s32 chan, s32 result) { @@ -287,14 +350,43 @@ static void UnlockedCallback(s32 chan, s32 result) { } /* 80353524-80353748 34DE64 0224+00 3/3 0/0 0/0 .text __CARDStart */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDStart(s32 chan, CARDCallback txCallback, CARDCallback exiCallback) { - nofralloc -#include "asm/dolphin/card/CARDBios/__CARDStart.s" +static s32 __CARDStart(s32 chan, CARDCallback txCallback, CARDCallback exiCallback) { + BOOL enabled; + CARDControl* card; + s32 result; + + enabled = OSDisableInterrupts(); + + card = &__CARDBlock[chan]; + if (!card->attached) { + result = CARD_RESULT_NOCARD; + } else { + + if (txCallback) { + card->txCallback = txCallback; + } + if (exiCallback) { + card->exiCallback = exiCallback; + } + card->unlockCallback = UnlockedCallback; + if (!EXILock(chan, 0, __CARDUnlockedHandler)) { + result = CARD_RESULT_BUSY; + } else { + card->unlockCallback = 0; + + if (!EXISelect(chan, 0, 4)) { + EXIUnlock(chan); + result = CARD_RESULT_NOCARD; + } else { + SetupTimeoutAlarm(card); + result = CARD_RESULT_READY; + } + } + } + + OSRestoreInterrupts(enabled); + return result; } -#pragma pop #define AD1(x) ((u8)(((x) >> 17) & 0x7f)) #define AD1EX(x) ((u8)(AD1(x) | 0x80)); @@ -337,15 +429,19 @@ s32 __CARDReadSegment(s32 chan, CARDCallback callback) { } /* 8035387C-803539B8 34E1BC 013C+00 0/0 2/2 0/0 .text __CARDWritePage */ -// needs compiler epilogue patch -#ifdef NONMATCH s32 __CARDWritePage(s32 chan, CARDCallback callback) { CARDControl* card; s32 result; card = &__CARDBlock[chan]; + card->cmd[0] = 0xF2; - card->cmd[1] = AD1(card->addr); + if (card->pageSize > 0x80) { + card->cmd[1] = AD1(card->addr) | 0x80; + } else { + card->cmd[1] = AD1(card->addr); + } + card->cmd[2] = AD2(card->addr); card->cmd[3] = AD3(card->addr); card->cmd[4] = BA(card->addr); @@ -358,7 +454,7 @@ s32 __CARDWritePage(s32 chan, CARDCallback callback) { result = CARD_RESULT_READY; } else if (result >= 0) { if (!EXIImmEx(chan, card->cmd, card->cmdlen, 1) || - !EXIDma(chan, card->buffer, 128, card->mode, __CARDTxHandler)) { + !EXIDma(chan, card->buffer, card->pageSize, card->mode, __CARDTxHandler)) { card->exiCallback = 0; EXIDeselect(chan); EXIUnlock(chan); @@ -369,26 +465,43 @@ s32 __CARDWritePage(s32 chan, CARDCallback callback) { } return result; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDWritePage(s32 chan, CARDCallback callback) { - nofralloc -#include "asm/dolphin/card/CARDBios/__CARDWritePage.s" -} -#pragma pop -#endif /* 803539B8-80353AC8 34E2F8 0110+00 0/0 6/6 0/0 .text __CARDEraseSector */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDEraseSector(s32 chan, u32 addr, CARDCallback callback) { - nofralloc -#include "asm/dolphin/card/CARDBios/__CARDEraseSector.s" +s32 __CARDEraseSector(s32 chan, u32 addr, CARDCallback callback) { + CARDControl* card; + s32 result; + + card = &__CARDBlock[chan]; + if (card->pageSize > 0x80) { + if (callback) { + callback(chan, 0); + } + return 0; + } + card->cmd[0] = 0xF1; + card->cmd[1] = AD1(addr); + card->cmd[2] = AD2(addr); + card->cmdlen = 3; + card->mode = -1; + card->retry = 3; + + result = __CARDStart(chan, 0, callback); + + if (result == CARD_RESULT_BUSY) { + result = CARD_RESULT_READY; + } else if (result >= 0) { + if (!EXIImmEx(chan, card->cmd, card->cmdlen, 1)) { + card->exiCallback = NULL; + result = CARD_RESULT_NOCARD; + } else { + result = CARD_RESULT_READY; + } + + EXIDeselect(chan); + EXIUnlock(chan); + } + return result; } -#pragma pop /* ############################################################################################## */ /* 803D1E38-803D1E80 02EF58 0046+02 1/0 0/0 0/0 .data @1 */ @@ -478,26 +591,84 @@ s32 __CARDGetControlBlock(s32 chan, CARDControl** pcard) { } /* 80353C6C-80353CD0 34E5AC 0064+00 0/0 24/24 0/0 .text __CARDPutControlBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDPutControlBlock(CARDControl* card, s32 result) { - nofralloc -#include "asm/dolphin/card/CARDBios/__CARDPutControlBlock.s" +s32 __CARDPutControlBlock(CARDControl* card, s32 result) { + BOOL enabled; + + enabled = OSDisableInterrupts(); + if (card->attached) { + card->result = result; + } else if (card->result == CARD_RESULT_BUSY) { + card->result = result; + } + OSRestoreInterrupts(enabled); + return result; } -#pragma pop /* 80353CD0-80353E20 34E610 0150+00 0/0 1/1 0/0 .text CARDFreeBlocks */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 CARDFreeBlocks(s32 chan, s32* byteNotUsed, s32* filesNotUsed) { - nofralloc -#include "asm/dolphin/card/CARDBios/CARDFreeBlocks.s" +s32 CARDFreeBlocks(s32 chan, s32* byteNotUsed, s32* filesNotUsed) { + CARDControl* card; + s32 result; + u16* fat; + CARDDir* dir; + CARDDir* ent; + u16 fileNo; + + result = __CARDGetControlBlock(chan, &card); + if (result < 0) { + return result; + } + + fat = __CARDGetFatBlock(card); + dir = __CARDGetDirBlock(card); + if (fat == 0 || dir == 0) { + return __CARDPutControlBlock(card, CARD_RESULT_BROKEN); + } + + if (byteNotUsed) { + *byteNotUsed = (s32)(card->sectorSize * fat[CARD_FAT_FREEBLOCKS]); + } + + if (filesNotUsed) { + *filesNotUsed = 0; + for (fileNo = 0; fileNo < CARD_MAX_FILE; fileNo++) { + ent = &dir[fileNo]; + if (ent->fileName[0] == 0xff) { + ++*filesNotUsed; + } + } + } + + return __CARDPutControlBlock(card, CARD_RESULT_READY); } -#pragma pop /* 80353E20-80353EB8 34E760 0098+00 0/0 7/7 0/0 .text __CARDSync */ +#ifdef NONMATCHING +s32 __CARDSync(s32 chan) { + CARDControl* card; + s32 val; + BOOL enabled; + s32 result; + + card = &__CARDBlock[chan]; + enabled = OSDisableInterrupts(); + for (;; ) { + if (chan < 0 || chan >= 2) + result = -0x80; + else + result = card->result; + val = result; + + if (val != CARD_RESULT_BUSY){ + break; + } else { + OSSleepThread(&card->threadQueue); + } + } + OSRestoreInterrupts(enabled); + + return val; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -506,6 +677,7 @@ asm s32 __CARDSync(s32 chan) { #include "asm/dolphin/card/CARDBios/__CARDSync.s" } #pragma pop +#endif /* 80353EB8-80353F08 34E7F8 0050+00 1/0 0/0 0/0 .text OnReset */ static s32 OnReset(s32 f) { diff --git a/libs/dolphin/card/CARDBlock.c b/libs/dolphin/card/CARDBlock.c index a1cab5be6a..011489d080 100644 --- a/libs/dolphin/card/CARDBlock.c +++ b/libs/dolphin/card/CARDBlock.c @@ -62,18 +62,39 @@ static void WriteCallback(s32 chan, s32 result) { } /* 803554F0-803555B8 34FE30 00C8+00 1/1 0/0 0/0 .text EraseCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void EraseCallback(s32 chan, s32 result) { - nofralloc -#include "asm/dolphin/card/CARDBlock/EraseCallback.s" +static void EraseCallback(s32 chan, s32 result) { + CARDControl* card; + CARDCallback callback; + u32 temp[2]; /* this compiler sucks */ + u16* fat; + u32 addr; + + card = &__CARDBlock[chan]; + if (result < 0) { + goto error; + } + + fat = __CARDGetFatBlock(card); + addr = ((u32)fat - (u32)card->workArea) / CARD_SYSTEM_BLOCK_SIZE * card->sectorSize; + result = __CARDWrite(chan, addr, CARD_SYSTEM_BLOCK_SIZE, fat, WriteCallback); + if (result < 0) { + goto error; + } + + return; + +error: + if (card->apiCallback == NULL) { + __CARDPutControlBlock(card, result); + } + callback = card->eraseCallback; + if (callback) { + card->eraseCallback = NULL; + callback(chan, result); + } } -#pragma pop /* 803555B8-803556D0 34FEF8 0118+00 0/0 1/1 0/0 .text __CARDAllocBlock */ -// needs compiler epilogue patch -#ifdef NONMATCHING s32 __CARDAllocBlock(s32 chan, u32 cBlock, CARDCallback callback) { CARDControl* card; u16* fat; @@ -122,23 +143,17 @@ s32 __CARDAllocBlock(s32 chan, u32 cBlock, CARDCallback callback) { return __CARDUpdateFatBlock(chan, fat, callback); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDAllocBlock(s32 chan, u32 cBlock, CARDCallback callback) { - nofralloc -#include "asm/dolphin/card/CARDBlock/__CARDAllocBlock.s" -} -#pragma pop -#endif /* 803556D0-8035577C 350010 00AC+00 1/1 1/1 0/0 .text __CARDUpdateFatBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDUpdateFatBlock(s32 chan, u16* fat, CARDCallback callback) { - nofralloc -#include "asm/dolphin/card/CARDBlock/__CARDUpdateFatBlock.s" +s32 __CARDUpdateFatBlock(s32 chan, u16* fat, CARDCallback callback) { + CARDControl* card; + + card = &__CARDBlock[chan]; + ++fat[2]; + __CARDCheckSum(fat + 2, 0x1FFC, fat, fat + 1); + DCStoreRange(fat, 0x2000); + card->eraseCallback = callback; + + return __CARDEraseSector(chan, (((u32)fat - (u32)card->workArea) / 8192u) * card->sectorSize, + EraseCallback); } -#pragma pop diff --git a/libs/dolphin/card/CARDCheck.c b/libs/dolphin/card/CARDCheck.c index d1fea3f8da..abd98491a7 100644 --- a/libs/dolphin/card/CARDCheck.c +++ b/libs/dolphin/card/CARDCheck.c @@ -53,34 +53,143 @@ void __CARDCheckSum(void* ptr, int length, u16* checksum, u16* checksumInv) { } /* 80355B90-80355E14 3504D0 0284+00 2/2 0/0 0/0 .text VerifyID */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 VerifyID(CARDControl* card) { - nofralloc -#include "asm/dolphin/card/CARDCheck/VerifyID.s" +static s32 VerifyID(CARDControl* card) { + CARDID* id; + u16 checksum; + u16 checksumInv; + OSSramEx* sramEx; + OSTime rand; + int i; + + id = card->workArea; + + if (id->deviceID != 0 || id->size != card->size) { + return CARD_RESULT_BROKEN; + } + + __CARDCheckSum(id, sizeof(CARDID) - sizeof(u32), &checksum, &checksumInv); + if (id->checkSum != checksum || id->checkSumInv != checksumInv) { + return CARD_RESULT_BROKEN; + } + + rand = *(OSTime*)&id->serial[12]; + sramEx = __OSLockSramEx(); + + for (i = 0; i < 12; i++) { + rand = (rand * 1103515245 + 12345) >> 16; + if (id->serial[i] != (u8)(sramEx->flashID[card - __CARDBlock][i] + rand)) { + __OSUnlockSramEx(FALSE); + return CARD_RESULT_BROKEN; + } + rand = ((rand * 1103515245 + 12345) >> 16) & 0x7FFF; + } + + __OSUnlockSramEx(FALSE); + if (id->encode != __CARDGetFontEncode()) { + return CARD_RESULT_ENCODING; + } + + return CARD_RESULT_READY; } -#pragma pop /* 80355E14-80356054 350754 0240+00 2/2 0/0 0/0 .text VerifyDir */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 VerifyDir(CARDControl* card, int* outCurrent) { - nofralloc -#include "asm/dolphin/card/CARDCheck/VerifyDir.s" +static s32 VerifyDir(CARDControl* card, int* outCurrent) { + CARDDir* dir[2]; + CARDDirCheck* check[2]; + u16 checkSum; + u16 checkSumInv; + int i; + int errors; + int current; + + current = errors = 0; + for (i = 0; i < 2; i++) { + dir[i] = (CARDDir*)((u8*)card->workArea + (1 + i) * CARD_SYSTEM_BLOCK_SIZE); + check[i] = __CARDGetDirCheck(dir[i]); + __CARDCheckSum(dir[i], CARD_SYSTEM_BLOCK_SIZE - sizeof(u32), &checkSum, &checkSumInv); + if (check[i]->checkSum != checkSum || check[i]->checkSumInv != checkSumInv) { + ++errors; + current = i; + card->currentDir = 0; + } + } + + if (0 == errors) { + if (card->currentDir == 0) { + if ((check[0]->checkCode - check[1]->checkCode) < 0) { + current = 0; + } else { + current = 1; + } + card->currentDir = dir[current]; + memcpy(dir[current], dir[current ^ 1], CARD_SYSTEM_BLOCK_SIZE); + } else { + current = (card->currentDir == dir[0]) ? 0 : 1; + } + } + if (outCurrent) { + *outCurrent = current; + } + return errors; } -#pragma pop /* 80356054-803562D8 350994 0284+00 2/2 0/0 0/0 .text VerifyFAT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 VerifyFAT(CARDControl* card, int* outCurrent) { - nofralloc -#include "asm/dolphin/card/CARDCheck/VerifyFAT.s" +static s32 VerifyFAT(CARDControl* card, int* outCurrent) { + u16* fat[2]; + u16* fatp; + u16 nBlock; + u16 cFree; + int i; + u16 checkSum; + u16 checkSumInv; + int errors; + int current; + + current = errors = 0; + for (i = 0; i < 2; i++) { + fatp = fat[i] = (u16*)((u8*)card->workArea + (3 + i) * CARD_SYSTEM_BLOCK_SIZE); + + __CARDCheckSum(&fatp[CARD_FAT_CHECKCODE], CARD_SYSTEM_BLOCK_SIZE - sizeof(u32), &checkSum, + &checkSumInv); + if (fatp[CARD_FAT_CHECKSUM] != checkSum || fatp[CARD_FAT_CHECKSUMINV] != checkSumInv) { + ++errors; + current = i; + card->currentFat = 0; + continue; + } + + cFree = 0; + for (nBlock = CARD_NUM_SYSTEM_BLOCK; nBlock < card->cBlock; nBlock++) { + if (fatp[nBlock] == CARD_FAT_AVAIL) { + cFree++; + } + } + if (cFree != fatp[CARD_FAT_FREEBLOCKS]) { + ++errors; + current = i; + card->currentFat = 0; + continue; + } + } + + if (0 == errors) { + if (card->currentFat == 0) { + if (((s16)fat[0][CARD_FAT_CHECKCODE] - (s16)fat[1][CARD_FAT_CHECKCODE]) < 0) { + current = 0; + } else { + current = 1; + } + card->currentFat = fat[current]; + memcpy(fat[current], fat[current ^ 1], CARD_SYSTEM_BLOCK_SIZE); + } else { + current = (card->currentFat == fat[0]) ? 0 : 1; + } + } + if (outCurrent) { + *outCurrent = current; + } + return errors; } -#pragma pop /* 803562D8-80356364 350C18 008C+00 0/0 1/1 0/0 .text __CARDVerify */ s32 __CARDVerify(CARDControl* card) { @@ -105,7 +214,6 @@ s32 __CARDVerify(CARDControl* card) { } /* 80356364-803568F4 350CA4 0590+00 1/1 0/0 0/0 .text CARDCheckExAsync */ -#ifdef NONMATCHING s32 CARDCheckExAsync(s32 chan, s32* xferBytes, CARDCallback callback) { CARDControl* card; CARDDir* dir[2]; @@ -235,16 +343,6 @@ s32 CARDCheckExAsync(s32 chan, s32* xferBytes, CARDCallback callback) { } return CARD_RESULT_READY; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 CARDCheckExAsync(s32 chan, s32* xferBytes, CARDCallback callback) { - nofralloc -#include "asm/dolphin/card/CARDCheck/CARDCheckExAsync.s" -} -#pragma pop -#endif /* 803568F4-80356948 351234 0054+00 0/0 2/2 0/0 .text CARDCheck */ s32 CARDCheck(s32 chan) { diff --git a/libs/dolphin/card/CARDDir.c b/libs/dolphin/card/CARDDir.c index adbdffaf4f..87d776574c 100644 --- a/libs/dolphin/card/CARDDir.c +++ b/libs/dolphin/card/CARDDir.c @@ -55,8 +55,6 @@ error: } /* 80355854-8035591C 350194 00C8+00 1/1 0/0 0/0 .text EraseCallback */ -// needs compiler epilogue patch -#ifdef NONMATCHING static void EraseCallback(s32 chan, s32 result) { CARDControl* card; CARDCallback callback; @@ -88,19 +86,8 @@ error: callback(chan, result); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void EraseCallback(s32 chan, s32 result) { - nofralloc -#include "asm/dolphin/card/CARDDir/EraseCallback.s" -} -#pragma pop -#endif /* 8035591C-803559E0 35025C 00C4+00 0/0 4/4 0/0 .text __CARDUpdateDir */ -#ifdef NONMATCHING s32 __CARDUpdateDir(s32 chan, CARDCallback callback) { CARDControl* card; CARDDirCheck* check; @@ -123,13 +110,3 @@ s32 __CARDUpdateDir(s32 chan, CARDCallback callback) { addr = ((u32)dir - (u32)card->workArea) / 0x2000 * card->sectorSize; return __CARDEraseSector(chan, addr, EraseCallback); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDUpdateDir(s32 chan, CARDCallback callback) { - nofralloc -#include "asm/dolphin/card/CARDDir/__CARDUpdateDir.s" -} -#pragma pop -#endif diff --git a/libs/dolphin/card/CARDFormat.c b/libs/dolphin/card/CARDFormat.c index 00d5923bfa..d633512260 100644 --- a/libs/dolphin/card/CARDFormat.c +++ b/libs/dolphin/card/CARDFormat.c @@ -9,6 +9,7 @@ #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" #include "dolphin/dvd/dvd.h" +#include "dolphin/vi/vi.h" #include "dolphin/card/CARDPriv.h" @@ -68,14 +69,82 @@ error: } /* 803575C8-80357C20 351F08 0658+00 1/1 0/0 0/0 .text __CARDFormatRegionAsync */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDFormatRegionAsync(s32 chan, u16 encode, CARDCallback callback) { - nofralloc -#include "asm/dolphin/card/CARDFormat/__CARDFormatRegionAsync.s" +s32 __CARDFormatRegionAsync(s32 chan, u16 encode, CARDCallback callback) { + CARDControl* card; + CARDID* id; + CARDDir* dir; + u16* fat; + s16 i; + s32 result; + OSSram* sram; + OSSramEx* sramEx; + u16 viDTVStatus; + OSTime time; + OSTime rand; + + result = __CARDGetControlBlock(chan, &card); + if (result < 0) { + return result; + } + + id = (CARDID*)card->workArea; + memset(id, 0xff, CARD_SYSTEM_BLOCK_SIZE); + viDTVStatus = __VIRegs[55]; + + id->encode = encode; + + sram = __OSLockSram(); + *(u32*)&id->serial[20] = sram->counterBias; + *(u32*)&id->serial[24] = sram->language; + __OSUnlockSram(FALSE); + + rand = time = OSGetTime(); + + sramEx = __OSLockSramEx(); + for (i = 0; i < 12; i++) { + rand = (rand * 1103515245 + 12345) >> 16; + id->serial[i] = (u8)(sramEx->flashID[chan][i] + rand); + rand = ((rand * 1103515245 + 12345) >> 16) & 0x7FFF; + } + __OSUnlockSramEx(FALSE); + + *(u32*)&id->serial[28] = viDTVStatus; + *(OSTime*)&id->serial[12] = time; + + id->deviceID = 0; + id->size = card->size; + __CARDCheckSum(id, sizeof(CARDID) - sizeof(u32), &id->checkSum, &id->checkSumInv); + + for (i = 0; i < 2; i++) { + CARDDirCheck* check; + + dir = (CARDDir*)((u8*)card->workArea + (1 + i) * CARD_SYSTEM_BLOCK_SIZE); + memset(dir, 0xff, CARD_SYSTEM_BLOCK_SIZE); + check = __CARDGetDirCheck(dir); + check->checkCode = i; + __CARDCheckSum(dir, CARD_SYSTEM_BLOCK_SIZE - sizeof(u32), &check->checkSum, + &check->checkSumInv); + } + for (i = 0; i < 2; i++) { + fat = (u16*)((u8*)card->workArea + (3 + i) * CARD_SYSTEM_BLOCK_SIZE); + memset(fat, 0x00, CARD_SYSTEM_BLOCK_SIZE); + fat[CARD_FAT_CHECKCODE] = (u16)i; + fat[CARD_FAT_FREEBLOCKS] = (u16)(card->cBlock - CARD_NUM_SYSTEM_BLOCK); + fat[CARD_FAT_LASTSLOT] = CARD_NUM_SYSTEM_BLOCK - 1; + __CARDCheckSum(&fat[CARD_FAT_CHECKCODE], CARD_SYSTEM_BLOCK_SIZE - sizeof(u32), + &fat[CARD_FAT_CHECKSUM], &fat[CARD_FAT_CHECKSUMINV]); + } + + card->apiCallback = callback ? callback : __CARDDefaultApiCallback; + DCStoreRange(card->workArea, CARD_WORKAREA_SIZE); + + card->formatStep = 0; + result = __CARDEraseSector(chan, (u32)card->sectorSize * card->formatStep, FormatCallback); + if (result < 0) { + __CARDPutControlBlock(card, result); + } + return result; } -#pragma pop /* 80357C20-80357C74 352560 0054+00 0/0 1/1 0/0 .text CARDFormat */ s32 CARDFormat(s32 chan) { diff --git a/libs/dolphin/card/CARDMount.c b/libs/dolphin/card/CARDMount.c index 77c0441807..cb33f9e4aa 100644 --- a/libs/dolphin/card/CARDMount.c +++ b/libs/dolphin/card/CARDMount.c @@ -146,14 +146,133 @@ static u32 LatencyTable[8] = { }; /* 80356BC8-8035701C 351508 0454+00 2/2 0/0 0/0 .text DoMount */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 DoMount(s32 chan) { - nofralloc -#include "asm/dolphin/card/CARDMount/DoMount.s" +static s32 DoMount(s32 chan) { + CARDControl* card; + u32 id; + u8 status; + s32 result; + OSSramEx* sram; + int i; + u8 checkSum; + int step; + + card = &__CARDBlock[chan]; + + if (card->mountStep == 0) { + if (EXIGetID(chan, 0, &id) == 0) { + result = CARD_RESULT_NOCARD; + } else if (IsCard(id)) { + result = CARD_RESULT_READY; + } else { + result = CARD_RESULT_WRONGDEVICE; + } + if (result < 0) { + goto error; + } + + card->cid = id; + + card->size = (u16)(id & 0xFC); + card->sectorSize = SectorSizeTable[(id & 0x00003800) >> 11]; + card->cBlock = (u16)((card->size * 1024 * 1024 / 8) / card->sectorSize); + card->latency = LatencyTable[(id & 0x00000700) >> 8]; + + result = __CARDReadVendorID(chan, &card->vendorID); + if (result < 0) { + goto error; + } + + if (CARDGetFastMode() && (card->vendorID >> 8) == 0xec) { + card->pageSize = 0x200; + } else { + card->pageSize = 0x80; + } + result = __CARDClearStatus(chan); + if (result < 0) { + goto error; + } + + result = __CARDReadStatus(chan, &status); + if (result < 0) { + goto error; + } + + if (!EXIProbe(chan)) { + result = CARD_RESULT_NOCARD; + goto error; + } + + if (!(status & 0x40)) { + result = __CARDUnlock(chan, card->id); + if (result < 0) { + goto error; + } + + checkSum = 0; + sram = __OSLockSramEx(); + for (i = 0; i < 12; i++) { + sram->flashID[chan][i] = card->id[i]; + checkSum += card->id[i]; + } + sram->flashIDCheckSum[chan] = (u8)~checkSum; + __OSUnlockSramEx(TRUE); + + return result; + } else { + card->mountStep = 1; + + checkSum = 0; + sram = __OSLockSramEx(); + for (i = 0; i < 12; i++) { + checkSum += sram->flashID[chan][i]; + } + __OSUnlockSramEx(FALSE); + if (sram->flashIDCheckSum[chan] != (u8)~checkSum) { + result = CARD_RESULT_IOERROR; + goto error; + } + } + } + + if (card->mountStep == 1) { + if (card->cid == 0x80000004) { + u16 vendorID; + + sram = __OSLockSramEx(); + vendorID = *(u16*)sram->flashID[chan]; + __OSUnlockSramEx(FALSE); + + if (__CARDVendorID == 0xffff || vendorID != __CARDVendorID) { + result = CARD_RESULT_WRONGDEVICE; + goto error; + } + } + + card->mountStep = 2; + + result = __CARDEnableInterrupt(chan, TRUE); + if (result < 0) { + goto error; + } + + EXISetExiCallback(chan, __CARDExiHandler); + EXIUnlock(chan); + DCInvalidateRange(card->workArea, CARD_WORKAREA_SIZE); + } + + step = card->mountStep - 2; + result = __CARDRead(chan, (u32)card->sectorSize * step, CARD_SYSTEM_BLOCK_SIZE, + (u8*)card->workArea + (CARD_SYSTEM_BLOCK_SIZE * step), __CARDMountCallback); + if (result < 0) { + __CARDPutControlBlock(card, result); + } + return result; + +error: + EXIUnlock(chan); + DoUnmount(chan, result); + return result; } -#pragma pop /* 8035701C-80357154 35195C 0138+00 2/2 1/1 0/0 .text __CARDMountCallback */ void __CARDMountCallback(s32 chan, s32 result) { @@ -266,7 +385,7 @@ s32 CARDMount(s32 chan, void* workArea, CARDCallback attachCb) { } /* 8035733C-803573D8 351C7C 009C+00 2/2 0/0 0/0 .text DoUnmount */ -static void DoUnmount(s32 chan, s32 result) { +static inline void DoUnmount(s32 chan, s32 result) { CARDControl* card; BOOL enabled; @@ -284,11 +403,14 @@ static void DoUnmount(s32 chan, s32 result) { } /* 803573D8-80357484 351D18 00AC+00 0/0 2/2 0/0 .text CARDUnmount */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 CARDUnmount(s32 chan) { - nofralloc -#include "asm/dolphin/card/CARDMount/CARDUnmount.s" +s32 CARDUnmount(s32 chan) { + CARDControl* card; + s32 result; + + result = __CARDGetControlBlock(chan, &card); + if (result < 0) { + return result; + } + DoUnmount(chan, CARD_RESULT_NOCARD); + return CARD_RESULT_READY; } -#pragma pop diff --git a/libs/dolphin/card/CARDNet.c b/libs/dolphin/card/CARDNet.c index 1ce5bcf2c1..087361de62 100644 --- a/libs/dolphin/card/CARDNet.c +++ b/libs/dolphin/card/CARDNet.c @@ -12,10 +12,10 @@ #include "dolphin/card/CARDPriv.h" /* 80450A70 0002+00 data_80450A70 __CARDVendorID */ -SECTION_SDATA u16 __CARDVendorID = 0xFFFF; +u16 __CARDVendorID = 0xFFFF; /* 80450A72 0006+00 data_80450A72 None */ -SECTION_SDATA u8 data_80450A72 = 0x1C; +u8 data_80450A72 = 0x1C; /* 80359158-8035921C 353A98 00C4+00 0/0 1/1 0/0 .text CARDGetSerialNo */ s32 CARDGetSerialNo(s32 chan, u64* serialNo) { diff --git a/libs/dolphin/card/CARDOpen.c b/libs/dolphin/card/CARDOpen.c index a492ad9ab2..2321c21542 100644 --- a/libs/dolphin/card/CARDOpen.c +++ b/libs/dolphin/card/CARDOpen.c @@ -41,60 +41,130 @@ BOOL __CARDCompareFileName(CARDDir* ent, const char* fileName) { } /* 80357CDC-80357D70 35261C 0094+00 2/2 0/0 0/0 .text __CARDAccess */ -#ifdef NONMATCHING s32 __CARDAccess(CARDControl* card, CARDDir* ent) { + const DVDDiskID* diskId = card->diskID; if (ent->gameName[0] == 0xFF) { return CARD_RESULT_NOFILE; } - if (card->diskID == &__CARDDiskNone || - (memcmp(ent->gameName, card->diskID->game_name, 4) == 0 && - memcmp(ent->company, card->diskID->company, 2) == 0)) { + if (diskId == &__CARDDiskNone || + (memcmp(ent->gameName, diskId->game_name, 4) == 0 && + memcmp(ent->company, diskId->company, 2) == 0)) { return CARD_RESULT_READY; } return CARD_RESULT_NOPERM; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDAccess(CARDControl* card, CARDDir* ent) { - nofralloc -#include "asm/dolphin/card/CARDOpen/__CARDAccess.s" -} -#pragma pop -#endif /* 80357D70-80357EA4 3526B0 0134+00 0/0 2/2 0/0 .text __CARDIsWritable */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDIsWritable(CARDControl* card, CARDDir* ent) { - nofralloc -#include "asm/dolphin/card/CARDOpen/__CARDIsWritable.s" +s32 __CARDIsWritable(CARDControl* card, CARDDir* ent) { + s32 retVal; + const DVDDiskID* diskId = card->diskID; + u8 val; + if ((u8)ent->gameName[0] == 0xFFu) { + retVal = CARD_RESULT_NOFILE; + } else if (diskId == &__CARDDiskNone || + (memcmp(ent->gameName, diskId->game_name, 4) == 0 && + memcmp(ent->company, diskId->company, 2) == 0)) { + retVal = CARD_RESULT_READY; + } else { + retVal = CARD_RESULT_NOPERM; + } + + if (retVal == CARD_RESULT_NOPERM) { + val = ent->permission & data_80450A72; + if (val & 0x20u && (memcmp(ent->gameName, __CARDDiskNone.game_name, 4) == 0 && + memcmp(ent->company, __CARDDiskNone.company, 2) == 0)) { + return CARD_RESULT_READY; + } else if (val & 0x40 && (memcmp(ent->gameName, __CARDDiskNone.game_name, 4) == 0 && + memcmp(ent->company, diskId->company, 2) == 0)) { + return CARD_RESULT_READY; + } + } + + return retVal; } -#pragma pop /* 80357EA4-80357F98 3527E4 00F4+00 0/0 2/2 0/0 .text __CARDIsReadable */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDIsReadable(CARDControl* card, CARDDir* ent) { - nofralloc -#include "asm/dolphin/card/CARDOpen/__CARDIsReadable.s" +s32 __CARDIsReadable(CARDControl* card, CARDDir* ent) { + u8 val; + s32 retVal; + const DVDDiskID* diskId = card->diskID; + + retVal = __CARDAccess(card, ent); + + if (retVal == CARD_RESULT_NOPERM) { + val = ent->permission & data_80450A72; + if (val & 0x20u && (memcmp(ent->gameName, __CARDDiskNone.game_name, 4) == 0 && + memcmp(ent->company, __CARDDiskNone.company, 2) == 0)) { + retVal = CARD_RESULT_READY; + } else if (val & 0x40 && (memcmp(ent->gameName, __CARDDiskNone.game_name, 4) == 0 && + memcmp(ent->company, diskId->company, 2) == 0)) { + retVal = CARD_RESULT_READY; + } + } + + if (retVal == CARD_RESULT_NOPERM && (ent->permission & 0x4)) { + return CARD_RESULT_READY; + } + + return retVal; +} + +static inline s32 __CARDGetFileNo(CARDControl* card, const char* fileName, s32* pfileNo) { + CARDDir* dir; + CARDDir* ent; + s32 fileNo; + s32 result; + + if (!card->attached) { + return CARD_RESULT_NOCARD; + } + + dir = __CARDGetDirBlock(card); + for (fileNo = 0; fileNo < CARD_MAX_FILE; fileNo++) { + ent = &dir[fileNo]; + result = __CARDAccess(card, ent); + if (result < 0) { + continue; + } + if (__CARDCompareFileName(ent, fileName)) { + *pfileNo = fileNo; + return CARD_RESULT_READY; + } + } + + return CARD_RESULT_NOFILE; } -#pragma pop /* 80357F98-803580B4 3528D8 011C+00 0/0 3/3 0/0 .text CARDOpen */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 CARDOpen(s32 chan, const char* fileName, CARDFileInfo* fileInfo) { - nofralloc -#include "asm/dolphin/card/CARDOpen/CARDOpen.s" +s32 CARDOpen(s32 chan, const char* fileName, CARDFileInfo* fileInfo) { + CARDControl* card; + CARDDir* dir; + CARDDir* ent; + s32 result; + s32 fileNo; + + fileInfo->chan = -1; + result = __CARDGetControlBlock(chan, &card); + if (result < 0) { + return result; + } + result = __CARDGetFileNo(card, fileName, &fileNo); + if (0 <= result) { + dir = __CARDGetDirBlock(card); + ent = &dir[fileNo]; + if (!CARDIsValidBlockNo(card, ent->startBlock)) { + result = CARD_RESULT_BROKEN; + } else { + fileInfo->chan = chan; + fileInfo->fileNo = fileNo; + fileInfo->offset = 0; + fileInfo->iBlock = ent->startBlock; + } + } + return __CARDPutControlBlock(card, result); } -#pragma pop /* 803580B4-80358108 3529F4 0054+00 0/0 3/3 0/0 .text CARDClose */ s32 CARDClose(CARDFileInfo* fileInfo) { diff --git a/libs/dolphin/card/CARDRdwr.c b/libs/dolphin/card/CARDRdwr.c index 6e244cdecd..6a8ca19f68 100644 --- a/libs/dolphin/card/CARDRdwr.c +++ b/libs/dolphin/card/CARDRdwr.c @@ -74,14 +74,39 @@ s32 __CARDRead(s32 chan, u32 addr, s32 length, void* dst, CARDCallback callback) } /* 803552C4-803553AC 34FC04 00E8+00 1/1 0/0 0/0 .text BlockWriteCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void BlockWriteCallback(s32 chan, s32 result) { - nofralloc -#include "asm/dolphin/card/CARDRdwr/BlockWriteCallback.s" +static void BlockWriteCallback(s32 chan, s32 result) { + CARDCallback callback; + CARDControl* card = &__CARDBlock[chan]; + + if (result < 0) { + goto error; + } + + card->xferred += card->pageSize; + + card->addr += card->pageSize; + (u8*)card->buffer += card->pageSize; + if (--card->repeat <= 0) { + goto error; + } + + result = __CARDWritePage(chan, BlockWriteCallback); + if (result < 0) { + goto error; + } + return; + +error: + if (card->apiCallback == 0) { + __CARDPutControlBlock(card, result); + } + callback = card->xferCallback; + if (callback) { + card->xferCallback = 0; + callback(chan, result); + } } -#pragma pop + /* 803553AC-80355414 34FCEC 0068+00 0/0 4/4 0/0 .text __CARDWrite */ s32 __CARDWrite(s32 chan, u32 addr, s32 length, void* dst, CARDCallback callback) { diff --git a/libs/dolphin/card/CARDRead.c b/libs/dolphin/card/CARDRead.c index f48f104f6e..4b80389295 100644 --- a/libs/dolphin/card/CARDRead.c +++ b/libs/dolphin/card/CARDRead.c @@ -120,7 +120,6 @@ error: } /* 80358788-803588CC 3530C8 0144+00 1/1 0/0 0/0 .text CARDReadAsync */ -#ifdef NONMATCHING s32 CARDReadAsync(CARDFileInfo* fileInfo, void* buf, s32 length, s32 offset, CARDCallback callback) { CARDControl* card; @@ -138,10 +137,7 @@ s32 CARDReadAsync(CARDFileInfo* fileInfo, void* buf, s32 length, s32 offset, dir = __CARDGetDirBlock(card); ent = &dir[fileInfo->fileNo]; - result = __CARDAccess(card, ent); - if (result == CARD_RESULT_NOPERM) { - result = __CARDIsWritable(ent); - } + result = __CARDIsReadable(card, ent); if (result < 0) { return __CARDPutControlBlock(card, result); @@ -159,17 +155,6 @@ s32 CARDReadAsync(CARDFileInfo* fileInfo, void* buf, s32 length, s32 offset, } return result; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 CARDReadAsync(CARDFileInfo* fileInfo, void* buf, s32 length, s32 offset, - CARDCallback callback) { - nofralloc -#include "asm/dolphin/card/CARDRead/CARDReadAsync.s" -} -#pragma pop -#endif /* 803588CC-80358914 35320C 0048+00 0/0 2/2 0/0 .text CARDRead */ s32 CARDRead(CARDFileInfo* fileInfo, void* buf, s32 length, s32 offset) { diff --git a/libs/dolphin/card/CARDStat.c b/libs/dolphin/card/CARDStat.c index 2d5531682e..965367466e 100644 --- a/libs/dolphin/card/CARDStat.c +++ b/libs/dolphin/card/CARDStat.c @@ -17,7 +17,7 @@ static void UpdateIconOffsets(CARDDir* ent, CARDStat* stat); // External References: // -SECTION_INIT void memcpy(); +void memcpy(); void __div2i(); // @@ -84,7 +84,6 @@ static void UpdateIconOffsets(CARDDir* ent, CARDStat* stat) { } /* 80358E88-80358F9C 3537C8 0114+00 0/0 2/2 0/0 .text CARDGetStatus */ -#ifdef NONMATCHING s32 CARDGetStatus(s32 chan, s32 fileNo, CARDStat* stat) { CARDControl* card; CARDDir* dir; @@ -101,10 +100,7 @@ s32 CARDGetStatus(s32 chan, s32 fileNo, CARDStat* stat) { dir = __CARDGetDirBlock(card); ent = &dir[fileNo]; - result = __CARDAccess(card, ent); - if (result == CARD_RESULT_NOPERM) { - result = __CARDIsWritable(ent); - } + result = __CARDIsReadable(card, ent); if (result >= 0) { memcpy(stat->gameName, ent->gameName, sizeof(stat->gameName)); @@ -123,19 +119,8 @@ s32 CARDGetStatus(s32 chan, s32 fileNo, CARDStat* stat) { } return __CARDPutControlBlock(card, result); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 CARDGetStatus(s32 chan, s32 fileNo, CARDStat* stat) { - nofralloc -#include "asm/dolphin/card/CARDStat/CARDGetStatus.s" -} -#pragma pop -#endif /* 80358F9C-80359110 3538DC 0174+00 1/1 0/0 0/0 .text CARDSetStatusAsync */ -#ifdef NONMATCHING s32 CARDSetStatusAsync(s32 chan, s32 fileNo, CARDStat* stat, CARDCallback callback) { CARDControl* card; CARDDir* dir; @@ -155,7 +140,7 @@ s32 CARDSetStatusAsync(s32 chan, s32 fileNo, CARDStat* stat, CARDCallback callba dir = __CARDGetDirBlock(card); ent = &dir[fileNo]; - result = __CARDAccess(card, ent); + result = __CARDIsWritable(card, ent); if (result < 0) { return __CARDPutControlBlock(card, result); } @@ -178,16 +163,6 @@ s32 CARDSetStatusAsync(s32 chan, s32 fileNo, CARDStat* stat, CARDCallback callba } return result; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 CARDSetStatusAsync(s32 chan, s32 fileNo, CARDStat* stat, CARDCallback callback) { - nofralloc -#include "asm/dolphin/card/CARDStat/CARDSetStatusAsync.s" -} -#pragma pop -#endif /* 80359110-80359158 353A50 0048+00 0/0 1/1 0/0 .text CARDSetStatus */ s32 CARDSetStatus(s32 chan, s32 fileNo, CARDStat* stat) { diff --git a/libs/dolphin/card/CARDUnlock.c b/libs/dolphin/card/CARDUnlock.c index 20b38c35f8..5a541a4f9b 100644 --- a/libs/dolphin/card/CARDUnlock.c +++ b/libs/dolphin/card/CARDUnlock.c @@ -26,7 +26,7 @@ static void DoneCallback(void* _task); // External References: // -SECTION_INIT void memset(); +void memset(); void DSPAddTask(); void DSPSendMailToDSP(); @@ -100,15 +100,47 @@ static s32 ReadArrayUnlock(s32 chan, u32 data, void* rbuf, s32 rlen, s32 mode) { /* 80450A68-80450A70 0004E8 0004+04 2/2 0/0 0/0 .sdata next */ static unsigned long int next = 1; -/* 803541D4-80354298 34EB14 00C4+00 2/2 0/0 0/0 .text DummyLen */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 DummyLen(void) { - nofralloc -#include "asm/dolphin/card/CARDUnlock/DummyLen.s" +static inline int CARDRand(void) { + next = next * 1103515245 + 12345; + return (int)((unsigned int)(next / 65536) % 32768); +} + +static inline void CARDSrand(unsigned int seed) { next = seed; } + +/* 803541D4-80354298 34EB14 00C4+00 2/2 0/0 0/0 .text DummyLen */ +static s32 DummyLen(void) { + u32 tick; + u32 wk; + s32 tmp; + u32 max; + + wk = 1; + max = 0; + tick = OSGetTick(); + CARDSrand(tick); + + tmp = CARDRand(); + tmp &= 0x0000001f; + tmp += 1; + while ((tmp < 4) && (max < 10)) { + tick = OSGetTick(); + tmp = (s32)(tick << wk); + wk++; + if (wk > 16) { + wk = 1; + } + CARDSrand((u32)tmp); + tmp = CARDRand(); + tmp &= 0x0000001f; + tmp += 1; + max++; + } + if (tmp < 4) { + tmp = 4; + } + + return tmp; } -#pragma pop /* ############################################################################################## */ /* 803D1EA0-803D2000 02EFC0 0160+00 1/1 0/0 0/0 .data CardData */ @@ -137,32 +169,263 @@ SECTION_DATA static u8 CardData[352] ALIGN_DECL(32) = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 80354298-80354DF0 34EBD8 0B58+00 0/0 1/1 0/0 .text __CARDUnlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 __CARDUnlock(s32 chan, u8 flashID[12]) { - nofralloc -#include "asm/dolphin/card/CARDUnlock/__CARDUnlock.s" +typedef struct DecodeParameters { + u8* inputAddr; + u32 inputLength; + u32 aramAddr; + u8* outputAddr; +} DecodeParameters; + +static inline u32 GetInitVal(void) { + u32 tmp; + u32 tick; + + tick = OSGetTick(); + CARDSrand(tick); + tmp = 0x7fec8000; + tmp |= CARDRand(); + tmp &= 0xfffff000; + return tmp; +} + +static inline u32 exnor_1st(u32 data, u32 rshift) { + u32 wk; + u32 w; + u32 i; + + w = data; + for (i = 0; i < rshift; i++) { + wk = ~(w ^ (w >> 7) ^ (w >> 15) ^ (w >> 23)); + w = (w >> 1) | ((wk << 30) & 0x40000000); + } + return w; +} + +static inline u32 exnor(u32 data, u32 lshift) { + u32 wk; + u32 w; + u32 i; + + w = data; + for (i = 0; i < lshift; i++) { + // 1bit Left Shift + wk = ~(w ^ (w << 7) ^ (w << 15) ^ (w << 23)); + w = (w << 1) | ((wk >> 30) & 0x00000002); + // printf("i=%d, w=%8x\n", i, w); + } + return w; +} + +/* 80354298-80354DF0 34EBD8 0B58+00 0/0 1/1 0/0 .text __CARDUnlock */ +s32 __CARDUnlock(s32 chan, u8 flashID[12]) { + u32 init_val; + u32 data; + + s32 dummy; + s32 rlen; + u32 rshift; + + u8 fsts; + u32 wk, wk1; + u32 Ans1 = 0; + u32 Ans2 = 0; + u32* dp; + u8 rbuf[64]; + u32 para1A = 0; + u32 para1B = 0; + u32 para2A = 0; + u32 para2B = 0; + + CARDControl* card; + DSPTaskInfo* task; + DecodeParameters* param; + u8* input; + u8* output; + + card = &__CARDBlock[chan]; + task = &card->task; + param = (DecodeParameters*)card->workArea; + input = (u8*)((u8*)param + sizeof(DecodeParameters)); + input = (u8*)OSRoundUp32B(input); + output = input + 32; + + fsts = 0; + init_val = GetInitVal(); + + dummy = DummyLen(); + rlen = dummy; + if (ReadArrayUnlock(chan, init_val, rbuf, rlen, 0) < 0) { + return CARD_RESULT_NOCARD; + } + + rshift = (u32)(dummy * 8 + 1); + wk = exnor_1st(init_val, rshift); + wk1 = ~(wk ^ (wk >> 7) ^ (wk >> 15) ^ (wk >> 23)); + card->scramble = (wk | ((wk1 << 31) & 0x80000000)); + card->scramble = bitrev(card->scramble); + dummy = DummyLen(); + rlen = 20 + dummy; + data = 0; + if (ReadArrayUnlock(chan, data, rbuf, rlen, 1) < 0) { + return CARD_RESULT_NOCARD; + } + dp = (u32*)rbuf; + para1A = *dp++; + para1B = *dp++; + Ans1 = *dp++; + para2A = *dp++; + para2B = *dp++; + para1A = (para1A ^ card->scramble); + rshift = 32; + wk = exnor(card->scramble, rshift); + wk1 = ~(wk ^ (wk << 7) ^ (wk << 15) ^ (wk << 23)); + card->scramble = (wk | ((wk1 >> 31) & 0x00000001)); + para1B = (para1B ^ card->scramble); + rshift = 32; + wk = exnor(card->scramble, rshift); + wk1 = ~(wk ^ (wk << 7) ^ (wk << 15) ^ (wk << 23)); + card->scramble = (wk | ((wk1 >> 31) & 0x00000001)); + Ans1 ^= card->scramble; + rshift = 32; + wk = exnor(card->scramble, rshift); + wk1 = ~(wk ^ (wk << 7) ^ (wk << 15) ^ (wk << 23)); + card->scramble = (wk | ((wk1 >> 31) & 0x00000001)); + para2A = (para2A ^ card->scramble); + rshift = 32; + wk = exnor(card->scramble, rshift); + wk1 = ~(wk ^ (wk << 7) ^ (wk << 15) ^ (wk << 23)); + card->scramble = (wk | ((wk1 >> 31) & 0x00000001)); + para2B = (para2B ^ card->scramble); + rshift = (u32)(dummy * 8); + wk = exnor(card->scramble, rshift); + wk1 = ~(wk ^ (wk << 7) ^ (wk << 15) ^ (wk << 23)); + card->scramble = (wk | ((wk1 >> 31) & 0x00000001)); + rshift = 32 + 1; + wk = exnor(card->scramble, rshift); + wk1 = ~(wk ^ (wk << 7) ^ (wk << 15) ^ (wk << 23)); + card->scramble = (wk | ((wk1 >> 31) & 0x00000001)); + + *(u32*)&input[0] = para2A; + *(u32*)&input[4] = para2B; + + param->inputAddr = input; + param->inputLength = 8; + param->outputAddr = output; + param->aramAddr = 0; + + DCFlushRange(input, 8); + DCInvalidateRange(output, 4); + DCFlushRange(param, sizeof(DecodeParameters)); + + task->priority = 255; + task->iram_mmem_addr = (u16*)OSPhysicalToCached(CardData); + task->iram_length = 0x160; + task->iram_addr = 0; + task->dsp_init_vector = 0x10; + task->init_cb = InitCallback; + task->res_cb = NULL; + task->done_cb = DoneCallback; + task->req_cb = NULL; + DSPAddTask(task); + + dp = (u32*)flashID; + *dp++ = para1A; + *dp++ = para1B; + *dp = Ans1; + + return CARD_RESULT_READY; } -#pragma pop /* 80354DF0-80354E60 34F730 0070+00 1/1 0/0 0/0 .text InitCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void InitCallback(void* _task) { - nofralloc -#include "asm/dolphin/card/CARDUnlock/InitCallback.s" +static void InitCallback(void* _task) { + s32 chan; + CARDControl* card; + DSPTaskInfo* task; + DecodeParameters* param; + + task = _task; + for (chan = 0; chan < 2; ++chan) { + card = &__CARDBlock[chan]; + if ((DSPTaskInfo*)&card->task == task) { + break; + } + } + param = (DecodeParameters*)card->workArea; + + DSPSendMailToDSP(0xff000000); + while (DSPCheckMailToDSP()) + ; + + DSPSendMailToDSP((u32)param); + while (DSPCheckMailToDSP()) + ; } -#pragma pop /* 80354E60-80355184 34F7A0 0324+00 1/1 0/0 0/0 .text DoneCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void DoneCallback(void* _task) { - nofralloc -#include "asm/dolphin/card/CARDUnlock/DoneCallback.s" -} -#pragma pop +static void DoneCallback(void* _task) { + u8 rbuf[64]; + u32 data; + s32 dummy; + s32 rlen; + u32 rshift; + + u8 unk; + u32 wk, wk1; + u32 Ans2; + + s32 chan; + CARDControl* card; + s32 result; + DSPTaskInfo* task; + DecodeParameters* param; + + u8* input; + u8* output; + task = _task; + for (chan = 0; chan < 2; ++chan) { + card = &__CARDBlock[chan]; + if ((DSPTaskInfo*)&card->task == task) { + break; + } + } + + param = (DecodeParameters*)card->workArea; + input = (u8*)((u8*)param + sizeof(DecodeParameters)); + input = (u8*)OSRoundUp32B(input); + output = input + 32; + + Ans2 = *(u32*)output; + dummy = DummyLen(); + rlen = dummy; + data = ((Ans2 ^ card->scramble) & 0xffff0000); + if (ReadArrayUnlock(chan, data, rbuf, rlen, 1) < 0) { + EXIUnlock(chan); + __CARDMountCallback(chan, CARD_RESULT_NOCARD); + return; + } + + rshift = (u32)((dummy + 4 + card->latency) * 8 + 1); + wk = exnor(card->scramble, rshift); + wk1 = ~(wk ^ (wk << 7) ^ (wk << 15) ^ (wk << 23)); + card->scramble = (wk | ((wk1 >> 31) & 0x00000001)); + + dummy = DummyLen(); + rlen = dummy; + data = (((Ans2 << 16) ^ card->scramble) & 0xffff0000); + if (ReadArrayUnlock(chan, data, rbuf, rlen, 1) < 0) { + EXIUnlock(chan); + __CARDMountCallback(chan, CARD_RESULT_NOCARD); + return; + } + result = __CARDReadStatus(chan, &unk); + if (!EXIProbe(chan)) { + EXIUnlock(chan); + __CARDMountCallback(chan, CARD_RESULT_NOCARD); + return; + } + if (result == CARD_RESULT_READY && !(unk & 0x40)) { + EXIUnlock(chan); + result = CARD_RESULT_IOERROR; + } + __CARDMountCallback(chan, result); +} \ No newline at end of file diff --git a/libs/dolphin/card/CARDWrite.c b/libs/dolphin/card/CARDWrite.c index a020c7c209..d3f3cd0cb9 100644 --- a/libs/dolphin/card/CARDWrite.c +++ b/libs/dolphin/card/CARDWrite.c @@ -29,24 +29,81 @@ void __div2i(); // /* 80358914-80358A84 353254 0170+00 1/1 0/0 0/0 .text WriteCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void WriteCallback(s32 chan, s32 result) { - nofralloc -#include "asm/dolphin/card/CARDWrite/WriteCallback.s" +static void WriteCallback(s32 chan, s32 result) { + CARDControl* card; + CARDCallback callback; + u16* fat; + CARDDir* dir; + CARDDir* ent; + CARDFileInfo* fileInfo; + + card = &__CARDBlock[chan]; + if (result < 0) { + goto error; + } + + fileInfo = card->fileInfo; + if (fileInfo->length < 0) { + result = CARD_RESULT_CANCELED; + goto error; + } + + fileInfo->length -= card->sectorSize; + if (fileInfo->length <= 0) { + dir = __CARDGetDirBlock(card); + ent = &dir[fileInfo->fileNo]; + ent->time = (u32)OSTicksToSeconds(OSGetTime()); + callback = card->apiCallback; + card->apiCallback = 0; + result = __CARDUpdateDir(chan, callback); + } else { + fat = __CARDGetFatBlock(card); + fileInfo->offset += card->sectorSize; + fileInfo->iBlock = fat[fileInfo->iBlock]; + if (!CARDIsValidBlockNo(card, fileInfo->iBlock)) { + result = CARD_RESULT_BROKEN; + goto error; + } + result = __CARDEraseSector(chan, card->sectorSize * (u32)fileInfo->iBlock, EraseCallback); + } + + if (result < 0) { + goto error; + } + return; + +error: + callback = card->apiCallback; + card->apiCallback = 0; + __CARDPutControlBlock(card, result); + callback(chan, result); } -#pragma pop /* 80358A84-80358B34 3533C4 00B0+00 2/2 0/0 0/0 .text EraseCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void EraseCallback(s32 chan, s32 result) { - nofralloc -#include "asm/dolphin/card/CARDWrite/EraseCallback.s" +static void EraseCallback(s32 chan, s32 result) { + CARDControl* card; + CARDCallback callback; + CARDFileInfo* fileInfo; + + card = &__CARDBlock[chan]; + if (result < 0) { + goto error; + } + + fileInfo = card->fileInfo; + result = __CARDWrite(chan, card->sectorSize * (u32)fileInfo->iBlock, card->sectorSize, + card->buffer, WriteCallback); + if (result < 0) { + goto error; + } + return; + +error: + callback = card->apiCallback; + card->apiCallback = 0; + __CARDPutControlBlock(card, result); + callback(chan, result); } -#pragma pop /* 80358B34-80358C48 353474 0114+00 1/1 0/0 0/0 .text CARDWriteAsync */ s32 CARDWriteAsync(CARDFileInfo* fileInfo, const void* buf, s32 length, s32 offset, diff --git a/libs/dolphin/card/Makefile b/libs/dolphin/card/Makefile index ac749c4cf5..a896a9991d 100644 --- a/libs/dolphin/card/Makefile +++ b/libs/dolphin/card/Makefile @@ -34,12 +34,15 @@ LIBCARD_A_O_FILES := \ $(BUILD_DIR)/libs/dolphin/card/CARDStat.o \ $(BUILD_DIR)/libs/dolphin/card/CARDNet.o \ -LIBCARD_A_CFLAGS := \ +NO_INLINE_FILES = libs/dolphin/card/CARDOpen.c + +LIBCARD_A_CFLAGS = \ -Cpp_exceptions off \ -proc gekko \ -fp hard \ -nodefaults \ -str reuse \ + $(if $(filter $(NO_INLINE_FILES), $<),,-inline auto) \ -RTTI off \ -maxerrors 5 \ -enum int $(INCLUDES) \ @@ -61,10 +64,11 @@ $(BUILD_DIR)/libs/dolphin/card/%.o: libs/dolphin/card/%.c $(BUILD_DIR)/libs/dolp @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBCARD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(FRANK_CC) $(LIBCARD_A_CFLAGS) -c -o $(@:.o=.po) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBCARD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ - @$(PYTHON) $(FRANK) $@ $@ $@ + @$(PYTHON) $(FRANK) $@ $(@:.o=.po) $@ ifndef DISABLE_DEPS LIBCARD_A_D_FILES := $(LIBCARD_A_O_FILES:.o=.d) diff --git a/libs/dolphin/db/Makefile b/libs/dolphin/db/Makefile index 3ad6bd440d..6f5fe8d6b8 100644 --- a/libs/dolphin/db/Makefile +++ b/libs/dolphin/db/Makefile @@ -35,7 +35,7 @@ $(BUILD_DIR)/libs/dolphin/db/%.o: libs/dolphin/db/%.c $(BUILD_DIR)/libs/dolphin/ @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBDB_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBDB_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/libs/dolphin/dsp/Makefile b/libs/dolphin/dsp/Makefile index 4987d752e5..b670c347f7 100644 --- a/libs/dolphin/dsp/Makefile +++ b/libs/dolphin/dsp/Makefile @@ -39,7 +39,7 @@ $(BUILD_DIR)/libs/dolphin/dsp/%.o: libs/dolphin/dsp/%.c $(BUILD_DIR)/libs/dolphi @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBDSP_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBDSP_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/libs/dolphin/dvd/Makefile b/libs/dolphin/dvd/Makefile index da1943fdb2..ad08643a4c 100644 --- a/libs/dolphin/dvd/Makefile +++ b/libs/dolphin/dvd/Makefile @@ -28,6 +28,7 @@ LIBDVD_A_CFLAGS := \ -fp hard \ -nodefaults \ -str reuse \ + -inline auto \ -RTTI off \ -maxerrors 5 \ -enum int $(INCLUDES) \ @@ -49,10 +50,11 @@ $(BUILD_DIR)/libs/dolphin/dvd/%.o: libs/dolphin/dvd/%.c $(BUILD_DIR)/libs/dolphi @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBDVD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(FRANK_CC) $(LIBDVD_A_CFLAGS) -c -o $(@:.o=.po) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBDVD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ - @$(PYTHON) $(FRANK) $@ $@ $@ + @$(PYTHON) $(FRANK) $@ $(@:.o=.po) $@ ifndef DISABLE_DEPS LIBDVD_A_D_FILES := $(LIBDVD_A_O_FILES:.o=.d) diff --git a/libs/dolphin/dvd/dvd.c b/libs/dolphin/dvd/dvd.c index ee2f9879ad..c3b4720d5a 100644 --- a/libs/dolphin/dvd/dvd.c +++ b/libs/dolphin/dvd/dvd.c @@ -4,6 +4,7 @@ // #include "dolphin/dvd/dvd.h" +#include "dolphin/dvd/dvdlow.h" #include "MSL_C/MSL_Common/Src/mem.h" #include "MSL_C/MSL_Common/Src/string.h" #include "dol2asm.h" @@ -64,7 +65,7 @@ void DVDLowRequestAudioStatus(); void DVDLowAudioBufferConfig(); void DVDLowReset(); void DVDLowBreak(); -void DVDLowClearCallback(); +DVDLowCallback DVDLowClearCallback(); BOOL __DVDLowTestAlarm(OSAlarm* alarm); void __DVDFSInit(); void __DVDClearWaitingQueue(); @@ -86,7 +87,7 @@ extern OSThreadQueue __DVDThreadQueue; static void defaultOptionalCommandChecker() {} /* 804509E8-804509EC -00001 0004+00 1/1 0/0 0/0 .sdata __DVDVersion */ -SECTION_SDATA static char* __DVDVersion = "<< Dolphin SDK - DVD\trelease build: Apr 5 2004 04:14:51 (0x2301) >>"; +static char* __DVDVersion = "<< Dolphin SDK - DVD\trelease build: Apr 5 2004 04:14:51 (0x2301) >>"; /* 80451778-8045177C 000C78 0004+00 24/24 0/0 0/0 .sbss executing */ static DVDCommandBlock* executing; @@ -173,34 +174,33 @@ void DVDInit(void) { } /* ############################################################################################## */ -/* 803D1574-803D15A8 02E694 0034+00 2/2 0/0 0/0 .data @24 */ -SECTION_DATA static char lit_24[] = "DVDChangeDisk(): FST in the new disc is too big. "; /* 8044C900-8044C920 079620 0020+00 8/8 0/0 0/0 .bss BB2 */ static DVDBB2 BB2 ALIGN_DECL(32); /* 804509EC-804509F0 00046C 0004+00 6/6 0/0 0/0 .sdata autoInvalidation */ -SECTION_SDATA static u32 autoInvalidation = 0x00000001; +static BOOL autoInvalidation = TRUE; /* 804509F0-804509F4 -00001 0004+00 1/1 0/0 0/0 .sdata checkOptionalCommand */ -SECTION_SDATA static DVDOptionalCommandChecker checkOptionalCommand = defaultOptionalCommandChecker; +static DVDOptionalCommandChecker checkOptionalCommand = defaultOptionalCommandChecker; /* 804509F4-804509FC 000474 0006+02 2/2 0/0 0/0 .sdata @23 */ -SECTION_SDATA static char lit_23[] = "dvd.c"; typedef void (*stateFunc)(DVDCommandBlock* block); -/* 804517C0-804517C8 000CC0 0004+04 6/6 0/0 0/0 .sbss LastState */ +/* 804517C0-804517C8 000CC0 0004+04 6/6 0/0 0/0 .sbss "dvd.c" LastState */ static stateFunc LastState; /* 803491C8-8034925C 343B08 0094+00 1/1 0/0 0/0 .text stateReadingFST */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void stateReadingFST(void) { - nofralloc -#include "asm/dolphin/dvd/dvd/stateReadingFST.s" +void stateReadingFST() { + LastState = (stateFunc)stateReadingFST; + + if (bootInfo->fst_max_length < BB2.FSTLength) { + OSPanic("dvd.c", 661, "DVDChangeDisk(): FST in the new disc is too big. "); + } + + DVDLowRead(bootInfo->fst_location, OSRoundUp32B(BB2.FSTLength), BB2.FSTPosition, + cbForStateReadingFST); } -#pragma pop /* ############################################################################################## */ /* 8044C920-8044C940 079640 0020+00 2/3 0/0 0/0 .bss CurrDiskID */ @@ -235,6 +235,11 @@ static void cbForStateReadingFST(u32 intType) { } } +inline static void stateError(u32 error) { + __DVDStoreErrorCode(error); + DVDLowStopMotor(cbForStateError); +} + /* 803492DC-80349388 343C1C 00AC+00 12/12 0/0 0/0 .text cbForStateError */ static void cbForStateError(u32 intType) { DVDCommandBlock* finished; @@ -264,7 +269,7 @@ static void cbForStateError(u32 intType) { } /* 80349388-803493BC 343CC8 0034+00 2/2 0/0 0/0 .text stateTimeout */ -static void stateTimeout(void) { +static inline void stateTimeout(void) { __DVDStoreErrorCode(0x1234568); DVDReset(); cbForStateError(0); @@ -344,8 +349,7 @@ static void cbForStateGettingError(u32 intType) { } if (intType & 2) { - __DVDStoreErrorCode(0x1234567); - DVDLowStopMotor(cbForStateError); + stateError(0x1234567); return; } @@ -355,8 +359,7 @@ static void cbForStateGettingError(u32 intType) { errorCategory = CategorizeError(error); if (errorCategory == 1) { - __DVDStoreErrorCode(error); - DVDLowStopMotor(cbForStateError); + stateError(error); return; } @@ -404,8 +407,7 @@ static void cbForStateGettingError(u32 intType) { stateMotorStopped(); return; } else { - __DVDStoreErrorCode(0x1234567); - DVDLowStopMotor(cbForStateError); + stateError(0x1234567); return; } } @@ -437,13 +439,11 @@ static void cbForUnrecoveredErrorRetry(u32 intType) { } if (intType & 2) { - __DVDStoreErrorCode(0x1234567); - DVDLowStopMotor(cbForStateError); + stateError(0x1234567); return; } - __DVDStoreErrorCode(__DIRegs[8]); - DVDLowStopMotor(cbForStateError); + stateError(__DIRegs[8]); } /* 803497D8-80349800 344118 0028+00 2/2 0/0 0/0 .text stateGoToRetry */ @@ -461,8 +461,7 @@ static void cbForStateGoToRetry(u32 intType) { } if (intType & 2) { - __DVDStoreErrorCode(0x1234567); - DVDLowStopMotor(cbForStateError); + stateError(0x1234567); return; } @@ -549,8 +548,7 @@ static void cbForStateCheckID1(u32 intType) { } if (intType & 2) { - __DVDStoreErrorCode(0x1234567); - DVDLowStopMotor(cbForStateError); + stateError(0x1234567); return; } @@ -563,14 +561,29 @@ static void cbForStateCheckID1(u32 intType) { } /* 80349C24-80349CFC 344564 00D8+00 1/1 0/0 0/0 .text cbForStateCheckID2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void cbForStateCheckID2(u32 intType) { - nofralloc -#include "asm/dolphin/dvd/dvd/cbForStateCheckID2.s" + +static void cbForStateCheckID2(u32 intType) { + if (intType == 16) { + stateTimeout(); + return; + } + + if (intType & 1) { + NumInternalRetry = 0; + + LastState = (stateFunc)stateReadingFST; + + if (bootInfo->fst_max_length < BB2.FSTLength) { + OSPanic("dvd.c", 661, "DVDChangeDisk(): FST in the new disc is too big. "); + } + + DVDLowRead(bootInfo->fst_location, OSRoundUp32B(BB2.FSTLength), BB2.FSTPosition, + cbForStateReadingFST); + + } else { + stateGettingError(); + } } -#pragma pop /* 80349CFC-80349DEC 34463C 00F0+00 1/1 0/0 0/0 .text cbForStateCheckID3 */ static void cbForStateCheckID3(u32 intType) { @@ -655,7 +668,7 @@ static void cbForStateCoverClosed(u32 intType) { } /* 80349F98-80349FC0 3448D8 0028+00 3/3 0/0 0/0 .text stateMotorStopped */ -static void stateMotorStopped(void) { +static inline void stateMotorStopped(void) { DVDLowWaitCoverClose(cbForStateMotorStopped); } @@ -667,7 +680,6 @@ static void cbForStateMotorStopped(u32 intType) { } /* 8034A0AC-8034A394 3449EC 02E8+00 18/18 0/0 0/0 .text stateReady */ -#ifdef NONMATCHING static void stateReady() { DVDCommandBlock* finished; @@ -699,51 +711,38 @@ static void stateReady() { if (ResumeFromHere) { switch (ResumeFromHere) { - case 1: - executing->state = 1; - stateCoverClosed(); - break; case 2: executing->state = 11; stateMotorStopped(); break; - case 3: executing->state = 4; stateMotorStopped(); break; - case 4: executing->state = 5; stateMotorStopped(); break; case 7: case 6: + case 1: executing->state = 3; stateCoverClosed(); break; - case 5: - executing->state = -1; + stateError(CancelLastError); break; } - ResumeFromHere = 0; } else { - executing->state = 1; - stateBusy(executing); + if (MotorState == 0) { + executing->state = 1; + stateBusy(executing); + } else { + stateCoverClosed(); + } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void stateReady(void) { - nofralloc -#include "asm/dolphin/dvd/dvd/stateReady.s" -} -#pragma pop -#endif /* 8034A394-8034A6D4 344CD4 0340+00 4/3 0/0 0/0 .text stateBusy */ #define MIN(a, b) (((a) > (b)) ? (b) : (a)) @@ -844,15 +843,193 @@ static u32 ImmCommand[] = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}; /* 804509FC-80450A00 00047C 0004+00 1/1 0/0 0/0 .sdata DmaCommand */ SECTION_SDATA static u32 DmaCommand[] = {0xFFFFFFFF}; -/* 8034A6D4-8034AD2C 345014 0658+00 1/1 0/0 0/0 .text cbForStateBusy */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void cbForStateBusy(u32 intType) { - nofralloc -#include "asm/dolphin/dvd/dvd/cbForStateBusy.s" +inline static BOOL IsImmCommandWithResult(u32 command) { + u32 i; + + if (command == 9 || command == 10 || command == 11 || command == 12) { + return TRUE; + } + + for (i = 0; i < sizeof(ImmCommand) / sizeof(ImmCommand[0]); i++) { + if (command == ImmCommand[i]) + return TRUE; + } + + return FALSE; +} + +inline static BOOL IsDmaCommand(u32 command) { + u32 i; + + if (command == 1 || command == 4 || command == 5 || command == 14) + return TRUE; + + for (i = 0; i < sizeof(DmaCommand) / sizeof(DmaCommand[0]); i++) { + if (command == DmaCommand[i]) + return TRUE; + } + + return FALSE; +} + +/* 8034A6D4-8034AD2C 345014 0658+00 1/1 0/0 0/0 .text cbForStateBusy */ +static void cbForStateBusy(u32 intType) { + DVDCommandBlock* finished; + + if (intType == 16) { + stateTimeout(); + return; + } + + if ((CurrCommand == 3) || (CurrCommand == 15)) { + if (intType & 2) { + stateError(0x1234567); + return; + } + + NumInternalRetry = 0; + + if (CurrCommand == 15) { + ResetRequired = TRUE; + } + + if (CheckCancel(7)) { + return; + } + + executing->state = 7; + stateMotorStopped(); + return; + } + + if (IsDmaCommand(CurrCommand)) { + executing->transferred_size += executing->current_transfer_size - __DIRegs[6]; + } + + if (intType & 8) { + Canceling = FALSE; + finished = executing; + executing = &DummyCommandBlock; + + finished->state = 10; + if (finished->callback) + (*finished->callback)(-3, finished); + if (CancelCallback) + (CancelCallback)(0, finished); + stateReady(); + + return; + } + + if (intType & 1) { + NumInternalRetry = 0; + + if (CurrCommand == 16) { + MotorState = 1; + finished = executing; + executing = &DummyCommandBlock; + finished->state = 0; + if (finished->callback) { + (*finished->callback)(0, finished); + } + stateReady(); + return; + } + + if (CheckCancel(0)) + return; + + if (IsDmaCommand(CurrCommand)) { + if (executing->transferred_size != executing->length) { + stateBusy(executing); + return; + } + + finished = executing; + executing = &DummyCommandBlock; + + finished->state = 0; + if (finished->callback) { + (finished->callback)((s32)finished->transferred_size, finished); + } + stateReady(); + } else if (IsImmCommandWithResult(CurrCommand)) { + s32 result; + + if ((CurrCommand == 11) || (CurrCommand == 10)) { + result = (s32)(__DIRegs[8] << 2); + } else { + result = (s32)__DIRegs[8]; + } + finished = executing; + executing = &DummyCommandBlock; + + finished->state = 0; + if (finished->callback) { + (finished->callback)(result, finished); + } + stateReady(); + } else if (CurrCommand == 6) { + if (executing->current_transfer_size == 0) { + if (__DIRegs[8] & 1) { + finished = executing; + executing = &DummyCommandBlock; + + finished->state = 9; + if (finished->callback) { + (finished->callback)(-2, finished); + } + stateReady(); + } else { + AutoFinishing = FALSE; + executing->current_transfer_size = 1; + DVDLowAudioStream(0, executing->length, executing->offset, cbForStateBusy); + } + } else { + finished = executing; + executing = &DummyCommandBlock; + + finished->state = 0; + if (finished->callback) { + (finished->callback)(0, finished); + } + stateReady(); + } + } else { + finished = executing; + executing = &DummyCommandBlock; + + finished->state = 0; + if (finished->callback) { + (finished->callback)(0, finished); + } + stateReady(); + } + } else { + if (CurrCommand == 14) { + stateError(0x01234567); + return; + } + + if ((CurrCommand == 1 || CurrCommand == 4 || CurrCommand == 5 || CurrCommand == 14) && + (executing->transferred_size == executing->length)) { + if (CheckCancel(0)) { + return; + } + finished = executing; + executing = &DummyCommandBlock; + + finished->state = 0; + if (finished->callback) { + (finished->callback)((s32)finished->transferred_size, finished); + } + stateReady(); + return; + } + + stateGettingError(); + } } -#pragma pop static inline BOOL issueCommand(s32 prio, DVDCommandBlock* block) { BOOL level; @@ -878,7 +1055,6 @@ static inline BOOL issueCommand(s32 prio, DVDCommandBlock* block) { } /* 8034AD2C-8034AE08 34566C 00DC+00 0/0 5/5 0/0 .text DVDReadAbsAsyncPrio */ -#ifdef NONMATCHING BOOL DVDReadAbsAsyncPrio(DVDCommandBlock* block, void* addr, s32 length, s32 offset, DVDCBCallback callback, s32 prio) { BOOL idle; @@ -892,58 +1068,59 @@ BOOL DVDReadAbsAsyncPrio(DVDCommandBlock* block, void* addr, s32 length, s32 off idle = issueCommand(prio, block); return idle; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL DVDReadAbsAsyncPrio(DVDCommandBlock* block, void* addr, s32 length, s32 offset, - DVDCBCallback callback, s32 prio) { - nofralloc -#include "asm/dolphin/dvd/dvd/DVDReadAbsAsyncPrio.s" -} -#pragma pop -#endif /* 8034AE08-8034AED8 345748 00D0+00 0/0 1/1 0/0 .text DVDReadAbsAsyncForBS */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL DVDReadAbsAsyncForBS(DVDCommandBlock* block, void* addr, s32 length, s32 offset, - DVDCBCallback callback) { - nofralloc -#include "asm/dolphin/dvd/dvd/DVDReadAbsAsyncForBS.s" +BOOL DVDReadAbsAsyncForBS(DVDCommandBlock* block, void* addr, s32 length, s32 offset, + DVDCBCallback callback) { + BOOL idle; + block->command = 4; + block->buffer = addr; + block->length = length; + block->offset = offset; + block->transferred_size = 0; + block->callback = callback; + + idle = issueCommand(2, block); + return idle; } -#pragma pop /* 8034AED8-8034AFAC 345818 00D4+00 0/0 2/2 0/0 .text DVDReadDiskID */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL DVDReadDiskID(DVDCommandBlock* block, DVDDiskID* diskID, DVDCBCallback callback) { - nofralloc -#include "asm/dolphin/dvd/dvd/DVDReadDiskID.s" +BOOL DVDReadDiskID(DVDCommandBlock* block, DVDDiskID* diskID, DVDCBCallback callback) { + BOOL idle; + block->command = 5; + block->buffer = diskID; + block->length = sizeof(DVDDiskID); + block->offset = 0; + block->transferred_size = 0; + block->callback = callback; + + idle = issueCommand(2, block); + return idle; } -#pragma pop /* 8034AFAC-8034B068 3458EC 00BC+00 0/0 1/1 0/0 .text DVDCancelStreamAsync */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL DVDCancelStreamAsync(DVDCommandBlock* block, DVDCBCallback callback) { - nofralloc -#include "asm/dolphin/dvd/dvd/DVDCancelStreamAsync.s" +BOOL DVDCancelStreamAsync(DVDCommandBlock* block, DVDCBCallback callback) { + BOOL idle; + block->command = 7; + block->callback = callback; + idle = issueCommand(1, block); + return idle; } -#pragma pop /* 8034B068-8034B138 3459A8 00D0+00 0/0 1/1 0/0 .text DVDInquiryAsync */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL DVDInquiryAsync(DVDCommandBlock* block, DVDDriveInfo* info, DVDCBCallback callback) { - nofralloc -#include "asm/dolphin/dvd/dvd/DVDInquiryAsync.s" +BOOL DVDInquiryAsync(DVDCommandBlock* block, DVDDriveInfo* info, DVDCBCallback callback) { + BOOL idle; + + block->command = 14; + block->buffer = (void*)info; + block->length = sizeof(DVDDriveInfo); + block->transferred_size = 0; + block->callback = callback; + + idle = issueCommand(2, block); + + return idle; } -#pragma pop /* 8034B138-8034B17C 345A78 0044+00 15/15 2/2 0/0 .text DVDReset */ void DVDReset(void) { @@ -955,8 +1132,6 @@ void DVDReset(void) { } /* 8034B17C-8034B1C8 345ABC 004C+00 0/0 6/6 0/0 .text DVDGetCommandBlockStatus */ -// needs compiler epilogue patch -#ifdef NONMATCHING s32 DVDGetCommandBlockStatus(const DVDCommandBlock* block) { BOOL enabled; s32 retVal; @@ -973,26 +1148,34 @@ s32 DVDGetCommandBlockStatus(const DVDCommandBlock* block) { return retVal; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 DVDGetCommandBlockStatus(const DVDCommandBlock* block) { - nofralloc -#include "asm/dolphin/dvd/dvd/DVDGetCommandBlockStatus.s" -} -#pragma pop -#endif /* 8034B1C8-8034B274 345B08 00AC+00 0/0 7/7 0/0 .text DVDGetDriveStatus */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 DVDGetDriveStatus(void) { - nofralloc -#include "asm/dolphin/dvd/dvd/DVDGetDriveStatus.s" +s32 DVDGetDriveStatus() { + BOOL enabled; + s32 retVal; + DVDCommandBlock* cmd; + + enabled = OSDisableInterrupts(); + + if (FatalErrorFlag) { + retVal = -1; + } else if (PausingFlag) { + retVal = 8; + } else { + cmd = executing; + if (cmd == (DVDCommandBlock*)NULL) { + retVal = 0; + } else if (cmd == &DummyCommandBlock) { + retVal = 0; + } else { + retVal = DVDGetCommandBlockStatus(executing); + } + } + + OSRestoreInterrupts(enabled); + + return retVal; } -#pragma pop /* 8034B274-8034B284 345BB4 0010+00 0/0 1/1 0/0 .text DVDSetAutoInvalidation */ BOOL DVDSetAutoInvalidation(BOOL autoInval) { @@ -1016,33 +1199,18 @@ void DVDResume(void) { /* ############################################################################################## */ /* 803D15F8-803D163C 02E718 0041+03 0/0 0/0 0/0 .data @789 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_789[] = - "DVDChangeDiskAsync(): You can't specify NULL to company name. \n"; -#pragma pop - -/* 803D163C-803D1670 -00001 0034+00 1/1 0/0 0/0 .data @956 */ -SECTION_DATA static void* lit_956[13] = { - (void*)(((char*)DVDCancelAsync) + 0x50), (void*)(((char*)DVDCancelAsync) + 0x50), - (void*)(((char*)DVDCancelAsync) + 0x70), (void*)(((char*)DVDCancelAsync) + 0xB4), - (void*)(((char*)DVDCancelAsync) + 0x100), (void*)(((char*)DVDCancelAsync) + 0x17C), - (void*)(((char*)DVDCancelAsync) + 0x17C), (void*)(((char*)DVDCancelAsync) + 0x17C), - (void*)(((char*)DVDCancelAsync) + 0x17C), (void*)(((char*)DVDCancelAsync) + 0x254), - (void*)(((char*)DVDCancelAsync) + 0x254), (void*)(((char*)DVDCancelAsync) + 0x50), - (void*)(((char*)DVDCancelAsync) + 0x17C), -}; +static char string_DVDChangeDiskAsyncMsg[] = "DVDChangeDiskAsync(): You can't specify NULL to company name. \n"; /* 8034B2D4-8034B550 345C14 027C+00 3/2 0/0 0/0 .text DVDCancelAsync */ -// needs compiler epilogue patch -#ifdef NONMATCHING BOOL DVDCancelAsync(DVDCommandBlock* block, DVDCBCallback callback) { BOOL enabled; DVDLowCallback old; + s32 state; enabled = OSDisableInterrupts(); - switch (block->state) { + state = block->state; + switch (state) { case -1: case 0: case 10: @@ -1131,16 +1299,6 @@ BOOL DVDCancelAsync(DVDCommandBlock* block, DVDCBCallback callback) { OSRestoreInterrupts(enabled); return TRUE; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm BOOL DVDCancelAsync(DVDCommandBlock* block, DVDCBCallback callback) { - nofralloc -#include "asm/dolphin/dvd/dvd/DVDCancelAsync.s" -} -#pragma pop -#endif /* 8034B550-8034B5FC 345E90 00AC+00 0/0 1/1 1/1 .text DVDCancel */ s32 DVDCancel(DVDCommandBlock* block) { @@ -1190,28 +1348,8 @@ DVDDiskID* DVDGetCurrentDiskID(void) { } /* ############################################################################################## */ -/* 803D1670-803D16A8 -00001 0034+04 1/1 0/0 0/0 .data @1060 */ -SECTION_DATA static void* lit_1060[13 + 1 /* padding */] = { - (void*)(((char*)DVDCheckDisk) + 0x98), - (void*)(((char*)DVDCheckDisk) + 0xA0), - (void*)(((char*)DVDCheckDisk) + 0x90), - (void*)(((char*)DVDCheckDisk) + 0x90), - (void*)(((char*)DVDCheckDisk) + 0x98), - (void*)(((char*)DVDCheckDisk) + 0x98), - (void*)(((char*)DVDCheckDisk) + 0x98), - (void*)(((char*)DVDCheckDisk) + 0x98), - (void*)(((char*)DVDCheckDisk) + 0x98), - (void*)(((char*)DVDCheckDisk) + 0xA0), - (void*)(((char*)DVDCheckDisk) + 0x90), - (void*)(((char*)DVDCheckDisk) + 0x90), - (void*)(((char*)DVDCheckDisk) + 0x98), - /* padding */ - NULL, -}; /* 8034B628-8034B720 345F68 00F8+00 1/0 4/4 0/0 .text DVDCheckDisk */ -// needs compiler epilogue patch -#ifdef NONMATCHING BOOL DVDCheckDisk(void) { BOOL enabled; s32 retVal; @@ -1257,8 +1395,10 @@ BOOL DVDCheckDisk(void) { coverReg = __DIRegs[1]; if (((coverReg >> 2) & 1) || (coverReg & 1)) { retVal = FALSE; + } else if (ResumeFromHere) { + retVal = 0; } else { - retVal = TRUE; + retVal = 1; } } @@ -1266,26 +1406,62 @@ BOOL DVDCheckDisk(void) { return retVal; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL DVDCheckDisk(void) { - nofralloc -#include "asm/dolphin/dvd/dvd/DVDCheckDisk.s" + +inline void DVDPause(void) { + BOOL level; + level = OSDisableInterrupts(); + PauseFlag = TRUE; + if (executing == (DVDCommandBlock*)NULL) { + PausingFlag = TRUE; + } + OSRestoreInterrupts(level); +} + +inline BOOL DVDCancelAllAsync(DVDCBCallback callback) { + BOOL enabled; + DVDCommandBlock* p; + BOOL retVal; + + enabled = OSDisableInterrupts(); + DVDPause(); + + while ((p = __DVDPopWaitingQueue()) != 0) { + DVDCancelAsync(p, NULL); + } + + if (executing) + retVal = DVDCancelAsync(executing, callback); + else { + retVal = TRUE; + if (callback) + (*callback)(0, NULL); + } + + DVDResume(); + OSRestoreInterrupts(enabled); + return retVal; } -#pragma pop -#endif /* 8034B720-8034B83C 346060 011C+00 0/0 1/1 0/0 .text __DVDPrepareResetAsync */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __DVDPrepareResetAsync(DVDCBCallback callback) { - nofralloc -#include "asm/dolphin/dvd/dvd/__DVDPrepareResetAsync.s" +void __DVDPrepareResetAsync(DVDCBCallback callback) { + BOOL enabled; + + enabled = OSDisableInterrupts(); + + __DVDClearWaitingQueue(); + + if (Canceling) { + CancelCallback = callback; + } else { + if (executing) { + executing->callback = NULL; + } + + DVDCancelAllAsync(callback); + } + + OSRestoreInterrupts(enabled); } -#pragma pop /* 8034B83C-8034B874 34617C 0038+00 0/0 1/1 0/0 .text __DVDTestAlarm */ BOOL __DVDTestAlarm(OSAlarm* alarm) { diff --git a/libs/dolphin/dvd/dvdlow.c b/libs/dolphin/dvd/dvdlow.c index d928e81efe..2421c98d7d 100644 --- a/libs/dolphin/dvd/dvdlow.c +++ b/libs/dolphin/dvd/dvdlow.c @@ -29,7 +29,7 @@ void DVDLowRequestAudioStatus(); void DVDLowAudioBufferConfig(); void DVDLowReset(); void DVDLowBreak(); -void DVDLowClearCallback(); +DVDLowCallback DVDLowClearCallback(); void __DVDLowSetWAType(); void __DVDLowTestAlarm(); @@ -64,7 +64,7 @@ static u8 StopAtNextInt[4]; static u8 LastLength[4]; /* 80451718-8045171C 000C18 0004+00 13/13 0/0 0/0 .sbss Callback */ -static u8 Callback[4]; +static DVDLowCallback Callback; /* 8045171C-80451720 000C1C 0004+00 1/1 0/0 0/0 .sbss ResetCoverCallback */ static u8 ResetCoverCallback[4]; @@ -79,7 +79,7 @@ static u8 data_80451724[4]; static u8 ResetOccurred[4]; /* 8045172C-80451730 000C2C 0004+00 3/3 0/0 0/0 .sbss WaitingCoverClose */ -static u8 WaitingCoverClose[4]; +static DVDLowCallback WaitingCoverClose; /* 80451730-80451734 000C30 0004+00 2/2 0/0 0/0 .sbss Breaking */ static u8 Breaking[4]; @@ -321,14 +321,14 @@ asm void DVDLowBreak() { #pragma pop /* 80348458-80348474 342D98 001C+00 0/0 1/1 0/0 .text DVDLowClearCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void DVDLowClearCallback() { - nofralloc -#include "asm/dolphin/dvd/dvdlow/DVDLowClearCallback.s" +DVDLowCallback DVDLowClearCallback() { + DVDLowCallback rv; + __DIRegs[1] = 0; + rv = Callback; + WaitingCoverClose = NULL; + Callback = NULL; + return rv; } -#pragma pop /* 80348474-803484B8 342DB4 0044+00 1/1 0/0 0/0 .text __DVDLowSetWAType */ #pragma push diff --git a/libs/dolphin/exi/Makefile b/libs/dolphin/exi/Makefile index e37f98a2d3..1bf69c6680 100644 --- a/libs/dolphin/exi/Makefile +++ b/libs/dolphin/exi/Makefile @@ -37,7 +37,7 @@ $(BUILD_DIR)/libs/dolphin/exi/%.o: libs/dolphin/exi/%.c $(BUILD_DIR)/libs/dolphi @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBEXI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBEXI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/libs/dolphin/gd/Makefile b/libs/dolphin/gd/Makefile index 6388955b90..82bda247c4 100644 --- a/libs/dolphin/gd/Makefile +++ b/libs/dolphin/gd/Makefile @@ -37,7 +37,7 @@ $(BUILD_DIR)/libs/dolphin/gd/%.o: libs/dolphin/gd/%.c $(BUILD_DIR)/libs/dolphin/ @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBGD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBGD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/libs/dolphin/gx/Makefile b/libs/dolphin/gx/Makefile index 33bca405fb..a83a0ee3f3 100644 --- a/libs/dolphin/gx/Makefile +++ b/libs/dolphin/gx/Makefile @@ -53,7 +53,7 @@ $(BUILD_DIR)/libs/dolphin/gx/%.o: libs/dolphin/gx/%.c $(BUILD_DIR)/libs/dolphin/ @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBGX_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(CFLAGS) $(LIBGX_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/libs/dolphin/mtx/Makefile b/libs/dolphin/mtx/Makefile index 99f00a40d9..8c5c92226e 100644 --- a/libs/dolphin/mtx/Makefile +++ b/libs/dolphin/mtx/Makefile @@ -35,7 +35,7 @@ $(BUILD_DIR)/libs/dolphin/mtx/%.o: libs/dolphin/mtx/%.c $(BUILD_DIR)/libs/dolphi @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBMTX_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(CFLAGS) $(LIBMTX_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/libs/dolphin/os/Makefile b/libs/dolphin/os/Makefile index d9818d6ca0..a0e5986d50 100644 --- a/libs/dolphin/os/Makefile +++ b/libs/dolphin/os/Makefile @@ -79,7 +79,7 @@ $(BUILD_DIR)/libs/dolphin/os/%.o: libs/dolphin/os/%.c $(BUILD_DIR)/libs/dolphin/ @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBOS_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBOS_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/libs/dolphin/os/OS.c b/libs/dolphin/os/OS.c index 4d884b53f0..9d57618ba6 100644 --- a/libs/dolphin/os/OS.c +++ b/libs/dolphin/os/OS.c @@ -832,6 +832,6 @@ u32 __OSGetDIConfig(void) { } /* 8033A874-8033A8A0 3351B4 002C+00 1/1 11/11 0/0 .text OSRegisterVersion */ -void OSRegisterVersion(char* version) { +void OSRegisterVersion(const char* version) { OSReport("%s\n", version); } diff --git a/libs/dolphin/pad/Makefile b/libs/dolphin/pad/Makefile index b531393957..7f3f10b581 100644 --- a/libs/dolphin/pad/Makefile +++ b/libs/dolphin/pad/Makefile @@ -37,10 +37,11 @@ $(BUILD_DIR)/libs/dolphin/pad/%.o: libs/dolphin/pad/%.c $(BUILD_DIR)/libs/dolphi @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBPAD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(FRANK_CC) $(LIBPAD_A_CFLAGS) -c -o $(@:.o=.po) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBPAD_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ - @$(PYTHON) $(FRANK) $@ $@ $@ + @$(PYTHON) $(FRANK) $@ $(@:.o=.po) $@ ifndef DISABLE_DEPS LIBPAD_A_D_FILES := $(LIBPAD_A_O_FILES:.o=.d) diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c index 908ab7d14f..d4ac7d1773 100644 --- a/libs/dolphin/pad/Pad.c +++ b/libs/dolphin/pad/Pad.c @@ -286,14 +286,31 @@ static void PADTypeAndStatusCallback(s32 chan, u32 type) { } /* 8034E9EC-8034EB2C 34932C 0140+00 1/1 0/0 0/0 .text PADReceiveCheckCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void PADReceiveCheckCallback(s32 chan, u32 type) { - nofralloc -#include "asm/dolphin/pad/Pad/PADReceiveCheckCallback.s" +static void PADReceiveCheckCallback(s32 chan, u32 type) { + u32 error; + u32 chanBit; + + chanBit = (u32)PAD_CHAN0_BIT >> chan; + if (!(EnabledBits & chanBit)) { + return; + } + + error = type & 0xFF; + type &= ~0xFF; + + WaitingBits &= ~chanBit; + CheckingBits &= ~chanBit; + + if (!(error & + (SI_ERROR_UNDER_RUN | SI_ERROR_OVER_RUN | SI_ERROR_NO_RESPONSE | SI_ERROR_COLLISION)) && + (type & SI_GC_WIRELESS) && (type & SI_WIRELESS_FIX_ID) && (type & SI_WIRELESS_RECEIVED) && + !(type & SI_WIRELESS_IR) && (type & SI_WIRELESS_CONT_MASK) == SI_WIRELESS_CONT && + !(type & SI_WIRELESS_LITE)) { + SITransfer(chan, &CmdReadOrigin, 1, &Origin[chan], 10, PADOriginUpdateCallback, 0); + } else { + PADDisable(chan); + } } -#pragma pop /* 8034EB2C-8034EC3C 34946C 0110+00 2/2 1/1 0/0 .text PADReset */ BOOL PADReset(u32 mask) { @@ -649,9 +666,12 @@ inline u8 ClampU8(u8 var, u8 org) { PAD_BUTTON_MENU | 0x2000 | 0x0080) /* 8034F5A0-8034FA10 349EE0 0470+00 2/1 0/0 0/0 .text SPEC2_MakeStatus */ +// lis and stw instruction order #ifdef NONMATCHING static void SPEC2_MakeStatus(s32 chan, PADStatus* status, u32 data[2]) { + u32 type; PADStatus* origin; + u32 chanBit; status->button = (u16)((data[0] >> 16) & PAD_ALL); status->stick_x = (s8)(data[0] >> 8); @@ -708,13 +728,24 @@ static void SPEC2_MakeStatus(s32 chan, PADStatus* status, u32 data[2]) { status->substick_x -= 128; status->substick_y -= 128; - origin = &Origin[chan]; - status->stick_x = ClampS8(status->stick_x, origin->stick_x); - status->stick_y = ClampS8(status->stick_y, origin->stick_y); - status->substick_x = ClampS8(status->substick_x, origin->substick_x); - status->substick_y = ClampS8(status->substick_y, origin->substick_y); - status->trigger_left = ClampU8(status->trigger_left, origin->trigger_left); - status->trigger_right = ClampU8(status->trigger_right, origin->trigger_right); + type = Type[chan]; + + if (((type & (0xffff0000u)) == SI_GC_CONTROLLER) && ((status->button & 0x80) ^ 0x80)) { + BarrelBits |= ((u32)PAD_CHAN0_BIT >> chan); + status->stick_x = 0; + status->stick_y = 0; + status->substick_x = 0; + status->substick_y = 0; + } else { + BarrelBits &= ~((u32)PAD_CHAN0_BIT >> chan); + origin = &Origin[chan]; + status->stick_x = ClampS8(status->stick_x, origin->stick_x); + status->stick_y = ClampS8(status->stick_y, origin->stick_y); + status->substick_x = ClampS8(status->substick_x, origin->substick_x); + status->substick_y = ClampS8(status->substick_y, origin->substick_y); + status->trigger_left = ClampU8(status->trigger_left, origin->trigger_left); + status->trigger_right = ClampU8(status->trigger_right, origin->trigger_right); + } } #else #pragma push @@ -786,21 +817,30 @@ static void SamplingHandler(OSInterrupt interrupt, OSContext* context) { } /* 8034FBA0-8034FBF4 34A4E0 0054+00 1/1 0/0 0/0 .text PADSetSamplingCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm PADSamplingCallback PADSetSamplingCallback(PADSamplingCallback callback) { - nofralloc -#include "asm/dolphin/pad/Pad/PADSetSamplingCallback.s" +PADSamplingCallback PADSetSamplingCallback(PADSamplingCallback callback) { + PADSamplingCallback prev; + + prev = SamplingCallback; + SamplingCallback = callback; + if (callback) { + SIRegisterPollingHandler(SamplingHandler); + } else { + SIUnregisterPollingHandler(SamplingHandler); + } + return prev; } -#pragma pop /* 8034FBF4-8034FC70 34A534 007C+00 0/0 1/1 0/0 .text __PADDisableRecalibration */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL __PADDisableRecalibration(BOOL disable) { - nofralloc -#include "asm/dolphin/pad/Pad/__PADDisableRecalibration.s" +BOOL __PADDisableRecalibration(BOOL disable) { + BOOL enabled; + BOOL prev; + + enabled = OSDisableInterrupts(); + prev = (UnkVal & 0x40) ? TRUE : FALSE; + UnkVal &= ~0x40; + if (disable) { + UnkVal |= 0x40; + } + OSRestoreInterrupts(enabled); + return prev; } -#pragma pop diff --git a/libs/dolphin/si/Makefile b/libs/dolphin/si/Makefile index 892875eae3..a5323107f4 100644 --- a/libs/dolphin/si/Makefile +++ b/libs/dolphin/si/Makefile @@ -37,7 +37,7 @@ $(BUILD_DIR)/libs/dolphin/si/%.o: libs/dolphin/si/%.c $(BUILD_DIR)/libs/dolphin/ @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBSI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBSI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/libs/dolphin/vi/Makefile b/libs/dolphin/vi/Makefile index 17c0b6f8eb..77b012b0c6 100644 --- a/libs/dolphin/vi/Makefile +++ b/libs/dolphin/vi/Makefile @@ -35,7 +35,7 @@ $(BUILD_DIR)/libs/dolphin/vi/%.o: libs/dolphin/vi/%.c $(BUILD_DIR)/libs/dolphin/ @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(LIBVI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @$(DOLPHIN_LIB_CC) $(LIBVI_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi @echo Frank is fixing $@ @$(PYTHON) $(FRANK) $@ $@ $@ diff --git a/tools/tp.py b/tools/tp.py index 89466bb4f5..b268efdd25 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -179,6 +179,16 @@ def setup(debug: bool, game_path: Path, tools_path: Path): ) sys.exit(1) + c125e = compilers.joinpath("1.2.5e") + if not c125e.exists() or not c125e.is_dir(): + LOG.error( + ( + f"Unable to find patched MWCC compiler version 1.2.5e: missing directory '{c125e}'\n" + f"Check the README for instructions on how to obtain the compilers" + ) + ) + sys.exit(1) + c27_lmgr326b = c27.joinpath("Lmgr326b.dll") if not c27_lmgr326b.exists() or not c27_lmgr326b.is_file(): c27_lmgr326b = c27.joinpath("lmgr326b.dll")